Graded steel weapon recipes (CleverRaven#60574)

* Update cutting.json * Update proficiency name * Arming Sword * Update cutting.json * Update cutting.json * Update cutting.json * Update cutting.json * Carbon resource group * Update cutting.json * Update cutting.json * Update cutting.json * Cavalry Sabre * Merge branch 'Steel-grades-for-weapons' into Steel-grade-weapon-recipes * Kriegsmesser * Update cutting.json * Update cutting.json * Longsword * Scimitar * Wakizashi * Update piercing.json * Jian * Update cutting.json * Update cutting.json * Falx * Nodachi * Update cutting.json * Obsolete old recipes * Epoxy to thermoplastic * Update obsolete.json * Update cutting.json * Nesting * Update nested.json * Lintening * Remove/replace itemgroups * Correct material * More itemgroup cleanup * itemgroup fixes * Update mansion.json * Update mansion.json * Materials and nodachi fix * Update cutting.json * Update cutting.json * Update costumes.json * Update costumes.json
Maleclypse · Sep 14, 2022 · 913d296 · 913d296
1 parent 0262cf2
commit 913d296
Show file tree

Hide file tree

Showing 16 changed files with 1,873 additions and 267 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json
@@ -420,20 +420,18 @@
     "id": "costume_weapons",
     "type": "item_group",
     "items": [
-      [ "cutlass", 1 ],
-      [ "broadsword", 1 ],
-      [ "nodachi", 1 ],
-      [ "zweihander", 1 ],
-      [ "longsword", 1 ],
-      [ "katana", 1 ],
+      [ "cutlass_inferior", 1 ],
+      [ "broadsword_inferior", 1 ],
+      [ "nodachi_inferior", 1 ],
+      [ "zweihander_inferior", 1 ],
+      [ "longsword_inferior", 1 ],
+      [ "katana_inferior", 1 ],
       [ "kris", 1 ],
-      [ "rapier", 1 ],
-      [ "cavalry_sabre", 1 ],
+      [ "rapier_fake", 1 ],
+      [ "cavalry_sabre_fake", 1 ],
       [ "glaive", 1 ],
-      [ "naginata", 1 ],
       [ "naginata_fake", 5 ],
       [ "naginata_inferior", 3 ],
-      [ "estoc", 2 ],
       [ "estoc_inferior", 4 ],
       [ "estoc_fake", 6 ],
       [ "qiang", 3 ],
@@ -445,12 +443,9 @@
       [ "zweihander_inferior", 8 ],
       [ "cutlass_fake", 4 ],
       [ "cutlass_inferior", 8 ],
-      [ "jian", 2 ],
       [ "jian_fake", 4 ],
       [ "jian_inferior", 8 ],
-      [ "scimitar", 4 ],
       [ "scimitar_fake", 8 ],
-      [ "arming_sword", 4 ],
       [ "arming_sword_fake", 8 ],
       [ "broadsword_fake", 4 ],
       [ "broadsword_inferior", 8 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1104,57 +1104,43 @@
     "type": "item_group",
     "id": "museum_melee",
     "items": [
-      [ "katana", 2 ],
       [ "hollow_cane", 2 ],
       [ "sword_cane", 2 ],
       [ "katana_fake", 8 ],
       [ "katana_inferior", 10 ],
-      [ "cutlass", 3 ],
       [ "cutlass_fake", 8 ],
       [ "cutlass_inferior", 10 ],
-      [ "scimitar", 2 ],
       [ "scimitar_inferior", 7 ],
       [ "scimitar_fake", 10 ],
-      [ "arming_sword", 2 ],
       [ "arming_sword_fake", 7 ],
       [ "arming_sword_inferior", 10 ],
-      [ "broadsword", 2 ],
       [ "broadsword_fake", 8 ],
       [ "broadsword_inferior", 10 ],
-      [ "longsword", 2 ],
       [ "longsword_fake", 8 ],
       [ "longsword_inferior", 10 ],
       [ "qiang", 3 ],
-      [ "jian", 2 ],
       [ "jian_fake", 8 ],
       [ "jian_inferior", 10 ],
-      [ "rapier", 4 ],
       [ "rapier_fake", 8 ],
-      [ "cavalry_sabre", 4 ],
       [ "cavalry_sabre_fake", 8 ],
-      [ "estoc", 3 ],
       [ "estoc_inferior", 4 ],
       [ "estoc_fake", 5 ],
       [ "kris", 3 ],
       [ "kris_fake", 8 ],
-      [ "zweihander", 2 ],
       [ "zweihander_fake", 6 ],
       [ "zweihander_inferior", 10 ],
-      [ "nodachi", 1 ],
       [ "nodachi_fake", 6 ],
       [ "bullwhip", 6 ],
-      [ "wakizashi", 2 ],
       [ "wakizashi_fake", 8 ],
       [ "wakizashi_inferior", 10 ],
       [ "q_staff", 8 ],
       [ "i_staff", 6 ],
       [ "glaive", 3 ],
-      [ "naginata", 2 ],
+      [ "naginata_inferior", 2 ],
       [ "halberd", 2 ],
       [ "halberd_fake", 6 ],
       [ "lucern_hammer", 1 ],
       [ "lucern_hammerfake", 4 ],
-      [ "battleaxe", 2 ],
       [ "battleaxe_fake", 6 ],
       [ "battleaxe_inferior", 10 ],
       [ "mace", 1 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -539,25 +539,16 @@
       [ "morningstar", 1 ],
       [ "helmet_plate", 1 ],
       [ "huge_crossbow", 2 ],
-      [ "katana", 1 ],
       [ "bokken", 7 ],
-      [ "broadsword", 1 ],
       [ "broadsword_inferior", 20 ],
-      [ "zweihander", 1 ],
       [ "glaive", 1 ],
       [ "halberd", 1 ],
-      [ "cutlass", 1 ],
-      [ "scimitar", 1 ],
-      [ "rapier", 1 ],
-      [ "cavalry_sabre", 1 ],
-      [ "estoc", 1 ],
+      [ "rapier_fake", 1 ],
+      [ "cavalry_sabre_fake", 1 ],
       [ "estoc_inferior", 3 ],
-      [ "wakizashi", 1 ],
       [ "jian_inferior", 30 ],
       [ "scimitar_inferior", 25 ],
-      [ "longsword", 1 ],
       [ "longsword_inferior", 25 ],
-      [ "arming_sword", 1 ],
       [ "arming_sword_inferior", 25 ],
       [ "tanto", 1 ],
       [ "kris", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -131,9 +131,9 @@
       [ "diamond_dental_grill", 1 ],
       [ "match_trigger", 3 ],
       [ "pocketwatch", 2 ],
-      [ "wakizashi", 1 ],
+      [ "wakizashi_inferior", 1 ],
       [ "tanto", 4 ],
-      [ "katana", 1 ],
+      [ "katana_inferior", 1 ],
       [ "survnote", 3 ],
       [ "ear_spool", 30 ]
     ]

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -516,17 +516,7 @@
     "id": "soa_weapons_samurai",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [
-      { "group": "soa_fake_weapon_samurai", "prob": 3 },
-      { "group": "soa_poor_weapon_samurai", "prob": 3 },
-      { "group": "soa_real_weapon_samurai", "prob": 3 }
-    ]
-  },
-  {
-    "id": "broadsword+scabbard",
-    "type": "item_group",
-    "subtype": "collection",
-    "items": [ [ "broadsword", 100 ], [ "scabbard", 100 ] ]
+    "items": [ { "group": "soa_fake_weapon_samurai", "prob": 3 }, { "group": "soa_poor_weapon_samurai", "prob": 3 } ]
   },
   {
     "id": "broadsword_fake+scabbard",
@@ -540,12 +530,6 @@
     "subtype": "collection",
     "items": [ [ "broadsword_inferior", 100 ], [ "scabbard", 100 ] ]
   },
-  {
-    "id": "samurai_sword_set",
-    "type": "item_group",
-    "subtype": "collection",
-    "items": [ [ "katana", 100 ], [ "wakizashi", 34 ], [ "tanto", 12 ] ]
-  },
   {
     "id": "samurai_sword_set_fake",
     "type": "item_group",
@@ -588,7 +572,7 @@
     "subtype": "distribution",
     "items": [
       [ "pike", 50 ],
-      { "group": "broadsword+scabbard", "prob": 17 },
+      { "group": "broadsword_inferior+scabbard", "prob": 17 },
       [ "mace", 6 ],
       [ "morningstar", 5 ],
       [ "shillelagh", 5 ],
@@ -622,7 +606,7 @@
     "id": "soa_real_weapon_plate",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [ [ "pike", 17 ], { "group": "broadsword+scabbard", "prob": 5 }, [ "mace", 50 ], [ "morningstar", 6 ] ]
+    "items": [ [ "pike", 17 ], { "group": "broadsword_inferior+scabbard", "prob": 5 }, [ "mace", 50 ], [ "morningstar", 6 ] ]
   },
   {
     "id": "soa_fake_weapon_mail",
@@ -650,7 +634,7 @@
     "id": "soa_real_weapon_mail",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [ [ "pike", 50 ], { "group": "broadsword+scabbard", "prob": 5 }, [ "mace", 50 ], [ "battleaxe", 6 ] ]
+    "items": [ [ "pike", 50 ], { "group": "broadsword_inferior+scabbard", "prob": 5 }, [ "mace", 50 ], [ "battleaxe", 6 ] ]
   },
   {
     "id": "soa_fake_weapon_samurai",
@@ -674,12 +658,6 @@
       [ "naginata_inferior", 5 ]
     ]
   },
-  {
-    "id": "soa_real_weapon_samurai",
-    "type": "item_group",
-    "subtype": "distribution",
-    "items": [ { "group": "samurai_sword_set", "prob": 7 }, [ "bokken", 6 ], [ "nodachi", 5 ], [ "naginata", 5 ] ]
-  },
   {
     "id": "toy_box",
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json b/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json
@@ -26,8 +26,8 @@
       [ "baton", 8 ],
       [ "blackjack", 10 ],
       [ "tazer", 3 ],
-      [ "rapier", 3 ],
-      [ "cavalry_sabre", 2 ],
+      [ "rapier_fake", 3 ],
+      [ "cavalry_sabre_fake", 2 ],
       [ "bat_metal", 60 ],
       [ "e_tool", 2 ],
       [ "knife_trench", 7 ],
@@ -36,9 +36,9 @@
       [ "tonfa_wood", 10 ],
       [ "shocktonfa_off", 5 ],
       [ "tanto", 7 ],
-      [ "wakizashi", 3 ],
-      [ "nodachi", 1 ],
-      [ "katana", 2 ],
+      [ "wakizashi_inferior", 3 ],
+      [ "nodachi_inferior", 1 ],
+      [ "katana_inferior", 2 ],
       [ "survnote", 1 ],
       [ "karambit", 1 ]
     ]

diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json
@@ -36,10 +36,9 @@
       { "item": "fancy_sunglasses", "prob": 2 },
       { "item": "pocketwatch", "prob": 5 },
       { "item": "well_pump", "prob": 1 },
-      { "item": "nodachi", "prob": 1 },
-      { "item": "katana", "prob": 2 },
-      { "item": "rapier", "prob": 3 },
-      { "item": "cavalry_sabre", "prob": 2 },
+      { "item": "katana_inferior", "prob": 2 },
+      { "item": "rapier_fake", "prob": 3 },
+      { "item": "cavalry_sabre_fake", "prob": 2 },
       { "item": "sf_watch", "prob": 5 },
       { "item": "platinum_watch", "prob": 1 },
       { "item": "ring_signet", "prob": 1 },
@@ -53,31 +52,20 @@
     "id": "medieval",
     "subtype": "distribution",
     "entries": [
-      { "item": "katana", "prob": 2 },
       { "item": "katana_inferior", "prob": 2 },
       { "item": "cestus", "prob": 2 },
       { "item": "mace", "prob": 20 },
       { "item": "mace_inferior", "prob": 25 },
       { "item": "morningstar", "prob": 10 },
       { "item": "morningstar_inferior", "prob": 15 },
       { "item": "glaive", "prob": 10 },
-      { "item": "rapier", "prob": 3 },
-      { "item": "cavalry_sabre", "prob": 3 },
-      { "item": "estoc", "prob": 3 },
       { "item": "estoc_inferior", "prob": 3 },
-      { "item": "cutlass", "prob": 3 },
       { "item": "cutlass_inferior", "prob": 3 },
-      { "item": "scimitar", "prob": 20 },
       { "item": "scimitar_inferior", "prob": 25 },
-      { "item": "arming_sword", "prob": 25 },
       { "item": "arming_sword_inferior", "prob": 25 },
-      { "item": "broadsword", "prob": 30 },
       { "item": "broadsword_inferior", "prob": 30 },
-      { "item": "longsword", "prob": 25 },
       { "item": "longsword_inferior", "prob": 25 },
-      { "item": "zweihander", "prob": 20 },
       { "item": "zweihander_inferior", "prob": 20 },
-      { "item": "battleaxe", "prob": 20 },
       { "item": "battleaxe_inferior", "prob": 20 },
       { "item": "warhammer", "prob": 10 },
       { "item": "halberd", "prob": 5 },
@@ -94,7 +82,6 @@
       { "item": "quiver", "prob": 2 },
       { "item": "quiver_large", "prob": 1 },
       { "item": "baldric", "prob": 4 },
-      { "item": "nodachi", "prob": 1 },
       { "item": "nodachi_inferior", "prob": 2 },
       { "item": "knife_baselard", "prob": 2 },
       { "item": "gambeson", "prob": 3 },
@@ -213,20 +200,11 @@
     "entries": [
       { "item": "trex_gun", "prob": 4 },
       { "item": "spiral_stone", "prob": 2 },
-      { "item": "cutlass", "prob": 2 },
-      { "item": "broadsword", "prob": 2 },
-      { "item": "nodachi", "prob": 2 },
-      { "item": "zweihander", "prob": 2 },
-      { "item": "longsword", "prob": 2 },
-      { "item": "katana", "prob": 2 },
       { "item": "kris", "prob": 2 },
-      { "item": "rapier", "prob": 2 },
-      { "item": "cavalry_sabre", "prob": 2 },
+      { "item": "cavalry_sabre_fake", "prob": 2 },
       { "item": "glaive", "prob": 2 },
-      { "item": "naginata", "prob": 2 },
       { "item": "naginata_fake", "prob": 2 },
       { "item": "naginata_inferior", "prob": 3 },
-      { "item": "estoc", "prob": 2 },
       { "item": "estoc_fake", "prob": 6 },
       { "item": "qiang", "prob": 3 },
       { "item": "halberd", "prob": 2 },
@@ -239,12 +217,9 @@
       { "item": "zweihander_inferior", "prob": 8 },
       { "item": "cutlass_fake", "prob": 4 },
       { "item": "cutlass_inferior", "prob": 8 },
-      { "item": "jian", "prob": 2 },
       { "item": "jian_fake", "prob": 4 },
       { "item": "jian_inferior", "prob": 8 },
-      { "item": "scimitar", "prob": 4 },
       { "item": "scimitar_fake", "prob": 8 },
-      { "item": "arming_sword", "prob": 4 },
       { "item": "arming_sword_fake", "prob": 8 },
       { "item": "broadsword_fake", "prob": 4 },
       { "item": "broadsword_inferior", "prob": 8 },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1321,14 +1321,10 @@
       [ "binoculars", 50 ],
       [ "crossbow", 20 ],
       [ "compcrossbow", 20 ],
-      [ "rapier", 1 ],
       [ "rapier_fake", 10 ],
-      [ "cavalry_sabre", 1 ],
       [ "cavalry_sabre_fake", 20 ],
-      [ "katana", 1 ],
       [ "katana_fake", 20 ],
       [ "katana_inferior", 2 ],
-      [ "cutlass", 1 ],
       [ "cutlass_fake", 25 ],
       [ "cutlass_inferior", 2 ],
       [ "longbow", 10 ],

diff --git a/data/json/itemgroups/defense_mode.json b/data/json/itemgroups/defense_mode.json
@@ -11,9 +11,9 @@
       { "item": "hammer_sledge" },
       { "item": "hatchet" },
       { "item": "knife_combat" },
-      { "item": "rapier" },
+      { "item": "hc_rapier" },
       { "item": "machete" },
-      { "item": "katana" },
+      { "item": "hc_katana" },
       { "item": "spear_knife" },
       { "item": "pike" },
       { "item": "chainsaw_off" }