diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json index cdf710ab3a7f2..05e919e508284 100644 --- a/data/json/itemgroups/gear.json +++ b/data/json/itemgroups/gear.json @@ -93,7 +93,10 @@ [ "cotton_ball", 2 ], [ "crowbar", 15 ], [ "entry_suit", 10 ], - [ "hammer_sledge", 15 ], + [ "hammer_sledge", 5 ], + [ "hammer_sledge_short", 4 ], + [ "hammer_sledge_engineer", 5 ], + [ "hammer_sledge_heavy", 1 ], [ "shovel", 20 ], [ "cell_phone", 10 ], [ "smart_phone", 10 ], diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 3ac59eb3d5c5e..0bf67f8b575a6 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -1419,7 +1419,8 @@ [ "knuckle_brass", 20 ], [ "hammer", 35 ], [ "wrench", 30 ], - [ "hammer_sledge", 6 ], + [ "hammer_sledge", 4 ], + [ "hammer_sledge_short", 2 ], [ "hatchet", 10 ], [ "ax", 8 ], [ "knife_combat", 14 ], diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json index ddc25ddcde29c..111f6f81c3ed2 100644 --- a/data/json/itemgroups/locations_commercial.json +++ b/data/json/itemgroups/locations_commercial.json @@ -290,7 +290,10 @@ [ "steel_lump", 30 ], [ "manhole_cover", 1 ], [ "rock", 40 ], - [ "hammer_sledge", 6 ], + [ "hammer_sledge", 2 ], + [ "hammer_sledge_short", 2 ], + [ "hammer_sledge_engineer", 1 ], + [ "hammer_sledge_heavy", 1 ], [ "ax", 8 ], [ "knife_butcher", 10 ], [ "knife_combat", 14 ], diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 5c683b0dbf428..2f1c42a6204da 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -152,7 +152,10 @@ [ "bucket", 50 ], [ "mop", 100 ], [ "shovel", 40 ], - [ "hammer_sledge", 50 ], + [ "hammer_sledge", 10 ], + [ "hammer_sledge_short", 20 ], + [ "hammer_sledge_engineer", 20 ], + [ "hammer_sledge_heavy", 10 ], [ "spray_can", 100 ], [ "permanent_marker", 50 ], [ "funnel", 200 ], @@ -184,7 +187,15 @@ "id": "tools_entry", "type": "item_group", "//": "Tools used for forcing entry into a building", - "items": [ [ "boltcutters", 30 ], [ "crowbar", 50 ], [ "claw_bar", 25 ], [ "hammer_sledge", 20 ], [ "halligan", 10 ] ] + "items": [ + [ "boltcutters", 30 ], + [ "crowbar", 50 ], + [ "claw_bar", 25 ], + [ "hammer_sledge", 5 ], + [ "hammer_sledge_short", 5 ], + [ "hammer_sledge_engineer", 10 ], + [ "halligan", 10 ] + ] }, { "id": "tools_home", diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index b7a454548d1e6..a00f0cb37089c 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -369,17 +369,70 @@ "id": "hammer_sledge", "name": "sledge hammer", "description": "A large, heavy hammer. Makes an acceptable melee weapon for the very strong, but is nearly useless in the hands of the weak.", - "weight": "4500 g", + "weight": "4250 g", "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ], - "volume": "2500 ml", + "volume": "1250 ml", "bashing": 40, "price": 12000, "qualities": [ [ "HAMMER", 1 ] ] }, + { + "type": "GENERIC", + "id": "hammer_sledge_short", + "name": "short sledge hammer", + "description": "A shorter sledge hammer, still as weighty, however, due to the same steel head. Worse as a melee weapon but is a more portable tool.", + "weight": "4000 g", + "color": "brown", + "symbol": "/", + "material": [ "wood", "steel" ], + "looks_like": "hammer_sledge", + "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], + "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], + "volume": "900 ml", + "bashing": 35, + "to_hit": -1, + "price": 12000, + "qualities": [ [ "HAMMER", 1 ] ] + }, + { + "type": "GENERIC", + "id": "hammer_sledge_engineer", + "name": "engineer's hammer", + "description": "A stout and hefty hammer, more akin to a sledge than a typical ball-peen. Useful for portable demolition work, but is very unwieldy as a weapon.", + "weight": "2000 g", + "color": "brown", + "symbol": "/", + "material": [ "wood", "steel" ], + "looks_like": "hammer_sledge", + "flags": [ "NONCONDUCTIVE", "BELT_CLIP" ], + "volume": "600 ml", + "bashing": 25, + "to_hit": -1, + "price": 6000, + "qualities": [ [ "HAMMER", 2 ] ] + }, + { + "type": "GENERIC", + "id": "hammer_sledge_heavy", + "name": "heavy sledge hammer", + "description": "A large sledge hammer with a massive, heavy head. This unwieldy tool is meant to break concrete, rock, brick, anything really.", + "weight": "9500 g", + "color": "brown", + "symbol": "/", + "material": [ "wood", "steel" ], + "looks_like": "hammer_sledge", + "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], + "techniques": [ "BRUTAL", "WIDE" ], + "volume": "1700 ml", + "bashing": 80, + "to_hit": -4, + "price": 24000, + "qualities": [ [ "HAMMER", 1 ] ] + }, { "type": "GENERIC", "id": "hockey_stick", diff --git a/data/json/martialarts.json b/data/json/martialarts.json index ca1689c44ea19..4f0dc76be0397 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -482,6 +482,7 @@ "halberd", "halberd_fake", "hammer_sledge", + "hammer_sledge_short", "hockey_stick", "hoe", "ji", diff --git a/data/json/npcs/NC_ARSONIST.json b/data/json/npcs/NC_ARSONIST.json index b23a2803707b3..a87a58d36f3d1 100644 --- a/data/json/npcs/NC_ARSONIST.json +++ b/data/json/npcs/NC_ARSONIST.json @@ -85,7 +85,8 @@ "items": [ [ "hammer", 20 ], [ "wrench", 20 ], - [ "hammer_sledge", 20 ], + [ "hammer_sledge", 10 ], + [ "hammer_sledge_short", 10 ], [ "pipe", 20 ], [ "bat", 20 ], [ "bat_metal", 20 ], diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index 15a5da9879a10..4569bd4d596da 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -294,7 +294,10 @@ [ "saw", 15 ], [ "circsaw_off", 5 ], [ "hacksaw", 17 ], - [ "hammer_sledge", 6 ], + [ "hammer_sledge", 2 ], + [ "hammer_sledge_short", 2 ], + [ "hammer_sledge_engineer", 1 ], + [ "hammer_sledge_heavy", 1 ], [ "xacto", 10 ], [ "flashlight", 40 ], [ "crowbar", 18 ], diff --git a/data/json/npcs/NC_THUG.json b/data/json/npcs/NC_THUG.json index 921021f1d2b18..7391d84308f70 100644 --- a/data/json/npcs/NC_THUG.json +++ b/data/json/npcs/NC_THUG.json @@ -3,7 +3,8 @@ "type": "item_group", "id": "NC_THUG_bashing", "items": [ - [ "hammer_sledge", 20 ], + [ "hammer_sledge", 10 ], + [ "hammer_sledge_short", 10 ], [ "spear_rebar", 20 ], [ "bat", 20 ], [ "crowbar", 20 ], diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index c68493e638455..1292d75184641 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -588,7 +588,10 @@ [ "halligan", 1 ], [ "hamburger", 1 ], [ "hammer", 7 ], - [ "hammer_sledge", 3 ], + [ "hammer_sledge", 1 ], + [ "hammer_sledge_short", 1 ], + [ "hammer_sledge_engineer", 1 ], + [ "hammer_sledge_heavy", 1 ], [ "hand_drill", 2 ], [ "handflare", 3 ], [ "hardtack", 2 ], diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index a9127094f4a65..1e0cca59ff2c0 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2417,12 +2417,72 @@ "skill_used": "fabrication", "difficulty": 6, "time": "7 h 40 m", - "autolearn": true, + "byproducts": [ [ "splinter", 13 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "2x4", 3 ] ] ] + "components": [ [ [ "2x4", 1 ] ] ] + }, + { + "type": "recipe", + "result": "hammer_sledge_short", + "id_suffix": "forged", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 6, + "time": "7 h 40 m", + "byproducts": [ [ "splinter", 14 ] ], + "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], + "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ], + "qualities": [ { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "2x4", 1 ] ] ] + }, + { + "type": "recipe", + "result": "hammer_sledge_short", + "id_suffix": "from_cutting", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 1, + "time": "2 m", + "byproducts": [ [ "splinter", 1 ] ], + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "hammer_sledge", 1 ] ] ] + }, + { + "type": "recipe", + "result": "hammer_sledge_heavy", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 6, + "time": "8 h 40 m", + "byproducts": [ [ "splinter", 13 ] ], + "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], + "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 20 ] ], + "qualities": [ { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "2x4", 1 ] ] ] + }, + { + "type": "recipe", + "result": "hammer_sledge_engineer", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 6, + "time": "6 h 40 m", + "byproducts": [ [ "splinter", 16 ] ], + "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], + "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 4 ] ], + "qualities": [ { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "2x4", 1 ] ] ] }, { "type": "recipe", diff --git a/data/json/vehicles/emergency.json b/data/json/vehicles/emergency.json index 30cb28975c7cc..bd23d2eb91aeb 100644 --- a/data/json/vehicles/emergency.json +++ b/data/json/vehicles/emergency.json @@ -674,10 +674,15 @@ "chance": 1, "items": [ "bunker_coat", "bunker_pants", "boots_bunker", "fire_gauntlets", "firehelmet", "mask_bunker" ] }, - { "x": -5, "y": -1, "chance": 7, "items": [ "fire_ax", "hammer_sledge", "shovel", "throw_extinguisher" ] }, + { + "x": -5, + "y": -1, + "chance": 7, + "items": [ "fire_ax", "hammer_sledge", "hammer_sledge_short", "shovel", "throw_extinguisher" ] + }, { "x": -5, "y": 3, "chance": 1, "items": [ "fire_ax", "chainsaw_off", "halligan", "throw_extinguisher" ] }, { "x": -6, "y": 0, "chance": 1, "items": [ "nomex_suit", "nomex_hood", "nomex_gloves", "nomex_socks" ] }, - { "x": -6, "y": -1, "chance": 5, "items": [ "halligan", "crowbar", "hammer_sledge" ] }, + { "x": -6, "y": -1, "chance": 5, "items": [ "halligan", "crowbar", "hammer_sledge", "hammer_sledge_short" ] }, { "x": -6, "y": 2, "chance": 1, "items": [ "entry_suit", "mask_gas", "smoxygen_tank" ] }, { "x": -6, "y": 3, "chance": 5, "items": [ "halligan", "crowbar", "shovel", "rope_30", "throw_extinguisher" ] } ]