Merge pull request CleverRaven#52671 from Termineitor244/Fior-Di-Batt…

…aglia-Weapons Weapon Categories: Fior Di Battaglia
ZeroInternalReflection · Nov 11, 2021 · 38b2329 · 38b2329
2 parents d971d87 + 645a8b1
commit 38b2329
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 39 deletions.
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -150,6 +150,7 @@
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -20 ] ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "category": "weapons"
   },
   {
@@ -437,6 +438,7 @@
     "symbol": "/",
     "material": [ "wood", "steel" ],
     "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
     "volume": "1250 ml",
     "longest_side": "80 cm",
@@ -457,6 +459,7 @@
     "material": [ "wood", "steel" ],
     "looks_like": "hammer_sledge",
     "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "volume": "900 ml",
     "longest_side": "60 cm",
@@ -516,7 +519,7 @@
     "price_postapoc": 50,
     "material": [ "wood", "plastic" ],
     "techniques": [ "WBLOCK_1" ],
-    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ],
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
     "weight": "420 g",
     "volume": "1750 ml",
     "longest_side": "150 cm",
@@ -629,6 +632,7 @@
     "color": "light_gray",
     "name": { "str": "lucerne hammer" },
     "description": "This is a versatile polearm with a spiked hammer head, a spike, and a hook attached to a beefy wooden pole.",
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "price": 50000,
     "material": [ "wood", "steel" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ],
@@ -1165,6 +1169,7 @@
     "material": [ "iron", "wood" ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE", "BELT_CLIP" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "volume": "1250 ml",
     "longest_side": "120 cm",
     "bashing": 22,

diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json
@@ -52,7 +52,8 @@
     "color": "dark_gray",
     "qualities": [ [ "DIG", 2 ], [ "AXE", 1 ], [ "CUT", 1 ], [ "BUTCHER", -11 ], [ "COOK", 1 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "flags": [ "NEEDS_UNFOLD", "BELT_CLIP", "SHEATH_AXE" ]
+    "flags": [ "NEEDS_UNFOLD", "BELT_CLIP", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ]
   },
   {
     "id": "tazer",

diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -103,7 +103,7 @@
     "techniques": [ "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
     "flags": [ "FRAGILE_MELEE", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ],
-    "weapon_category": [ "BLADED_FARMING", "HOOKING_POLEARMS", "POLEARMS" ]
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_WEAPONRY", "POLEARMS" ]
   },
   {
     "id": "makeshift_halberd",
@@ -125,7 +125,7 @@
     "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -42 ] ],
     "flags": [ "REACH_ATTACK", "POLEARM", "NONCONDUCTIVE", "SHEATH_SPEAR", "FRAGILE_MELEE" ],
-    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ]
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ]
   },
   {
     "id": "makeshift_glaive",
@@ -434,7 +434,7 @@
     "material": [ "wood", "steel" ],
     "ascii_picture": "halberd",
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
-    "weapon_category": [ "POLEARMS" ],
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
     "techniques": [ "WBLOCK_1", "WIDE", "SWEEP" ],
     "weight": "3175 g",
     "volume": "3750 ml",
@@ -472,7 +472,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" ],
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
     "techniques": [ "WIDE", "WBLOCK_1" ],
     "weight": "2100 g",
     "volume": "2500 ml",
@@ -499,7 +499,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" ],
+    "weapon_category": [ "POLEARMS" ],
     "price": 80000,
     "price_postapoc": 9500,
     "category": "weapons"
@@ -547,7 +547,7 @@
     "cutting": 40,
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "uneven" },
     "flags": [ "POLEARM", "REACH_ATTACK", "SHEATH_SPEAR" ],
-    "weapon_category": [ "HOOKING_POLEARMS", "POLEARMS" ],
+    "weapon_category": [ "HOOKING_WEAPONRY", "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,
@@ -710,7 +710,7 @@
     "techniques": [ "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ],
-    "weapon_category": [ "BLADED_FARMING", "HOOKING_POLEARMS", "POLEARMS" ]
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_WEAPONRY", "POLEARMS" ]
   },
   {
     "id": "spear_dory",
@@ -744,6 +744,7 @@
     "material": [ "wood", "steel" ],
     "ascii_picture": "halberd",
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL" ],
     "weight": "2200 g",
     "volume": "3000 ml",
@@ -773,7 +774,7 @@
     "color": "yellow",
     "techniques": [ "WBLOCK_1", "DEF_DISARM" ],
     "flags": [ "DURABLE_MELEE", "POLEARM", "REACH_ATTACK", "ALWAYS_TWOHAND", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
-    "weapon_category": [ "POLEARMS" ]
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ]
   },
   {
     "id": "spear_stone",

diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json
@@ -68,6 +68,7 @@
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "qualities": [ [ "AXE", 2 ], [ "PRY", 3 ], [ "BUTCHER", -30 ] ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "use_action": [ "CROWBAR" ],
     "pocket_data": [
       {

diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json
@@ -54,6 +54,7 @@
     "color": "brown",
     "qualities": [ [ "DIG", 1 ] ],
     "techniques": [ "WBLOCK_1" ],
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_WEAPONRY" ],
     "use_action": [ "MAKEMOUND" ]
   },
   {
@@ -125,7 +126,7 @@
     "techniques": [ "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
-    "weapon_category": [ "BLADED_FARMING", "HOOKING_POLEARMS", "POLEARMS" ]
+    "weapon_category": [ "BLADED_FARMING", "HOOKING_WEAPONRY", "POLEARMS" ]
   },
   {
     "id": "shovel",

diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json
@@ -16,7 +16,8 @@
     "color": "light_gray",
     "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -36 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ]
+    "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ]
   },
   {
     "id": "bow_saw",
@@ -136,7 +137,8 @@
     "color": "brown",
     "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -44 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ]
+    "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ]
   },
   {
     "type": "GENERIC",
@@ -269,7 +271,8 @@
     "symbol": "/",
     "color": "light_gray",
     "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -70 ], [ "HAMMER", 1 ] ],
-    "flags": [ "BELT_CLIP", "SHEATH_AXE" ]
+    "flags": [ "BELT_CLIP", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ]
   },
   {
     "id": "saw",

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -752,7 +752,8 @@
     "color": "dark_gray",
     "use_action": [ "PICKAXE" ],
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "SPEAR", "DURABLE_MELEE", "NONCONDUCTIVE", "DIG_TOOL", "SHEATH_AXE" ]
+    "flags": [ "SPEAR", "DURABLE_MELEE", "NONCONDUCTIVE", "DIG_TOOL", "SHEATH_AXE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ]
   },
   {
     "id": "pin_reamer",

diff --git a/data/json/martialarts.json b/data/json/martialarts.json
@@ -632,30 +632,7 @@
       "tec_medievalpole_execute",
       "tec_medievalpole_break"
     ],
-    "weapons": [
-      "ax",
-      "battleaxe",
-      "battleaxe_fake",
-      "battleaxe_inferior",
-      "copper_ax",
-      "fire_ax",
-      "glaive",
-      "halberd",
-      "halberd_fake",
-      "hammer_sledge",
-      "hammer_sledge_short",
-      "hockey_stick",
-      "hoe",
-      "ji",
-      "lobotomizer",
-      "lucern_hammer",
-      "lucern_hammerfake",
-      "makeshift_halberd",
-      "makeshift_glaive",
-      "pickaxe",
-      "poleaxe",
-      "primitive_axe"
-    ]
+    "weapon_category": [ "HOOKING_WEAPONRY" ]
   },
   {
     "type": "martial_art",