7 New Melee weapons (#83690)

Author: Holli-Git

data/json/items/melee/bludgeons.json

@@ -112,6 +112,17 @@
     "melee_damage": { "bash": 22 },
     "weapon_category": [ "MACES" ]
   },
+  {
+    "type": "ITEM",
+    "id": "bat_metal_bolt",
+    "copy-from": "bat_metal",
+    "name": { "str": "bolt studded aluminum bat" },
+    "description": "An aluminum baseball bat with a selection of bolts threaded through the barrel.  Helps to concentrate the force of a blow, without adding much weight.",
+    "weight": "1138 g",
+    "price_postapoc": "14 USD",
+    "material": [ { "type": "aluminum", "portion": 6 }, { "type": "mc_steel", "portion": 1 } ],
+    "melee_damage": { "bash": 27 }
+  },
   {
     "type": "ITEM",
     "id": "bat_nerf",
@@ -1119,6 +1130,29 @@
     "price": "40 USD",
     "price_postapoc": "5 USD"
   },
+  {
+    "id": "crowbar_warhammer",
+    "type": "ITEM",
+    "symbol": "/",
+    "color": "light_gray",
+    "name": { "str": "bec de crowbar" },
+    "description": "This weapon appears to be a warhammer, but instead of one end of the head being a spike, it's the flats of a crowbar.  While not as good of a weapon as a more traditional warhammer, and not as good as prying as a crowbar, it still does both jobs decently well.",
+    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS", "GREAT_HAMMERS" ],
+    "price": "500 USD",
+    "material": [ { "type": "wood", "portion": 4 }, { "type": "mc_steel", "portion": 1 } ],
+    "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ],
+    "faults": [ { "fault_group": "handle_long" } ],
+    "techniques": [ "WBLOCK_1", "WIDE", "SWEEP" ],
+    "weight": "3200 g",
+    "volume": "3240 ml",
+    "longest_side": "180 cm",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "uneven" },
+    "price_postapoc": "100 USD",
+    "qualities": [ [ "PRY", 2 ], [ "HAMMER", 1 ] ],
+    "use_action": [ "CROWBAR" ],
+    "category": "weapons",
+    "melee_damage": { "bash": 46 }
+  },
   {
     "id": "homemade_polehammer",
     "type": "ITEM",

data/json/items/melee/spears_and_polearms.json

@@ -410,6 +410,37 @@
     "use_action": [ "HEAT_SOLID_ITEMS" ],
     "melee_damage": { "bash": 7, "stab": 24 }
   },
+  {
+    "type": "ITEM",
+    "id": "simple_pike_pipe",
+    "name": { "str": "basic pipe pike" },
+    "description": "Five pipes threaded together to form a very crude pike.  Heavy, slow, and all around cumbersome to carry and fight with.",
+    "weight": "5 kg",
+    "price_postapoc": "1 USD",
+    "color": "light_gray",
+    "looks_like": "spear_pipe",
+    "symbol": "/",
+    "material": [ "steel" ],
+    "techniques": [ "WBLOCK_1" ],
+    "volume": "4 L",
+    "longest_side": "3 meter",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "clumsy" },
+    "flags": [ "FRAGILE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3" ],
+    "weapon_category": [ "SPEARS" ],
+    "price": "120 USD",
+    "qualities": [ [ "COOK", 1 ] ],
+    "use_action": [ "HEAT_SOLID_ITEMS" ],
+    "melee_damage": { "stab": 17 }
+  },
+  {
+    "type": "ITEM",
+    "id": "pike_pipe",
+    "copy-from": "simple_pike_pipe",
+    "name": { "str": "pipe pike" },
+    "description": "Five pipes welded together to form a very crude pike.  Heavy, slow, and all around cumbersome to carry and fight with.",
+    "price_postapoc": "1 USD 50 cent",
+    "melee_damage": { "stab": 23 }
+  },
   {
     "type": "ITEM",
     "id": "pointed_rebar",
@@ -535,6 +566,30 @@
     "price": "50 USD",
     "price_postapoc": "5 USD"
   },
+  {
+    "id": "halberd_crude",
+    "type": "ITEM",
+    "symbol": "/",
+    "color": "light_gray",
+    "name": { "str": "crude halberd" },
+    "description": "A homemade halberd, made by attaching an axe head to a spear shaft.  Not as good as the real thing, but a whole heck of a lot cheaper and easier.",
+    "price": "40 USD",
+    "material": [ "wood", "steel" ],
+    "ascii_picture": "halberd",
+    "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "POLEARMS" ],
+    "techniques": [ "WBLOCK_1", "WIDE", "SWEEP" ],
+    "weight": "2930 g",
+    "//": "Average weight of wood axe head (2.5lb) and fireaxe head (6lb) + 1kg spear shaft",
+    "volume": "2 L",
+    "longest_side": "180 cm",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
+    "faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
+    "price_postapoc": "10 USD",
+    "qualities": [ [ "BUTCHER", -70 ], [ "AXE", 2 ] ],
+    "category": "weapons",
+    "melee_damage": { "bash": 14, "cut": 26 }
+  },
   {
     "id": "bill_hook",
     "type": "ITEM",
@@ -628,6 +683,39 @@
     "price": "80 USD",
     "price_postapoc": "5 USD"
   },
+  {
+    "type": "ITEM",
+    "id": "naginata_machete",
+    "name": { "str_sp": "machete naginata" },
+    "description": "This crude facsimile of a naginata was made by attaching a machete to the end of a spear.",
+    "weight": "1840 g",
+    "color": "light_gray",
+    "symbol": "/",
+    "material": [ { "type": "wood", "portion": 25 }, { "type": "mc_steel", "portion": 21 } ],
+    "techniques": [ "WIDE", "WBLOCK_1" ],
+    "volume": "2040 ml",
+    "longest_side": "200 cm",
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" },
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -24 ] ],
+    "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
+    "weapon_category": [ "POLEARMS" ],
+    "price": "40 USD",
+    "price_postapoc": "25 USD",
+    "category": "weapons",
+    "melee_damage": { "bash": 3, "cut": 30 }
+  },
+  {
+    "type": "ITEM",
+    "id": "naginata_machete_temp",
+    "copy-from": "naginata_machete",
+    "name": { "str_sp": "tempered machete naginata" },
+    "description": "This crude facsimile of a naginata was made by attaching a machete to the end of a spear.  This one uses a tempered machete, making it a bit more sharp and durable.",
+    "price": "50 USD",
+    "price_postapoc": "27 USD",
+    "material": [ { "type": "wood", "portion": 25 }, { "type": "qt_steel", "portion": 21 } ],
+    "melee_damage": { "bash": 3, "cut": 35 }
+  },
   {
     "type": "ITEM",
     "id": "javelin",

data/json/recipes/nested.json

@@ -7125,8 +7125,8 @@
     "name": "pikes",
     "description": "Recipes related to constructing pikes from various materials.",
     "skill_used": "fabrication",
-    "nested_category_data": [ "pike", "pike_bronze", "pike_copper", "pike_wood" ],
-    "difficulty": 3
+    "nested_category_data": [ "pike", "pike_bronze", "pike_copper", "pike_wood", "simple_pike_pipe", "pike_pipe" ],
+    "difficulty": 1
   },
   {
     "id": "nested_throwing_weapons",
@@ -8363,7 +8363,7 @@
     "name": "warhammers",
     "description": "Recipes for making hammers used as weapons instead of tools.",
     "skill_used": "fabrication",
-    "nested_category_data": [ "warhammer", "lucern_hammer", "homemade_polehammer" ],
+    "nested_category_data": [ "warhammer", "lucern_hammer", "homemade_polehammer", "crowbar_warhammer" ],
     "difficulty": 1
   },
   {
@@ -8375,7 +8375,7 @@
     "name": "bats",
     "description": "Recipes for making baseball bats and improving them with various materials.",
     "skill_used": "fabrication",
-    "nested_category_data": [ "bat", "bat_with_lathe", "nailbat", "bwirebat", "nutboltbat" ],
+    "nested_category_data": [ "bat", "bat_with_lathe", "nailbat", "bwirebat", "nutboltbat", "bat_metal_bolt" ],
     "difficulty": 1
   },
   {

data/json/recipes/weapon/bashing.json

@@ -759,6 +759,18 @@
     "proficiencies": [ { "proficiency": "prof_carpentry_basic", "skill_penalty": 0 } ],
     "components": [ [ [ "bat", 1 ] ], [ [ "nuts_bolts", 20 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "bat_metal_bolt",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "fabrication",
+    "time": "10 m",
+    "autolearn": true,
+    "qualities": [ { "id": "DRILL", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "components": [ [ [ "bat_metal", 1 ] ], [ [ "nuts_bolts", 20 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
@@ -1558,5 +1570,25 @@
     "copy-from": "knuckle_impact",
     "time": "4h",
     "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "result": "crowbar_warhammer",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "8 h",
+    "autolearn": true,
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_toolsmithing" }
+    ],
+    "using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 4 ] ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
+    "tools": [ [ [ "drift", -1 ] ] ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
   }
 ]

data/json/recipes/weapon/cutting.json

@@ -2538,5 +2538,60 @@
     "qualities": [ { "id": "GRIND", "level": 2 } ],
     "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],
     "components": [ [ [ "scrap_kevlar", 4 ], [ "plastic_chunk", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "halberd_crude",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "45 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_W", "level": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.15 } ],
+    "using": [ [ "glue_strong", 10 ] ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "fire_ax", 1 ], [ "ax", 1 ] ], [ [ "nails", 3, "LIST" ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "naginata_machete",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "45 m",
+    "autolearn": true,
+    "qualities": [
+      { "id": "CUT", "level": 2 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "SAW_W", "level": 2 },
+      { "id": "DRILL", "level": 2 }
+    ],
+    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.15 } ],
+    "using": [ [ "glue_strong", 10 ] ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "machete", 1 ] ], [ [ "nails", 2, "LIST" ], [ "nuts_bolts", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "naginata_machete_temp",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "45 m",
+    "autolearn": true,
+    "qualities": [
+      { "id": "CUT", "level": 2 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "SAW_W", "level": 2 },
+      { "id": "DRILL", "level": 2 }
+    ],
+    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.15 } ],
+    "using": [ [ "glue_strong", 10 ] ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "survivor_machete_qt", 1 ] ], [ [ "nails", 2, "LIST" ], [ "nuts_bolts", 2 ] ] ]
   }
 ]

data/json/recipes/weapon/piercing.json

@@ -305,6 +305,37 @@
     "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "simple_spear_pipe", 1 ] ] ]
   },
+  {
+    "result": "simple_pike_pipe",
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "skills_required": [ "melee", 1 ],
+    "time": "10 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "pipe", 5 ] ], [ [ "pipe_fittings", 4 ] ] ]
+  },
+  {
+    "result": "pike_pipe",
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "melee", 1 ],
+    "time": "100 m",
+    "autolearn": true,
+    "//": "60cm weld",
+    "using": [ [ "welding_standard", 60 ], [ "steel_chunk_any", 1 ], [ "cordage_superior", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_welding_basic" } ],
+    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "pipe", 5 ] ], [ [ "pipe_fittings", 4 ] ] ]
+  },
   {
     "result": "grip_hook",
     "type": "recipe",

data/json/uncraft/weapon/bashing.json

@@ -6,5 +6,13 @@
     "time": "2 m",
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "scrap", 4 ] ], [ [ "cotton_patchwork", 4 ] ] ]
+  },
+  {
+    "result": "bat_metal_bolt",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "2 m",
+    "qualities": [ { "id": "WRENCH", "level": 1 } ],
+    "components": [ [ [ "material_aluminium_ingot", 3 ] ], [ [ "nuts_bolts", 20 ] ] ]
   }
 ]

data/json/uncraft/weapon/cutting.json

@@ -0,0 +1,26 @@
+[
+  {
+    "result": "halberd_crude",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "2 m",
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "mc_steel_lump", 2 ] ] ]
+  },
+  {
+    "result": "naginata_machete",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "2 m",
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "blade", 1 ] ], [ [ "nuts_bolts", 2 ] ], [ [ "splinter", 1 ] ], [ [ "scrap", 2 ] ] ]
+  },
+  {
+    "result": "naginata_machete_temp",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "2 m",
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
+    "components": [ [ [ "spear_shaft", 1 ] ], [ [ "blade", 1 ] ], [ [ "nuts_bolts", 2 ] ], [ [ "splinter", 1 ] ], [ [ "scrap", 2 ] ] ]
+  }
+]

data/json/uncraft/weapon/piercing.json

@@ -30,5 +30,20 @@
     "time": "10 m",
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "PRYING_NAIL", "level": 1 } ],
     "components": [ [ [ "spear_shaft", 1 ] ], [ [ "knife_huge", 1 ] ], [ [ "nail", 2 ] ], [ [ "string_36", 2 ] ] ]
+  },
+  {
+    "result": "simple_pike_pipe",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "10 m",
+    "components": [ [ [ "pipe", 4 ] ], [ [ "pipe_fittings", 4 ] ], [ [ "scrap", 12 ] ] ]
+  },
+  {
+    "result": "pike_pipe",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "25 m",
+    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 12 ] ], [ [ "lump_cast_iron", 2 ] ] ]
   }
 ]

data/mods/TEST_DATA/expected_dps_data.json

@@ -76,6 +76,7 @@
       "makeshift_scythe_war": 24.5,
       "bill_hook": 32.4,
       "spear_dory": 28.0,
+      "naginata_machete_temp": 28.6,
       "qiang": 30.68,
       "lucern_hammer": 31.5,
       "glaive": 33.12,