From 46b65186512b716ac890c5c54579ba9fecb02afc Mon Sep 17 00:00:00 2001 From: catdach <93795131+catdach@users.noreply.github.com> Date: Wed, 27 Apr 2022 14:19:31 -0400 Subject: [PATCH 1/2] weapon cats Tiger Claw added weapon categories for Tiger Claw --- data/json/items/tool/entry_tools.json | 3 ++- data/json/items/tool/firefighting.json | 1 + data/json/items/tool/woodworking.json | 7 ++++--- data/json/weapon_categories.json | 7 ++++++- data/mods/MMA/martialarts.json | 13 +------------ data/mods/MMA/swords_and_blades.json | 7 +++++++ data/mods/MMA/weapon_categories.json | 5 +++++ 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json index 5ea520586c9a6..8e44cc1926ed0 100644 --- 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 index 070649f074e42..62553091c9599 100644 --- 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 index 3eaf0153a1f68..78f2526971061 100644 --- 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 index 0ce1166936962..8da505d029234 100644 --- 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 index fa59c79f30984..76fe69bc11622 100644 --- 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 index 3792f8f2fd81f..694ca2eb7d31c 100644 --- 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 index c1b660436fe36..6ca402c39007a 100644 --- 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" } ] From aea07ed7d738809e9340e37975cb1f0e1ef4913e Mon Sep 17 00:00:00 2001 From: catdach <93795131+catdach@users.noreply.github.com> Date: Wed, 27 Apr 2022 14:49:27 -0400 Subject: [PATCH 2/2] misc hand axes fixes --- data/json/items/tool/entry_tools.json | 2 +- data/json/items/tool/firefighting.json | 2 +- data/json/weapon_categories.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json index 8e44cc1926ed0..14cd1b643115b 100644 --- a/data/json/items/tool/entry_tools.json +++ b/data/json/items/tool/entry_tools.json @@ -70,7 +70,7 @@ "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "PRY", 2 ] ], "use_action": [ "CROWBAR" ], "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE" ], - "weapon_category": [ "HAND AXES" ] + "weapon_category": [ "HAND_AXES" ] }, { "id": "makeshift_crowbar", diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json index 62553091c9599..7f520914744ba 100644 --- a/data/json/items/tool/firefighting.json +++ b/data/json/items/tool/firefighting.json @@ -19,7 +19,7 @@ "cutting": 28, "to_hit": -2, "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ], - "weapon_category": [ "HAND AXES" ], + "weapon_category": [ "HAND_AXES" ], "use_action": [ "CROWBAR" ], "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "PRY", 2 ], [ "BUTCHER", 16 ] ] }, diff --git a/data/json/weapon_categories.json b/data/json/weapon_categories.json index 8da505d029234..29ed00673b6f6 100644 --- a/data/json/weapon_categories.json +++ b/data/json/weapon_categories.json @@ -128,5 +128,5 @@ "type": "weapon_category", "id": "HAND_AXES", "name": "HAND AXES" - }, + } ]