Merge pull request #57214 from catdach/MMA_weapon_cats_Tiger_Claw

[MMA] Weapon Categories: Tiger Claw + update great axes category
CleverRaven · Apr 29, 2022 · 963495a · 963495a
2 parents d026d85 + aea07ed
commit 963495a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json
@@ -69,7 +69,8 @@
     "techniques": [ "WBLOCK_1" ],
     "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "PRY", 2 ] ],
     "use_action": [ "CROWBAR" ],
-    "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE" ]
+    "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE" ],
+    "weapon_category": [ "HAND_AXES" ]
   },
   {
     "id": "makeshift_crowbar",

diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json
@@ -19,6 +19,7 @@
     "cutting": 28,
     "to_hit": -2,
     "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ],
+    "weapon_category": [ "HAND_AXES" ],
     "use_action": [ "CROWBAR" ],
     "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "PRY", 2 ], [ "BUTCHER", 16 ] ]
   },

diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json
@@ -17,7 +17,7 @@
     "qualities": [ [ "CUT", 1 ], [ "AXE", 2 ], [ "BUTCHER", -36 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
-    "weapon_category": [ "HOOKING_WEAPONRY" ]
+    "weapon_category": [ "HOOKING_WEAPONRY", "GREAT_AXES" ]
   },
   {
     "id": "bow_saw",
@@ -139,7 +139,7 @@
     "qualities": [ [ "CUT", 1 ], [ "AXE", 1 ], [ "BUTCHER", -44 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
-    "weapon_category": [ "HOOKING_WEAPONRY" ]
+    "weapon_category": [ "HOOKING_WEAPONRY", "GREAT_AXES" ]
   },
   {
     "type": "GENERIC",
@@ -159,6 +159,7 @@
     "cutting": 28,
     "to_hit": -2,
     "flags": [ "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ],
+    "weapon_category": [ "HAND_AXES" ],
     "category": "weapons",
     "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ]
   },
@@ -273,7 +274,7 @@
     "color": "light_gray",
     "qualities": [ [ "CUT", 1 ], [ "AXE", 1 ], [ "BUTCHER", -70 ], [ "HAMMER", 1 ] ],
     "flags": [ "BELT_CLIP", "SHEATH_AXE" ],
-    "weapon_category": [ "HOOKING_WEAPONRY" ]
+    "weapon_category": [ "HOOKING_WEAPONRY", "GREAT_AXES" ]
   },
   {
     "id": "saw",

diff --git a/data/json/weapon_categories.json b/data/json/weapon_categories.json
@@ -123,5 +123,10 @@
     "type": "weapon_category",
     "id": "GREAT_AXES",
     "name": "GREAT AXES"
+  },
+  {
+    "type": "weapon_category",
+    "id": "HAND_AXES",
+    "name": "HAND AXES"
   }
 ]
diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json
@@ -591,17 +591,6 @@
       }
     ],
     "techniques": [ "mma_tec_tiger_claw_break" ],
-    "weapons": [
-      "bagh_nakha",
-      "battleaxe",
-      "battleaxe_inferior",
-      "battleaxe_fake",
-      "bio_claws_weapon",
-      "hand_axe",
-      "hatchet",
-      "kukri",
-      "makeshift_axe"
-    ],
-    "weapon_category": [ "GREAT_AXES" ]
+    "weapon_category": [ "CLAWS", "HAND_AXES", "GREAT_AXES", "EXEMPLAR_WEAPON_TIGER_CLAW" ]
   }
 ]
diff --git a/data/mods/MMA/swords_and_blades.json b/data/mods/MMA/swords_and_blades.json
@@ -5,5 +5,12 @@
     "type": "TOOL",
     "name": { "str": "scimitar" },
     "extend": { "weapon_category": [ "DESERT_SWORDS" ] }
+  },
+  {
+    "id": "kukri",
+    "copy-from": "kukri",
+    "type": "TOOL",
+    "name": { "str": "kukri" },
+    "extend": { "weapon_category": [ "EXEMPLAR_WEAPON_TIGER_CLAW" ] }
   }
 ]
diff --git a/data/mods/MMA/weapon_categories.json b/data/mods/MMA/weapon_categories.json
@@ -3,5 +3,10 @@
     "type": "weapon_category",
     "id": "DESERT_SWORDS",
     "name": "DESERT SWORDS"
+  },
+  {
+    "type": "weapon_category",
+    "id": "EXEMPLAR_WEAPON_TIGER_CLAW",
+    "name": "EXEMPLAR WEAPON"
   }
 ]