Skip to content

Adds bills of different length & use #83043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 4, 2025
Merged

Adds bills of different length & use #83043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
20046f1
Adds bills of different length & use
PGR-14 Sep 26, 2025
d734d5f
Update data/json/items/melee/spears_and_polearms.json
PGR-14 Sep 29, 2025
c8c832f
Fix syntax, spaces, & words
PGR-14 Sep 29, 2025
aafff3d
Merge branch 'DDA-Bills' of https://github.com/PGR-14/Cataclysm-DDA-P…
PGR-14 Sep 29, 2025
ec585eb
Make the pole a spear, & fix more loadin' errors
PGR-14 Sep 30, 2025
cb53e91
Fix recipes because I was sleep-deprived
PGR-14 Oct 1, 2025
f918ab4
Update data/json/items/tool/landscaping.json
PGR-14 Oct 1, 2025
6aec70e
Apply suggestions from code review
GuardianDll Oct 1, 2025
9a47515
Add in suffixes, to fix bugs & just in case
PGR-14 Oct 2, 2025
3dbf654
Missed one
PGR-14 Oct 2, 2025
f551605
Add in those damage calculations that are "required"
PGR-14 Oct 3, 2025
d215e48
Set dps damage to correct values
GuardianDll Oct 4, 2025
0e0949b
more fixes
GuardianDll Oct 4, 2025
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
View file
Open in desktop
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
View file
Open in desktop
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
91 changes: 72 additions & 19 deletions data/json/items/tool/landscaping.json
View file
Open in desktop
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.",
"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.",
"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": [ "SPEAR" ],
"melee_damage": { "bash": 16, "cut": 28 }
},
{
"id": "bronze_brush_axe",
"id": "bronze_brush_handaxe",
"type": "ITEM",
"subtypes": [ "TOOL" ],
"name": { "str": "bronze bill" },
"description": "The bronze curved blade of a bill placed stoutly atop 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",
"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.",
"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" ],
"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",
"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 }
"copy-from": "brush_pole",
"melee_damage": { "bash": 16, "cut": 22 }
},
{
"id": "trimmer_off",
Expand Down
151 changes: 149 additions & 2 deletions data/json/recipes/tools/tools_hand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,14 +1243,106 @@
[ [ "stick", 1 ], [ "2x4", 1 ] ]
]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_handaxe",
"id_suffix": "from_scratch",
"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",
"id_suffix": "from_brush_axe",
"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 ] ],
"components": [ [ [ "brush_axe", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_handaxe",
"id_suffix": "from_brush_pole",
"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",
"id_suffix": "from_scratch",
"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",
"id_suffix": "from_bill",
"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",
"id_suffix": "from_scratch",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 5,
"time": "7 h 40 m",
"autolearn": true,
"proficiencies": [
Expand All @@ -1265,13 +1357,68 @@
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "brush_pole",
"id_suffix": "from_bill",
"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", 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": "bronze_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": 6,
"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
View file
Open in desktop
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": "bill_hook",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 7,
"time": "9 h",
"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
Loading