Homemade polehammers (#74786)

* Update bludgeons.json * Update bashing.json * Change name, weapon category, techniques, to hit, damage * Crafting changes * Requirements for training * Expected DPS * Sort DPS * Update data/json/recipes/weapon/bashing.json --------- Co-authored-by: Maleclypse <[email protected]>
CleverRaven · Jul 16, 2024 · 4695db8 · 4695db8
1 parent 63cf7fc
commit 4695db8
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 2 deletions.
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -1171,6 +1171,42 @@
     "price": "40 USD",
     "price_postapoc": "5 USD"
   },
+  {
+    "id": "homemade_polehammer",
+    "type": "GENERIC",
+    "symbol": "/",
+    "color": "light_gray",
+    "looks_like": "lucern_hammer",
+    "name": { "str": "homemade polehammer" },
+    "description": "A standard hammerhead solidly mounted at the end of a proper spear shaft.  The long leverage provides surprising balance and impact force.  Simple and effective.",
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
+    "material": [ "wood", "steel" ],
+    "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
+    "weight": "1500 g",
+    "volume": "1250 ml",
+    "longest_side": "180 cm",
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
+    "price": "50 USD",
+    "price_postapoc": "10 USD",
+    "qualities": [ [ "HAMMER", 1 ] ],
+    "category": "weapons",
+    "melee_damage": { "bash": 30 }
+  },
+  {
+    "id": "homemade_polehammer_makeshift",
+    "copy-from": "homemade_polehammer",
+    "type": "GENERIC",
+    "name": { "str": "makeshift homemade polehammer" },
+    "description": "A standard hammerhead mounted at the end of a long stick.  It is far from being a proper weapon, but it allows you to bash zombie heads from a safe distance.",
+    "delete": { "flags": [ "DURABLE_MELEE" ] },
+    "weight": "1800 g",
+    "volume": "1650 ml",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "uneven" },
+    "price": "5 USD",
+    "price_postapoc": "2 USD",
+    "melee_damage": { "bash": 27 }
+  },
   {
     "type": "GENERIC",
     "id": "mace",

diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json
@@ -189,6 +189,33 @@
     "tools": [ [ [ "drift", -1 ] ] ],
     "components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "homemade_polehammer",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_BASHING",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "time": "45 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ],
+    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.15 } ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "hammer", 1 ], [ "homemade_polehammer_makeshift", 1 ] ], [ [ "nails", 3, "LIST" ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "homemade_polehammer_makeshift",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_BASHING",
+    "skill_used": "fabrication",
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ],
+    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.15 } ],
+    "components": [ [ [ "stick_long", 1 ], [ "long_pole", 1 ] ], [ [ "hammer", 1 ] ], [ [ "superglue", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

diff --git a/data/json/requirements/melee.json b/data/json/requirements/melee.json
@@ -15,7 +15,6 @@
         [ "sharp_toothbrush", -1 ],
         [ "bone_knife", -1 ],
         [ "knuckle_katar", -1 ],
-        [ "sharp_toothbrush", -1 ],
         [ "knife_small", -1 ],
         [ "knife_large", -1 ],
         [ "screwdriver", -1 ],
@@ -53,6 +52,8 @@
         [ "ax_sheets_bolted", -1 ],
         [ "hockey_stick", -1 ],
         [ "lucern_hammerfake", -1 ],
+        [ "homemade_polehammer", -1 ],
+        [ "homemade_polehammer_makeshift", -1 ],
         [ "hammer_sledge", -1 ],
         [ "hammer_sledge_short", -1 ],
         [ "hammer_sledge_heavy", -1 ],
@@ -632,7 +633,9 @@
         [ "naginata_inferior", -1 ],
         [ "makeshift_scythe_war", -1 ],
         [ "hockey_stick", -1 ],
-        [ "lucern_hammerfake", -1 ]
+        [ "lucern_hammerfake", -1 ],
+        [ "homemade_polehammer", -1 ],
+        [ "homemade_polehammer_makeshift", -1 ]
       ]
     ]
   },

diff --git a/data/mods/TEST_DATA/expected_dps_data/polearms_dps.json b/data/mods/TEST_DATA/expected_dps_data/polearms_dps.json
@@ -11,11 +11,13 @@
       "halberd_fake": 12.77,
       "long_pole": 13.0,
       "pike_copper": 13.96,
+      "homemade_polehammer_makeshift": 14.31,
       "spear_homemade_halfpike": 15.41,
       "pike_inferior": 16.0,
       "naginata_inferior": 19.35,
       "makeshift_halberd": 20.5,
       "makeshift_glaive": 20.55,
+      "homemade_polehammer": 21.35,
       "bronze_brush_axe": 21.57,
       "pike": 23.0,
       "makeshift_scythe_war": 24.5,