Add weapon categories to Abrahams recipes

This allows the weapons in Abrahams recipes to use the new systems added in CDDA
GMC-Modding-Team · Dec 19, 2023 · 9b0fa72 · 9b0fa72
1 parent 9ced1e5
commit 9b0fa72
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/melee/bludgeons.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/melee/bludgeons.json
@@ -12,6 +12,7 @@
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
     "volume": "1272 ml",
+    "weapon_category": [ "QUARTERSTAVES" ],
     "melee_damage": { "bash": 15 },
     "price": "160 USD"
   },
@@ -26,6 +27,7 @@
     "symbol": "/",
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
+    "weapon_category": [ "MACES" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
     "volume": "848 ml",
     "melee_damage": { "bash": 12 },
@@ -43,6 +45,7 @@
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
+    "weapon_category": [ "MACES" ],
     "volume": "636 ml",
     "melee_damage": { "bash": 9 },
     "price": "160 USD"
@@ -59,6 +62,7 @@
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
+    "weapon_category": [ "MACES" ],
     "volume": "212 ml",
     "melee_damage": { "bash": 7 },
     "price": "160 USD"
@@ -75,6 +79,7 @@
     "material": [ "steel" ],
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "DURABLE_MELEE" ],
+    "weapon_category": [ "MACES" ],
     "volume": "141 ml",
     "melee_damage": { "bash": 20 },
     "price": "160 USD"
@@ -91,6 +96,7 @@
     "material": [ "steel" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "QUARTERSTAVES" ],
     "volume": "1272 ml",
     "melee_damage": { "bash": 30 },
     "price": "160 USD"
@@ -107,6 +113,7 @@
     "material": [ "steel", "plastic" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "QUARTERSTAVES" ],
     "volume": "1272 ml",
     "melee_damage": { "bash": 5 },
     "price": "160 USD"
@@ -140,6 +147,7 @@
     "techniques": [ "WBLOCK_1", "DEF_DISARM", "RAPID", "SWEEP", "PRECISE" ],
     "//": "GRAB would be more accurate than SWEEP, but GRAB is not implemented",
     "flags": [ "DURABLE_MELEE" ],
+    "weapon_category": [ "HOOKING_WEAPONRY" ],
     "volume": "141 ml",
     "melee_damage": { "bash": 20 },
     "price": "160 USD"
@@ -182,6 +190,7 @@
     "use_action": { "menu_text": "Collapse", "type": "transform", "target": "tokushukeibo", "msg": "You collapse your tokushukeibo." },
     "volume": "750 ml",
     "melee_damage": { "bash": 12 },
+    "weapon_category": [ "BATONS" ],
     "price": "175 USD"
   },
   {
@@ -227,6 +236,7 @@
     },
     "volume": "750 ml",
     "melee_damage": { "bash": 12 },
+    "weapon_category": [ "BATONS", "HOOKING_WEAPONRY" ],
     "price": "175 USD"
   },
   {
@@ -273,6 +283,7 @@
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
+    "weapon_category": [ "MACES" ],
     "volume": "212 ml",
     "melee_damage": { "bash": 5 },
     "price": "160 USD"
@@ -290,6 +301,7 @@
     "material": [ "steel" ],
     "symbol": "\\",
     "color": "dark_gray",
+    "weapon_category": [ "FLAILS" ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "WRAP", "WHIP_DISARM" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK" ]
   },
@@ -306,6 +318,7 @@
     "material": [ "steel" ],
     "symbol": "\\",
     "color": "dark_gray",
+    "weapon_category": [ "FLAILS" ],
     "techniques": [ "WBLOCK_1", "WRAP", "WHIP_DISARM" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK" ]
   },
@@ -320,6 +333,7 @@
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "DURABLE_MELEE" ],
+    "weapon_category": [ "BATONS" ],
     "weight": "610 g",
     "volume": "900 ml",
     "melee_damage": { "bash": 18 },
@@ -337,6 +351,7 @@
     "material": [ "wood" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "DURABLE_MELEE" ],
+    "weapon_category": [ "BATONS" ],
     "weight": "410 g",
     "volume": "900 ml",
     "melee_damage": { "bash": 12 },

diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/melee/spears_and_polearms.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/melee/spears_and_polearms.json
@@ -14,6 +14,7 @@
     "symbol": "/",
     "color": "light_gray",
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "VORPAL" ],
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
   },
@@ -31,6 +32,7 @@
     "material": [ "steel" ],
     "symbol": "/",
     "color": "light_green",
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "VORPAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
@@ -49,6 +51,7 @@
     "material": [ "steel" ],
     "symbol": "/",
     "color": "light_gray",
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "VORPAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
@@ -65,6 +68,7 @@
     "material": [ "steel" ],
     "techniques": [ "WBLOCK_1", "WBLOCK_2", "PRECISE", "IMPALE" ],
     "volume": "2500 ml",
+    "weapon_category": [ "SPEARS", "POLEARMS" ],
     "melee_damage": { "bash": 40, "cut": 40 },
     "flags": [ "DURABLE_MELEE", "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR" ],
     "price": "800 USD",

diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/melee/swords_and_blades.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/melee/swords_and_blades.json
@@ -13,6 +13,7 @@
     "material": [ "steel" ],
     "symbol": "/",
     "color": "light_gray",
+    "weapon_category": [ "GREAT_SWORDS" ],
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP", "IMPALE", "PRECISE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 4 ] ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "SHEATH_SWORD", "ALWAYS_TWOHAND" ]
@@ -31,6 +32,7 @@
     "material": [ "steel" ],
     "symbol": "/",
     "color": "light_gray",
+    "weapon_category": [ "GREAT_SWORDS" ],
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "VORPAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ]
@@ -49,6 +51,7 @@
     "material": [ "steel" ],
     "symbol": "/",
     "color": "light_gray",
+    "weapon_category": [ "GREAT_SWORDS" ],
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "IMPALE", "PRECISE" ],
     "qualities": [ [ "COOK", 1 ] ],
     "flags": [ "SPEAR", "DURABLE_MELEE", "REACH_ATTACK", "SHEATH_SWORD", "ALWAYS_TWOHAND" ]
@@ -67,6 +70,7 @@
     "material": [ "steel" ],
     "symbol": "/",
     "color": "yellow",
+    "weapon_category": [ "GREAT_SWORDS", "SPEARS" ],
     "techniques": [ "WBLOCK_2", "RAPID", "WIDE", "SWEEP", "IMPALE", "PRECISE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SPEAR", "NONCONDUCTIVE", "REACH_ATTACK" ]
@@ -86,6 +90,7 @@
     "symbol": "/",
     "color": "light_gray",
     "techniques": [ "WBLOCK_1", "RAPID", "WIDE", "BRUTAL", "IMPALE" ],
+    "weapon_category": [ "GREAT_SWORDS", "SPEARS" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "REACH_ATTACK", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
   }