From 2d72247cf099f58d9c0e22a9c14eba52830549d4 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Mon, 8 Apr 2024 13:29:51 -0400 Subject: [PATCH] feat(content): tool axe rebalance, tomahawks (#4452) * Boop Adjusted to-hit of hatchet, stone axe, and copper axe to be +1 like the wood axe (since they are all single-edged cutting weapons). Added the stone tomahawk, a more lightweight primitive axe better for combat and utility (though not chopping trees). * Copper, stone axe to-hit Made the copper and stone axes have 0 to-hit to reflect their primitive tool status * Added copper tomahawk Added copper tomahawk * Made stone and copper axe 2handed * Adjusted tomahawk damages * Made the tomahawks use the axe sheath * style(autofix.ci): automated formatting * Update data/json/items/tool/woodworking.json Co-authored-by: Chaosvolt * Update data/json/items/tool/woodworking.json Co-authored-by: Chaosvolt * Update data/json/items/tool/woodworking.json Co-authored-by: Chaosvolt * Rebalanced hatchet & copper tomahawk The hatchet and copper tomahawk have been rebalanced, the hatchet now has slightly lower DPS than the hand-forged sword and the copper tomahawk has equivalent DPS to the copper spear. --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt --- data/json/items/tool/woodworking.json | 55 +++++++++++++++++++++++---- data/json/recipes/weapon/cutting.json | 55 +++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 7 deletions(-) diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index bfd104cf31b3..3a35becc21b9 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -121,7 +121,7 @@ "id": "copper_ax", "type": "GENERIC", "category": "tools", - "weapon_category": [ "1H_AXES" ], + "weapon_category": [ "2H_AXES" ], "name": { "str": "copper axe" }, "description": "This is a decent-sized chunk of worked copper affixed to a wooden shaft, to make a crude yet effective axe.", "weight": "3700 g", @@ -130,7 +130,6 @@ "price_postapoc": "50 cent", "bashing": 30, "cutting": 20, - "to_hit": -2, "material": [ "wood", "copper" ], "symbol": "/", "color": "brown", @@ -153,9 +152,9 @@ "techniques": [ "WBLOCK_1" ], "weight": "907 g", "volume": "1 L", - "bashing": 17, - "cutting": 28, - "to_hit": -2, + "bashing": 12, + "cutting": 18, + "to_hit": 1, "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ], "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ] }, @@ -229,7 +228,7 @@ "id": "primitive_axe", "type": "GENERIC", "category": "tools", - "weapon_category": [ "1H_AXES" ], + "weapon_category": [ "2H_AXES" ], "name": { "str": "stone axe" }, "description": "This is a stone with a narrow edge affixed to a stick. It can chop wood, but requires much more effort than a modern axe.", "weight": "3154 g", @@ -238,7 +237,6 @@ "price_postapoc": "50 cent", "bashing": 9, "cutting": 15, - "to_hit": -2, "material": [ "wood", "stone" ], "symbol": "/", "color": "light_gray", @@ -280,5 +278,48 @@ "color": "light_gray", "qualities": [ [ "CHISEL", 1 ] ], "flags": [ "BELT_CLIP" ] + }, + { + "id": "tomahawk_primitive", + "type": "GENERIC", + "category": "weapons", + "weapon_category": [ "1H_AXES" ], + "symbol": ";", + "color": "light_gray", + "name": { "str": "stone tomahawk" }, + "description": "A lightweight one-handed combat hatchet typically made of stone or bone, originally used by the Algonquian people. It makes for a half decent tool and weapon.", + "price_postapoc": 100, + "material": [ "wood", "stone" ], + "techniques": [ "WBLOCK_1" ], + "volume": "1500 ml", + "weight": "1750 g", + "looks_like": "hatchet", + "bashing": 5, + "cutting": 12, + "to_hit": 1, + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE" ], + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ] + }, + { + "id": "tomahawk_copper", + "type": "GENERIC", + "category": "weapons", + "weapon_category": [ "1H_AXES" ], + "symbol": ";", + "color": "light_red", + "name": { "str": "copper tomahawk" }, + "description": "A lightweight one-handed combat hatchet made using basic copper. Slightly better than stone, though not as historically accurate.", + "price": 3000, + "price_postapoc": 600, + "material": [ "copper", "wood" ], + "techniques": [ "WBLOCK_1" ], + "volume": "1500 ml", + "weight": "1450 g", + "looks_like": "hatchet", + "bashing": 5, + "cutting": 17, + "to_hit": 1, + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE", "NONCONDUCTIVE" ], + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ] } ] diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 0a88a29b2bb8..1b6baadb9238 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -623,5 +623,60 @@ "autolearn": true, "book_learn": [ [ "textbook_weapeast", 3 ], [ "recipe_melee", 4 ] ], "using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 3 ] ] + }, + { + "type": "recipe", + "result": "tomahawk_primitive", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "survival", 3 ], + "time": "1 h", + "reversible": true, + "autolearn": true, + "book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ + [ [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "sharp_rock", 1 ], [ "bone_sturdy", 1, "LIST" ] ], + [ [ "stick", 1 ], [ "2x4", 1 ] ], + [ + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ], + [ "rag", 1 ], + [ "leather", 1 ], + [ "fur", 1 ], + [ "faux_fur", 1 ], + [ "felt_patch", 1 ] + ] + ] + }, + { + "type": "recipe", + "result": "tomahawk_copper", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "survival", 3 ], + "time": "1 h", + "reversible": true, + "autolearn": true, + "book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], + "components": [ + [ [ "stick", 1 ], [ "2x4", 1 ] ], + [ [ "copper_scrap_equivalent", 25, "LIST" ] ], + [ + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ], + [ "rag", 1 ], + [ "leather", 1 ], + [ "fur", 1 ], + [ "faux_fur", 1 ], + [ "felt_patch", 1 ] + ] + ] } ]