Make all graded weapons use copy-from [Part 1 Swords and Blades] (Cle…

…verRaven#66956) * knife_rambo * knife_trench * Cavalry sabre * Rebasing randomly finished before I solved the conflicts idek * replace_materials * Jian * Shamshirs * Typo * Estoc * Kilij * Talwar * Falx * Kriegsmesser * Nodachi * Wakizashi * Zweihander * Longsword * Arming Sword * Broadsword * Cutlass * Rapier * Katana * Inferior/Fake Wakizashi * Assorted * Minor Combat Chainsaw tweaks * Expected DPS changes * I don't like this lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Lots of tweaks * Material portions * Prices and grade names * Adds missing repairs_with --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ampersand55 · Aug 14, 2023 · 0f7fa79 · 0f7fa79
1 parent 8727953
commit 0f7fa79
Show file tree

Hide file tree

Showing 7 changed files with 1,047 additions and 1,981 deletions.
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json
@@ -211,5 +211,17 @@
     "type": "MIGRATION",
     "replace": "bodypillow",
     "variant": "bodypillow_makeshift"
+  },
+  {
+    "id": "sword_sheets_bolted",
+    "type": "MIGRATION",
+    "replace": "sword_sheets_welded",
+    "variant": "sword_sheets_bolted"
+  },
+  {
+    "id": "sword_sheets_bolted_large",
+    "type": "MIGRATION",
+    "replace": "sword_sheets_welded_large",
+    "variant": "sword_sheets_bolted_large"
   }
 ]
diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json
@@ -919,7 +919,8 @@
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
-    "result": "sword_sheets_bolted",
+    "result": "sword_sheets_welded",
+    "variant": "sword_sheets_bolted",
     "byproducts": [ [ "sheet_metal_small", 12 ] ],
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_CUTTING",
@@ -936,6 +937,7 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "result": "sword_sheets_welded",
+    "variant": "sword_sheets_welded",
     "byproducts": [ [ "sheet_metal_small", 12 ] ],
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_CUTTING",
@@ -953,7 +955,8 @@
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
-    "result": "sword_sheets_bolted_large",
+    "result": "sword_sheets_welded_large",
+    "variant": "sword_sheets_bolted_large",
     "byproducts": [ [ "sheet_metal_small", 6 ] ],
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_CUTTING",
@@ -973,6 +976,7 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "result": "sword_sheets_welded_large",
+    "variant": "sword_sheets_welded_large",
     "byproducts": [ [ "sheet_metal_small", 6 ] ],
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_CUTTING",

diff --git a/data/mods/TEST_DATA/expected_dps_data/knives_dps.json b/data/mods/TEST_DATA/expected_dps_data/knives_dps.json
@@ -5,30 +5,30 @@
     "//2": "bio_blade_weapon: much better than any other knife",
     "//3": "RM42 knife has very high DPS owing to being pre cvded. Without that it is slightly worse than a combat knife due to being slower",
     "expected_dps": {
-      "bio_blade_weapon": 24.5,
-      "knife_combat": 19.0,
-      "knife_trench": 15.19,
       "knife_baselard": 15.87,
-      "kirpan": 18.0,
-      "tanto": 15.78,
-      "kris": 14.08,
-      "knife_rambo": 14.36,
-      "tanto_inferior": 14.14,
+      "bio_blade_weapon": 24.5,
       "bone_knife": 7.9,
+      "knife_butcher": 10,
+      "knife_combat": 19.0,
+      "copper_knife": 8.0,
+      "diveknife": 8.0,
       "knife_hunting": 11.0,
+      "kirpan": 18.0,
       "kirpan_cheap": 7.61,
-      "switchblade": 10.5,
+      "kris": 14.08,
+      "kris_fake": 1.811,
       "knife_meat_cleaver": 13.97,
-      "diveknife": 8.0,
-      "copper_knife": 8.0,
-      "knife_butcher": 10,
-      "throwing_knife": 7.0,
-      "tanto_fake": 6.33,
       "pockknife": 4.5,
-      "spike": 4.0,
-      "kris_fake": 2.5,
       "primitive_knife": 2.5,
-      "knife_rm42": 31.85
+      "mc_knife_rambo": 13.15,
+      "knife_rm42": 31.85,
+      "spike": 4.0,
+      "switchblade": 10.5,
+      "tanto": 15.78,
+      "tanto_inferior": 12.271,
+      "tanto_fake": 6.33,
+      "throwing_knife": 7.0,
+      "mc_knife_trench": 15.19
     }
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json b/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json
@@ -3,32 +3,32 @@
     "type": "test_data",
     "//": "expected value 22",
     "expected_dps": {
-      "scimitar": 24.3,
+      "blade": 7.0,
       "butterfly_swords": 22.0,
-      "cutlass": 22.0,
-      "sword_bayonet": 22.75,
-      "kukri": 20.9,
-      "wakizashi": 22.0,
-      "sword_xiphos": 22.0,
+      "mc_cavalry_sabre": 24.233,
+      "mc_cutlass": 22.0,
+      "cutlass_inferior": 17.5,
+      "cutlass_fake": 8.763,
+      "dao": 23.47,
       "khopesh": 24.26,
-      "survivor_machete": 21.0,
-      "cavalry_sabre": 23.29,
+      "mc_kukri": 20.9,
       "machete": 20.0,
-      "dao": 23.47,
-      "sword_cane": 20.34,
-      "cutlass_inferior": 17.5,
+      "makeshift_machete": 9.19,
+      "survivor_machete": 21.0,
+      "mc_scimitar": 22.167,
       "scimitar_inferior": 16.15,
+      "scimitar_fake": 7.526,
+      "sword_bayonet": 22.75,
+      "sword_cane": 20.34,
       "sword_crude": 9.5,
-      "wakizashi_inferior": 15.0,
-      "makeshift_machete": 9.19,
+      "sword_xiphos": 22.0,
       "cavalry_sabre_fake": 8.98,
-      "cutlass_fake": 7.75,
-      "scimitar_fake": 8.44,
-      "wakizashi_fake": 7.0,
-      "blade": 7.0,
       "fencing_epee": 5.93,
       "fencing_sabre": 4.63,
-      "fencing_foil": 2.0
+      "fencing_foil": 2.0,
+      "mc_wakizashi": 23.592,
+      "wakizashi_inferior": 15.0,
+      "wakizashi_fake": 7.0
     }
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/swords_dps.json b/data/mods/TEST_DATA/expected_dps_data/swords_dps.json
@@ -4,19 +4,19 @@
     "//": "expected value 24, does not include shortswords",
     "//2": "arming_sword: heavier than a broadsword",
     "expected_dps": {
-      "broadsword": 24.0,
-      "rapier": 21.47,
-      "arming_sword": 24.0,
-      "jian": 24.0,
-      "broadsword_inferior": 20.0,
-      "arming_sword_inferior": 17.0,
-      "jian_inferior": 18.5,
-      "broadsword_fake": 8.5,
-      "rapier_fake": 6.98,
-      "arming_sword_fake": 11.5,
-      "jian_fake": 8.25,
+      "mc_arming_sword": 24.648,
+      "arming_sword_inferior": 24.156,
+      "arming_sword_fake": 12.19,
+      "blade_scythe": 5.25,
+      "mc_broadsword": 24.605,
+      "broadsword_inferior": 19.178,
+      "broadsword_fake": 9.828,
       "glass_macuahuitl": 11.0,
-      "blade_scythe": 5.25
+      "mc_jian": 25.208,
+      "jian_inferior": 18.5,
+      "jian_fake": 8.792,
+      "mc_rapier": 25.302,
+      "rapier_fake": 9.034
     }
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/two_handed_swords_dps.json b/data/mods/TEST_DATA/expected_dps_data/two_handed_swords_dps.json
@@ -3,21 +3,21 @@
     "type": "test_data",
     "//": "expected value around 27, 25 for long swords",
     "expected_dps": {
-      "nodachi": 26.5,
-      "zweihander": 25.78,
-      "estoc": 27.0,
-      "longsword": 25,
-      "katana": 25.0,
-      "longsword_inferior": 15.5,
-      "zweihander_inferior": 11.64,
-      "katana_inferior": 13.5,
-      "nodachi_inferior": 16.25,
+      "mc_estoc": 26.377,
       "estoc_inferior": 15.5,
       "estoc_fake": 8.95,
-      "zweihander_fake": 7.21,
-      "longsword_fake": 6.25,
-      "nodachi_fake": 8.5,
-      "katana_fake": 7.0
+      "mc_katana": 26.005,
+      "katana_inferior": 15.586,
+      "katana_fake": 8.078,
+      "mc_longsword": 26.329,
+      "longsword_inferior": 15.5,
+      "longsword_fake": 7.572,
+      "mc_nodachi": 27.598,
+      "nodachi_inferior": 16.25,
+      "nodachi_fake": 9.324,
+      "mc_zweihander": 27.512,
+      "zweihander_inferior": 17.374,
+      "zweihander_fake": 12.868
     }
   }
 ]