[CR] Weapon Categories: Silat (And Polearms categories) (#51972)

* KNIVES * BATONS * QUARTERSTAVES * BLADED_FARMING * CUTTING_POLEARMS * PIERCING_POLEARMS * Removed non-sensical weapons * Removed swords * HOOKING_POLEARMS * POLEARMS
CleverRaven · Oct 28, 2021 · 5a81b37 · 5a81b37
1 parent 41218da
commit 5a81b37
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 83 deletions.
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -516,6 +516,7 @@
     "price_postapoc": 50,
     "material": [ "wood", "plastic" ],
     "techniques": [ "WBLOCK_1" ],
+    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ],
     "weight": "420 g",
     "volume": "1750 ml",
     "longest_side": "150 cm",
@@ -872,6 +873,7 @@
     "symbol": "/",
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1" ],
+    "weapon_category": [ "QUARTERSTAVES" ],
     "volume": "2 L",
     "longest_side": "150 cm",
     "bashing": 10,

diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -36,6 +36,7 @@
     "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
     "price_postapoc": 10,
     "flags": [ "SPEAR" ],
+    "weapon_category": [ "POLEARMS" ],
     "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -57,6 +58,7 @@
     "cutting": 9,
     "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
     "flags": [ "SPEAR", "REACH_ATTACK", "NPC_THROWN", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ],
     "qualities": [ [ "COOK", 1 ] ]
   },
   {
@@ -76,6 +78,7 @@
     "cutting": 15,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
     "flags": [ "SPEAR", "REACH_ATTACK", "NPC_THROWN", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 4000,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -98,7 +101,8 @@
     "color": "light_gray",
     "techniques": [ "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
-    "flags": [ "FRAGILE_MELEE", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ]
+    "flags": [ "FRAGILE_MELEE", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_POLEARMS", "POLEARMS" ]
   },
   {
     "id": "makeshift_halberd",
@@ -119,7 +123,8 @@
     "color": "light_gray",
     "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -42 ] ],
-    "flags": [ "REACH_ATTACK", "POLEARM", "NONCONDUCTIVE", "SHEATH_SPEAR", "FRAGILE_MELEE" ]
+    "flags": [ "REACH_ATTACK", "POLEARM", "NONCONDUCTIVE", "SHEATH_SPEAR", "FRAGILE_MELEE" ],
+    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ]
   },
   {
     "id": "makeshift_glaive",
@@ -150,7 +155,8 @@
     "color": "brown",
     "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "COOK", 1 ] ],
-    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "FRAGILE_MELEE", "SHEATH_SPEAR" ]
+    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "FRAGILE_MELEE", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ]
   },
   {
     "id": "spear_knife",
@@ -182,7 +188,8 @@
     "color": "brown",
     "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "CUT", 1 ], [ "COOK", 1 ], [ "BUTCHER", -28 ] ],
-    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ]
+    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ]
   },
   {
     "id": "spear_homemade_halfpike",
@@ -202,7 +209,8 @@
     "symbol": "/",
     "color": "brown",
     "qualities": [ [ "COOK", 1 ] ],
-    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ]
+    "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ]
   },
   {
     "type": "GENERIC",
@@ -222,6 +230,7 @@
     "cutting": 18,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
     "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "FRAGILE_MELEE", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 4900,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -242,6 +251,7 @@
     "cutting": 20,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
     "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 1400,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -262,6 +272,7 @@
     "cutting": 30,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
     "flags": [ "DURABLE_MELEE", "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 16000,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -302,6 +313,7 @@
     "cutting": 25,
     "to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "neutral" },
     "flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR", "DURABLE_MELEE" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 8000,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -322,6 +334,7 @@
     "cutting": 29,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
     "flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR", "DURABLE_MELEE" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 8000,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -342,7 +355,8 @@
     "cutting": 15,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "SPEAR" ],
+    "flags": [ "SPEAR", "FRAGILE_MELEE" ],
+    "weapon_category": [ "POLEARMS" ],
     "qualities": [ [ "COOK", 1 ], [ "HAMMER", 1 ] ]
   },
   {
@@ -413,6 +427,7 @@
     "material": [ "steel", "wood" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -28 ] ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ],
     "techniques": [ "WIDE", "WBLOCK_1" ],
     "weight": "2100 g",
     "volume": "2500 ml",
@@ -439,6 +454,7 @@
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "uneven" },
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -24 ] ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ],
     "price": 80000,
     "price_postapoc": 9500,
     "category": "weapons"
@@ -486,6 +502,7 @@
     "cutting": 40,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "uneven" },
     "flags": [ "POLEARM", "REACH_ATTACK", "SHEATH_SPEAR" ],
+    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ],
     "//": "Description says it can slash. STAB currently doesn't slash, but at least it doesn't give the spear bonus",
     "price": 8000,
     "price_postapoc": 4500,
@@ -507,6 +524,7 @@
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 11 } ],
     "flags": [ "SPEAR", "SHEATH_SPEAR", "JAVELIN" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 4000,
     "price_postapoc": 250,
     "qualities": [ [ "COOK", 1 ] ]
@@ -528,6 +546,7 @@
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "uneven" },
     "thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 17 } ],
     "flags": [ "SPEAR", "NONCONDUCTIVE", "SHEATH_SPEAR", "JAVELIN" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 9000,
     "price_postapoc": 500,
     "qualities": [ [ "COOK", 1 ] ]
@@ -642,7 +661,8 @@
     "color": "light_gray",
     "techniques": [ "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
-    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ]
+    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_POLEARMS", "POLEARMS" ]
   },
   {
     "id": "spear_dory",

diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json
@@ -124,7 +124,8 @@
     "color": "light_gray",
     "techniques": [ "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
-    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ]
+    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_POLEARMS", "POLEARMS" ]
   },
   {
     "id": "shovel",

diff --git a/data/json/martialarts.json b/data/json/martialarts.json
@@ -1156,81 +1156,7 @@
       }
     ],
     "techniques": [ "tec_silat_hamstring", "tec_silat_precise", "tec_silat_brutal", "tec_silat_dirty" ],
-    "weapons": [
-      "baton-extended",
-      "bone_knife",
-      "bowling_pin",
-      "butterfly_swords",
-      "cudgel",
-      "diveknife",
-      "glaive",
-      "golf_club",
-      "hockey_stick",
-      "i_staff",
-      "javelin",
-      "javelin_iron",
-      "knife_combat",
-      "knife_baselard",
-      "copper_knife",
-      "knife_hunting",
-      "knife_trench",
-      "kris",
-      "kris_fake",
-      "machete",
-      "machete_gimmick",
-      "makeshift_halberd",
-      "makeshift_glaive",
-      "makeshift_knife",
-      "makeshift_machete",
-      "naginata",
-      "naginata_inferior",
-      "naginata_fake",
-      "pipe",
-      "pointy_stick",
-      "pool_cue",
-      "PR24-extended",
-      "primitive_knife",
-      "q_staff",
-      "staff_sling",
-      "rebar",
-      "scimitar",
-      "scimitar_inferior",
-      "scimitar_fake",
-      "scythe",
-      "scythe_war",
-      "shock_staff",
-      "shocktonfa_off",
-      "shocktonfa_on",
-      "sickle",
-      "shillelagh",
-      "shillelagh_fake",
-      "shillelagh_weighted",
-      "spear_knife",
-      "spear_knife_superior",
-      "spear_spike",
-      "spear_rebar",
-      "spear_pipe",
-      "spear_forked",
-      "spear_steel",
-      "spear_survivor",
-      "spear_wood",
-      "spear_copper",
-      "spear_homemade_halfpike",
-      "stick",
-      "survivor_machete",
-      "tanto",
-      "tonfa",
-      "tonfa_wood",
-      "kukri",
-      "knife_rambo",
-      "knife_rm42",
-      "switchblade",
-      "l-stick",
-      "l-stick_on",
-      "wakizashi",
-      "wakizashi_inferior",
-      "wakizashi_fake"
-    ]
+    "weapon_category": [ "KNIVES", "BATONS", "QUARTERSTAVES", "BLADED_FARMING", "POLEARMS" ]
   },
   {
     "type": "martial_art",