Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions data/json/itemgroups/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
[ "rake_plastic", 25 ],
[ "aluminum_stepladder", 5 ],
[ "machete", 10 ],
[ "brush_handaxe", 5 ],
{ "item": "misc_repairkit", "prob": 25 },
[ "saw", 60 ],
{ "item": "bow_saw", "prob": 50 },
Expand Down Expand Up @@ -202,6 +203,9 @@
{ "item": "dehydrator", "prob": 5 },
[ "tourist_table", 1 ],
[ "vac_mold", 10 ],
[ "brush_handaxe", 15 ],
[ "brush_axe", 5 ],
[ "brush_pole", 5 ],
[ "polycarbonate_sheet", 50 ],
[ "sandpaper", 50 ],
[ "plastic_sheet", 50 ],
Expand Down Expand Up @@ -273,6 +277,9 @@
[ "shovel", 120 ],
[ "sickle", 40 ],
[ "machete", 25 ],
[ "brush_handaxe", 15 ],
[ "brush_axe", 10 ],
[ "brush_pole", 5 ],
[ "rake", 20 ],
[ "rake_plastic", 40 ],
[ "shovel_snow", 20 ],
Expand Down Expand Up @@ -891,6 +898,7 @@
{ "item": "bow_saw", "prob": 40 },
[ "ax", 20 ],
[ "machete", 15 ],
[ "brush_handaxe", 5 ],
[ "hacksaw", 50 ],
[ "chipper", 60 ],
[ "boltcutters", 50 ],
Expand Down
23 changes: 23 additions & 0 deletions data/json/items/melee/spears_and_polearms.json
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,29 @@
"price": "50 USD",
"price_postapoc": "5 USD"
},
{
"id": "bill_hook",
"type": "ITEM",
"category": "weapons",
"name": { "str": "bill-hook" },
"description": "A nasty set of hooks and spikes set upon a shaft, with a metal endcap. This ain't no gardening tool, and it'll hook someone very easily.",
"weight": "2100 g",
"volume": "2300 ml",
"longest_side": "160 cm",
"price": "55 USD",
"price_postapoc": "40 USD",
"to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "neutral" },
"material": [ "wood", "mc_steel" ],
"symbol": "/",
"color": "brown",
"looks_like": "glaive",
"qualities": [ [ "AXE", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
"faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"weapon_category": [ "POLEARMS", "HOOKING_WEAPONRY" ],
"melee_damage": { "bash": 18, "cut": 35 }
},
{
"id": "glaive",
"type": "ITEM",
Expand Down
93 changes: 73 additions & 20 deletions data/json/items/tool/landscaping.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,46 +307,99 @@
"melee_damage": { "bash": 3, "cut": 12 }
},
{
"id": "brush_axe",
"id": "brush_handaxe",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"name": { "str": "bill" },
"description": "A long, slightly curved and hooked steel blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.",
"description": "A slightly curved steel blade with a nice wooden handle, not too dissimilar to a machete.",
"weapon_category": [ "MEDIUM_SWORDS", "HAND_AXES" ],
"looks_like": "machete",
"copy-from": "machete"
},
{
"id": "brush_axe",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"name": { "str": "bill axe" },
"material": [ "wood", "mc_steel" ],
"description": "The steel curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.",

Check failure on line 325 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

([slow] ~starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "name": { "str": "bill axe" }, "material": [ "wood", "mc_steel" ], "description": "The steel curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.", ▲▲▲ "looks_like": "ax", "weight": "2100 g",

Check failure on line 325 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "name": { "str": "bill axe" }, "material": [ "wood", "mc_steel" ], "description": "The steel curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.", ▲▲▲ "looks_like": "ax", "weight": "2100 g",
"looks_like": "ax",
"weight": "2100 g",
"volume": "1900 ml",
"longest_side": "80 cm",
"price": "25 USD",
"price_postapoc": "12 USD 50 cent",
"symbol": "P",
"color": "brown",
"qualities": [ [ "AXE", 2 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
"to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "uneven" },
"techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
"weapon_category": [ "GREAT_AXES" ],
"faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
"melee_damage": { "bash": 14, "cut": 26 }
},
{
"id": "brush_pole",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"name": { "str": "bill pole" },
"description": "A long, slightly curved steel blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.",

Check failure on line 347 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

([slow] ~starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "subtypes": [ "TOOL" ], "name": { "str": "bill pole" }, "description": "A long, slightly curved steel blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.", ▲▲▲ "weight": "2400 g", "volume": "2500 ml",

Check failure on line 347 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "subtypes": [ "TOOL" ], "name": { "str": "bill pole" }, "description": "A long, slightly curved steel blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.", ▲▲▲ "weight": "2400 g", "volume": "2500 ml",
"weight": "2400 g",
"volume": "2500 ml",
"longest_side": "150 cm",
"price": "55 USD",
"price_postapoc": "2 USD 50 cent",
"price": "30 USD",
"price_postapoc": "24 USD",
"to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
"material": [ "wood", "mc_steel" ],
"symbol": "/",
"color": "brown",
"looks_like": "glaive",
"qualities": [ [ "AXE", 1 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
"melee_damage": { "bash": 20, "cut": 30 }
"faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"weapon_category": [ "POLEARMS" ],
"melee_damage": { "bash": 16, "cut": 28 }
},
{
"id": "bronze_brush_axe",
"id": "bronze_brush_handaxe",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"name": { "str": "bronze bill" },
"description": "A long, slightly curved and hooked bronze blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.",
"description": "The bronze curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.",

Check failure on line 370 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

([slow] ~starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "subtypes": [ "TOOL" ], "name": { "str": "bronze bill" }, "description": "The bronze curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.", ▲▲▲ "looks_like": "brush_handaxe", "copy-from": "brush_handaxe",

Check failure on line 370 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "subtypes": [ "TOOL" ], "name": { "str": "bronze bill" }, "description": "The bronze curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.", ▲▲▲ "looks_like": "brush_handaxe", "copy-from": "brush_handaxe",
"looks_like": "brush_handaxe",
"copy-from": "brush_handaxe",
"material": [ "wood", "bronze" ],
"color": "yellow",
"melee_damage": { "bash": 6, "cut": 18 }
},
{
"id": "bronze_brush_axe",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"name": { "str": "bronze bill axe" },
"description": "A slightly curved bronze blade with a nice wooden handle, not too dissimilar to a machete.",

Check failure on line 382 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

([slow] ~starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "subtypes": [ "TOOL" ], "name": { "str": "bronze bill axe" }, "description": "A slightly curved bronze blade with a nice wooden handle, not too dissimilar to a machete.", ▲▲▲ "looks_like": "brush_axe", "copy-from": "brush_axe",

Check failure on line 382 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "subtypes": [ "TOOL" ], "name": { "str": "bronze bill axe" }, "description": "A slightly curved bronze blade with a nice wooden handle, not too dissimilar to a machete.", ▲▲▲ "looks_like": "brush_axe", "copy-from": "brush_axe",
"looks_like": "brush_axe",
"copy-from": "brush_axe",
"material": [ "wood", "bronze" ],
"color": "yellow",
"melee_damage": { "bash": 14, "cut": 20 }
},
{
"id": "bronze_brush_pole",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"copy-from": "brush_pole",
"name": { "str": "bronze bill pole" },
"description": "A long, slightly curved and hooked bronze blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.",

Check failure on line 395 in data/json/items/tool/landscaping.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> excessive spaces at this location. 1 required, but 2 found. Suggested fix: remove " " At the following position (marked with caret) "copy-from": "brush_pole", "name": { "str": "bronze bill pole" }, "description": "A long, slightly curved and hooked bronze blade on the end of a sturdy shaft. Could be used to thoroughly ruin something's day, or cut branches and small trees.", ▲▲▲ "weight": "3000 g", "price": "25 USD",
"weight": "3000 g",
"volume": "2500 ml",
"longest_side": "150 cm",
"price": "55 USD",
"price_postapoc": "2 USD 50 cent",
"to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
"price": "25 USD",
"price_postapoc": "10 USD",
"material": [ "wood", "bronze" ],
"symbol": "/",
"color": "yellow",
"looks_like": "brush_axe",
"qualities": [ [ "AXE", 1 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
"melee_damage": { "bash": 20, "cut": 24 }
"melee_damage": { "bash": 16, "cut": 22 }
},
{
"id": "trimmer_off",
Expand Down
141 changes: 138 additions & 3 deletions data/json/recipes/tools/tools_hand.json
Original file line number Diff line number Diff line change
Expand Up @@ -1243,14 +1243,95 @@
[ [ "stick", 1 ], [ "2x4", 1 ] ]
]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_handaxe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 5,
"time": "6 h",
"autolearn": true,
"proficiencies": [
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3.0 },
{ "proficiency": "prof_bladesmith" }
],
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
"components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_handaxe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 0,
"time": "5 m",
"autolearn": true,
"qualities": [ { "id": "SAW_W", "level": 2 } ],
"byproducts": [ [ [ "2x4", 1 ], [ "stick", 1 ] ] ],

Check failure on line 1276 in data/json/recipes/tools/tools_hand.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang oldest supported, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> Expected a string, got array "autolearn": true, "qualities": [ { "id": "SAW_W", "level": 2 } ], "byproducts": [ [ [ "2x4", 1 ], [ "stick", 1 ] ] ], ▲▲▲ "components": [ [ "brush_axe", 1 ] ] },
"components": [ [ "brush_axe", 1 ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_handaxe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 0,
"time": "5 m",
"autolearn": true,
"qualities": [ { "id": "SAW_W", "level": 2 } ],
"byproducts": [ [ "stick_long", 1 ] ],
"components": [ [ "brush_pole", 1 ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_axe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 7,
"difficulty": 5,
"time": "6 h",
"autolearn": true,
"proficiencies": [
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3.0 },
{ "proficiency": "prof_bladesmith" }
],
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_axe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 2,
"time": "20 m",
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 } ],
"qualities": [ { "id": "DRILL", "level": 2 } ],
"byproducts": [ [ "splinter", 1 ] ],
"components": [ [ "brush_handaxe", 1 ], [ "nails", 4, "LIST" ], [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_pole",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 5,
"time": "7 h 40 m",
"autolearn": true,
"proficiencies": [
Expand All @@ -1265,13 +1346,67 @@
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"result": "bronze_brush_axe",
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_pole",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 6,
"difficulty": 2,
"time": "20 m",
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 } ],
"qualities": [ { "id": "DRILL", "level": 2 } ],
"byproducts": [ [ "splinter", 3 ] ],
"components": [ [ "brush_handaxe", 1 ], [ "nails", 4, "LIST" ], [ "stick_long", 1 ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "bronze_brush_handaxe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 4,
"time": "6 h",
"autolearn": true,
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_redsmithing" },
{ "proficiency": "prof_redsmithing_adv" }
],
"using": [ [ "forging_standard", 2 ], [ "bronzesmithing_tools", 1 ] ],
"tools": [ [ [ "casting_mold", -1 ] ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ], [ [ "scrap_bronze", 10 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_axe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 4,
"time": "6 h",
"autolearn": true,
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_redsmithing" },
{ "proficiency": "prof_redsmithing_adv" }
],
"using": [ [ "forging_standard", 2 ], [ "bronzesmithing_tools", 1 ] ],
"tools": [ [ [ "casting_mold", -1 ] ] ],
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"result": "bronze_brush_pole",
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 4,
"time": "4 h",
"book_learn": [ [ "bronze_book", 5 ] ],
"autolearn": true,
Expand Down
21 changes: 21 additions & 0 deletions data/json/recipes/weapon/cutting.json
Original file line number Diff line number Diff line change
Expand Up @@ -2204,6 +2204,27 @@
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "glaive",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 7,
"time": "7 h 40 m",
"book_learn": [ [ "textbook_weapwest", 6 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_bladesmith" },
{ "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 }
],
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
Expand Down
Loading