From bdd3a64289ca2d1d82e0fde218f8348c64d8861a Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 00:13:39 -0600 Subject: [PATCH 1/9] Sledge Expansion --- data/json/itemgroups/gear.json | 5 +- data/json/itemgroups/item_groups.json | 1 + .../json/itemgroups/locations_commercial.json | 5 +- data/json/itemgroups/tools.json | 7 +- data/json/items/melee/bludgeons.json | 69 ++++++++++++++++++- data/json/martialarts.json | 1 + data/json/npcs/NC_ARSONIST.json | 1 + data/json/npcs/NC_JUNK_SHOPKEEP.json | 5 +- data/json/npcs/NC_THUG.json | 1 + data/json/npcs/items_generic.json | 5 +- data/json/recipes/recipe_others.json | 57 +++++++++++++++ data/json/vehicles/emergency.json | 4 +- 12 files changed, 152 insertions(+), 9 deletions(-) diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json index cdf710ab3a7f2..371a6ad69b6db 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", 10 ], + [ "hammer_sledge_short", 15 ], + [ "hammer_sledge_engineer", 15 ], + [ "hammer_sledge_heavy", 3 ], [ "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..469db11101511 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -1420,6 +1420,7 @@ [ "hammer", 35 ], [ "wrench", 30 ], [ "hammer_sledge", 6 ], + [ "hammer_sledge_short", 4 ], [ "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..b5abfc11fc67a 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", 4 ], + [ "hammer_sledge_short", 4 ], + [ "hammer_sledge_engineer", 2 ], + [ "hammer_sledge_heavy", 2 ], [ "ax", 8 ], [ "knife_butcher", 10 ], [ "knife_combat", 14 ], diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 5c683b0dbf428..3d5fe3193d754 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", 40 ], + [ "hammer_sledge_short", 40 ], + [ "hammer_sledge_engineer", 50 ], + [ "hammer_sledge_heavy", 10 ], [ "spray_can", 100 ], [ "permanent_marker", 50 ], [ "funnel", 200 ], @@ -184,7 +187,7 @@ "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", 10 ], [ "hammer_sledge_short", 15 ], [ "hammer_sledge_engineer", 20 ], [ "halligan", 10 ] ] }, { "id": "tools_home", diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index b7a454548d1e6..d7754242f26f6 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -375,11 +375,78 @@ "material": [ "wood", "steel" ], "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ], - "volume": "2500 ml", + "volume": "1650 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": "4200 g", + "color": "brown", + "symbol": "/", + "material": [ "wood", "steel" ], + "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], + "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], + "volume": "1000 ml", + "bashing": 35, + "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" ], + "flags": [ "NONCONDUCTIVE", "BELT_CLIP" ], + "techniques": [ "WBLOCK_1" ], + "volume": "650 ml", + "bashing": 25, + "price": 12000, + "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": "9750 g", + "color": "brown", + "symbol": "/", + "material": [ "wood", "steel" ], + "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], + "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ], + "volume": "2800 ml", + "bashing": 80, + "price": 12000, + "qualities": [ [ "HAMMER", 1 ] ] + }, + { + "type": "GENERIC", + "id": "warhammer", + "name": "war hammer", + "description": "A medieval hammer made for battle. Its odd shape and balance make it an excellent weapon, but an ineffective tool.", + "weight": "1337 g", + "to_hit": 1, + "color": "brown", + "symbol": "/", + "//": "Craftable from steel, shouldn't be silver. A warhammer is essentially one end of a pickaxe with balancing weight on the other and crushes/pierces the armor.", + "material": [ "iron", "wood" ], + "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], + "flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE", "BELT_CLIP" ], + "volume": "1250 ml", + "bashing": 20, + "cutting": 20, + "price": 16000, + "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..93a87763d1110 100644 --- a/data/json/npcs/NC_ARSONIST.json +++ b/data/json/npcs/NC_ARSONIST.json @@ -86,6 +86,7 @@ [ "hammer", 20 ], [ "wrench", 20 ], [ "hammer_sledge", 20 ], + [ "hammer_sledge_short", 20 ], [ "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..152473c195ef9 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", 4 ], + [ "hammer_sledge_short", 4 ], + [ "hammer_sledge_engineer", 4 ], + [ "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..cde856fb0d34c 100644 --- a/data/json/npcs/NC_THUG.json +++ b/data/json/npcs/NC_THUG.json @@ -4,6 +4,7 @@ "id": "NC_THUG_bashing", "items": [ [ "hammer_sledge", 20 ], + [ "hammer_sledge_short", 20 ], [ "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..acdd0494acf05 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", 2 ], + [ "hammer_sledge_short", 3 ], + [ "hammer_sledge_engineer", 3 ], + [ "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..af5f7d54cb947 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2424,6 +2424,63 @@ "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ [ "2x4", 3 ] ] ] }, + { + "type": "recipe", + "result": "hammer_sledge_short", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 6, + "time": "7 h 40 m", + "autolearn": true, + "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", 2 ] ] ] + }, + { + "type": "recipe", + "result": "hammer_sledge_short", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "2 m", + "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", + "autolearn": true, + "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", 3 ] ] ] + }, + { + "type": "recipe", + "result": "hammer_sledge_engineer", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 6, + "time": "6 h 40 m", + "autolearn": true, + "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", "result": "chain", diff --git a/data/json/vehicles/emergency.json b/data/json/vehicles/emergency.json index 30cb28975c7cc..975f9e2d86f49 100644 --- a/data/json/vehicles/emergency.json +++ b/data/json/vehicles/emergency.json @@ -674,10 +674,10 @@ "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" ] } ] From 53f601b5f2a5af346503c0d5125dbf4633650a9e Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 20:24:20 -0600 Subject: [PATCH 2/9] Sledge Finalization and Byproducts --- data/json/items/melee/bludgeons.json | 26 ++++++++++++++++---------- data/json/recipes/recipe_others.json | 3 ++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index d7754242f26f6..bfade8e792414 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -369,13 +369,13 @@ "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": "1650 ml", + "volume": "1250 ml", "bashing": 40, "price": 12000, "qualities": [ [ "HAMMER", 1 ] ] @@ -385,14 +385,16 @@ "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": "4200 g", + "weight": "4000 g", "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], + "looks_like": "hammer_sledge", "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "volume": "1000 ml", + "volume": "900 ml", "bashing": 35, + "to_hit": -1, "price": 12000, "qualities": [ [ "HAMMER", 1 ] ] }, @@ -405,11 +407,13 @@ "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], + "looks_like": "hammer_sledge", "flags": [ "NONCONDUCTIVE", "BELT_CLIP" ], "techniques": [ "WBLOCK_1" ], - "volume": "650 ml", + "volume": "600 ml", "bashing": 25, - "price": 12000, + "to_hit": -1, + "price": 6000, "qualities": [ [ "HAMMER", 2 ] ] }, { @@ -417,15 +421,17 @@ "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": "9750 g", + "weight": "9500 g", "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], + "looks_like": "hammer_sledge", "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], - "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ], - "volume": "2800 ml", + "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE" ], + "volume": "1700 ml", "bashing": 80, - "price": 12000, + "to_hit": -4, + "price": 24000, "qualities": [ [ "HAMMER", 1 ] ] }, { diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index af5f7d54cb947..2e8f1b09d7d0a 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2445,8 +2445,9 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "difficulty": 2, + "difficulty": 1, "time": "2 m", + "byproducts": [ [ "splinter", 1 ] ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "hammer_sledge", 1 ] ] ] From 34779461c78a298e85759a9e911ddf356039852f Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 20:28:35 -0600 Subject: [PATCH 3/9] Linting --- data/json/itemgroups/tools.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 3d5fe3193d754..dc63d5fb485d9 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -187,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", 10 ], [ "hammer_sledge_short", 15 ], [ "hammer_sledge_engineer", 20 ], [ "halligan", 10 ] ] + "items": [ + [ "boltcutters", 30 ], + [ "crowbar", 50 ], + [ "claw_bar", 25 ], + [ "hammer_sledge", 10 ], + [ "hammer_sledge_short", 15 ], + [ "hammer_sledge_engineer", 20 ], + [ "halligan", 10 ] + ] }, { "id": "tools_home", From 45c43d5ef40ffa9cf5acdca867f92e3e6bb29f40 Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 20:31:50 -0600 Subject: [PATCH 4/9] Oops + Linting --- data/json/vehicles/emergency.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/json/vehicles/emergency.json b/data/json/vehicles/emergency.json index 975f9e2d86f49..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", "hammer_sledge_short", "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", "hammer_sledge_short ] }, + { "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" ] } ] From bf190fa598368c7da50713643f8af3fe483647b8 Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 21:30:28 -0600 Subject: [PATCH 5/9] Fix Recipes --- data/json/recipes/recipe_others.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 2e8f1b09d7d0a..1e400ca98c46f 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2427,6 +2427,7 @@ { "type": "recipe", "result": "hammer_sledge_short", + "id_suffix": "forged", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", @@ -2442,6 +2443,7 @@ { "type": "recipe", "result": "hammer_sledge_short", + "id_suffix": "from_cutting", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", From d62cfdf53d16862abce79158c00ecaf99534f29b Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 21:56:38 -0600 Subject: [PATCH 6/9] Slight Nerf --- data/json/items/melee/bludgeons.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index bfade8e792414..370804e75d7e9 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -409,7 +409,6 @@ "material": [ "wood", "steel" ], "looks_like": "hammer_sledge", "flags": [ "NONCONDUCTIVE", "BELT_CLIP" ], - "techniques": [ "WBLOCK_1" ], "volume": "600 ml", "bashing": 25, "to_hit": -1, @@ -427,7 +426,7 @@ "material": [ "wood", "steel" ], "looks_like": "hammer_sledge", "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], - "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE" ], + "techniques": [ "BRUTAL", "WIDE" ], "volume": "1700 ml", "bashing": 80, "to_hit": -4, From 0fec65ed6b377040626a43873990ea568c85f168 Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Fri, 31 Jan 2020 22:00:15 -0600 Subject: [PATCH 7/9] Accidental Copy --- data/json/items/melee/bludgeons.json | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 370804e75d7e9..a00f0cb37089c 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -433,25 +433,6 @@ "price": 24000, "qualities": [ [ "HAMMER", 1 ] ] }, - { - "type": "GENERIC", - "id": "warhammer", - "name": "war hammer", - "description": "A medieval hammer made for battle. Its odd shape and balance make it an excellent weapon, but an ineffective tool.", - "weight": "1337 g", - "to_hit": 1, - "color": "brown", - "symbol": "/", - "//": "Craftable from steel, shouldn't be silver. A warhammer is essentially one end of a pickaxe with balancing weight on the other and crushes/pierces the armor.", - "material": [ "iron", "wood" ], - "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE", "BELT_CLIP" ], - "volume": "1250 ml", - "bashing": 20, - "cutting": 20, - "price": 16000, - "qualities": [ [ "HAMMER", 1 ] ] - }, { "type": "GENERIC", "id": "hockey_stick", From 1fec8c9f31b8d689d138bed3a05c1430efb5a820 Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Sat, 1 Feb 2020 00:00:50 -0600 Subject: [PATCH 8/9] Balance Spawn Chance --- data/json/itemgroups/gear.json | 8 ++++---- data/json/itemgroups/item_groups.json | 4 ++-- data/json/itemgroups/locations_commercial.json | 8 ++++---- data/json/itemgroups/tools.json | 12 ++++++------ data/json/npcs/NC_ARSONIST.json | 4 ++-- data/json/npcs/NC_JUNK_SHOPKEEP.json | 6 +++--- data/json/npcs/NC_THUG.json | 4 ++-- data/json/npcs/items_generic.json | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json index 371a6ad69b6db..05e919e508284 100644 --- a/data/json/itemgroups/gear.json +++ b/data/json/itemgroups/gear.json @@ -93,10 +93,10 @@ [ "cotton_ball", 2 ], [ "crowbar", 15 ], [ "entry_suit", 10 ], - [ "hammer_sledge", 10 ], - [ "hammer_sledge_short", 15 ], - [ "hammer_sledge_engineer", 15 ], - [ "hammer_sledge_heavy", 3 ], + [ "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 469db11101511..0bf67f8b575a6 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -1419,8 +1419,8 @@ [ "knuckle_brass", 20 ], [ "hammer", 35 ], [ "wrench", 30 ], - [ "hammer_sledge", 6 ], - [ "hammer_sledge_short", 4 ], + [ "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 b5abfc11fc67a..111f6f81c3ed2 100644 --- a/data/json/itemgroups/locations_commercial.json +++ b/data/json/itemgroups/locations_commercial.json @@ -290,10 +290,10 @@ [ "steel_lump", 30 ], [ "manhole_cover", 1 ], [ "rock", 40 ], - [ "hammer_sledge", 4 ], - [ "hammer_sledge_short", 4 ], - [ "hammer_sledge_engineer", 2 ], - [ "hammer_sledge_heavy", 2 ], + [ "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 dc63d5fb485d9..2f1c42a6204da 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -152,9 +152,9 @@ [ "bucket", 50 ], [ "mop", 100 ], [ "shovel", 40 ], - [ "hammer_sledge", 40 ], - [ "hammer_sledge_short", 40 ], - [ "hammer_sledge_engineer", 50 ], + [ "hammer_sledge", 10 ], + [ "hammer_sledge_short", 20 ], + [ "hammer_sledge_engineer", 20 ], [ "hammer_sledge_heavy", 10 ], [ "spray_can", 100 ], [ "permanent_marker", 50 ], @@ -191,9 +191,9 @@ [ "boltcutters", 30 ], [ "crowbar", 50 ], [ "claw_bar", 25 ], - [ "hammer_sledge", 10 ], - [ "hammer_sledge_short", 15 ], - [ "hammer_sledge_engineer", 20 ], + [ "hammer_sledge", 5 ], + [ "hammer_sledge_short", 5 ], + [ "hammer_sledge_engineer", 10 ], [ "halligan", 10 ] ] }, diff --git a/data/json/npcs/NC_ARSONIST.json b/data/json/npcs/NC_ARSONIST.json index 93a87763d1110..a87a58d36f3d1 100644 --- a/data/json/npcs/NC_ARSONIST.json +++ b/data/json/npcs/NC_ARSONIST.json @@ -85,8 +85,8 @@ "items": [ [ "hammer", 20 ], [ "wrench", 20 ], - [ "hammer_sledge", 20 ], - [ "hammer_sledge_short", 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 152473c195ef9..4569bd4d596da 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -294,9 +294,9 @@ [ "saw", 15 ], [ "circsaw_off", 5 ], [ "hacksaw", 17 ], - [ "hammer_sledge", 4 ], - [ "hammer_sledge_short", 4 ], - [ "hammer_sledge_engineer", 4 ], + [ "hammer_sledge", 2 ], + [ "hammer_sledge_short", 2 ], + [ "hammer_sledge_engineer", 1 ], [ "hammer_sledge_heavy", 1 ], [ "xacto", 10 ], [ "flashlight", 40 ], diff --git a/data/json/npcs/NC_THUG.json b/data/json/npcs/NC_THUG.json index cde856fb0d34c..7391d84308f70 100644 --- a/data/json/npcs/NC_THUG.json +++ b/data/json/npcs/NC_THUG.json @@ -3,8 +3,8 @@ "type": "item_group", "id": "NC_THUG_bashing", "items": [ - [ "hammer_sledge", 20 ], - [ "hammer_sledge_short", 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 acdd0494acf05..1292d75184641 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -588,9 +588,9 @@ [ "halligan", 1 ], [ "hamburger", 1 ], [ "hammer", 7 ], - [ "hammer_sledge", 2 ], - [ "hammer_sledge_short", 3 ], - [ "hammer_sledge_engineer", 3 ], + [ "hammer_sledge", 1 ], + [ "hammer_sledge_short", 1 ], + [ "hammer_sledge_engineer", 1 ], [ "hammer_sledge_heavy", 1 ], [ "hand_drill", 2 ], [ "handflare", 3 ], From 1b207b92c411c553ac4f752e6fa7048697bc4517 Mon Sep 17 00:00:00 2001 From: Xanmyral Date: Mon, 3 Feb 2020 19:02:55 -0600 Subject: [PATCH 9/9] Remove Autolearn and Refactor Components --- data/json/recipes/recipe_others.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 1e400ca98c46f..1e0cca59ff2c0 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -2417,12 +2417,12 @@ "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", @@ -2433,12 +2433,12 @@ "skill_used": "fabrication", "difficulty": 6, "time": "7 h 40 m", - "autolearn": true, + "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", 2 ] ] ] + "components": [ [ [ "2x4", 1 ] ] ] }, { "type": "recipe", @@ -2462,12 +2462,12 @@ "skill_used": "fabrication", "difficulty": 6, "time": "8 h 40 m", - "autolearn": true, + "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", 3 ] ] ] + "components": [ [ [ "2x4", 1 ] ] ] }, { "type": "recipe", @@ -2477,7 +2477,7 @@ "skill_used": "fabrication", "difficulty": 6, "time": "6 h 40 m", - "autolearn": true, + "byproducts": [ [ "splinter", 16 ] ], "book_learn": [ [ "manual_fabrication", 3 ], [ "textbook_fabrication", 4 ] ], "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 4 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ],