Skip to content

Commit d850323

Browse files
PGR-14GuardianDllTheShadowFerret
authored
Adds bills of different length & use (#83043)
* Adds bills of different length & use Adds in 7 new items, & recipes for them. Bill, Bill axe, Bill pole Bronze Bill, Bronze Bill axe, Bronze Bill pole, & a new & improved billhook. * Update data/json/items/melee/spears_and_polearms.json Fair enough, forgot to remove a lot of my shorthands Co-authored-by: Anton Simakov <[email protected]> * Fix syntax, spaces, & words * Make the pole a spear, & fix more loadin' errors * Fix recipes because I was sleep-deprived * Update data/json/items/tool/landscaping.json Co-authored-by: TheShadowFerret <[email protected]> * Apply suggestions from code review Co-authored-by: TheShadowFerret <[email protected]> * Add in suffixes, to fix bugs & just in case Thank god for the Docs. * Missed one * Add in those damage calculations that are "required" * Set dps damage to correct values * more fixes --------- Co-authored-by: Anton Simakov <[email protected]> Co-authored-by: TheShadowFerret <[email protected]>
1 parent b88a06c commit d850323

File tree

9 files changed

+280
-23
lines changed

9 files changed

+280
-23
lines changed

‎data/json/itemgroups/tools.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
[ "rake_plastic", 25 ],
8585
[ "aluminum_stepladder", 5 ],
8686
[ "machete", 10 ],
87+
[ "brush_handaxe", 5 ],
8788
{ "item": "misc_repairkit", "prob": 25 },
8889
[ "saw", 60 ],
8990
{ "item": "bow_saw", "prob": 50 },
@@ -202,6 +203,9 @@
202203
{ "item": "dehydrator", "prob": 5 },
203204
[ "tourist_table", 1 ],
204205
[ "vac_mold", 10 ],
206+
[ "brush_handaxe", 15 ],
207+
[ "brush_axe", 5 ],
208+
[ "brush_pole", 5 ],
205209
[ "polycarbonate_sheet", 50 ],
206210
[ "sandpaper", 50 ],
207211
[ "plastic_sheet", 50 ],
@@ -273,6 +277,9 @@
273277
[ "shovel", 120 ],
274278
[ "sickle", 40 ],
275279
[ "machete", 25 ],
280+
[ "brush_handaxe", 15 ],
281+
[ "brush_axe", 10 ],
282+
[ "brush_pole", 5 ],
276283
[ "rake", 20 ],
277284
[ "rake_plastic", 40 ],
278285
[ "shovel_snow", 20 ],
@@ -891,6 +898,7 @@
891898
{ "item": "bow_saw", "prob": 40 },
892899
[ "ax", 20 ],
893900
[ "machete", 15 ],
901+
[ "brush_handaxe", 5 ],
894902
[ "hacksaw", 50 ],
895903
[ "chipper", 60 ],
896904
[ "boltcutters", 50 ],

‎data/json/items/melee/spears_and_polearms.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,29 @@
535535
"price": "50 USD",
536536
"price_postapoc": "5 USD"
537537
},
538+
{
539+
"id": "bill_hook",
540+
"type": "ITEM",
541+
"category": "weapons",
542+
"name": { "str": "bill-hook" },
543+
"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.",
544+
"weight": "2100 g",
545+
"volume": "2300 ml",
546+
"longest_side": "160 cm",
547+
"price": "55 USD",
548+
"price_postapoc": "40 USD",
549+
"to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "neutral" },
550+
"material": [ "wood", "mc_steel" ],
551+
"symbol": "/",
552+
"color": "brown",
553+
"looks_like": "glaive",
554+
"qualities": [ [ "AXE", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
555+
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
556+
"faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
557+
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
558+
"weapon_category": [ "POLEARMS", "HOOKING_WEAPONRY" ],
559+
"melee_damage": { "bash": 18, "cut": 35 }
560+
},
538561
{
539562
"id": "glaive",
540563
"type": "ITEM",

‎data/json/items/tool/landscaping.json‎

Lines changed: 72 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -307,46 +307,99 @@
307307
"melee_damage": { "bash": 3, "cut": 12 }
308308
},
309309
{
310-
"id": "brush_axe",
310+
"id": "brush_handaxe",
311311
"type": "ITEM",
312+
"subtypes": [ "TOOL" ],
312313
"name": { "str": "bill" },
313-
"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.",
314+
"description": "A slightly curved steel blade with a nice wooden handle, not too dissimilar to a machete.",
315+
"weapon_category": [ "MEDIUM_SWORDS", "HAND_AXES" ],
316+
"looks_like": "machete",
317+
"copy-from": "machete"
318+
},
319+
{
320+
"id": "brush_axe",
321+
"type": "ITEM",
322+
"subtypes": [ "TOOL" ],
323+
"name": { "str": "bill axe" },
324+
"material": [ "wood", "mc_steel" ],
325+
"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.",
326+
"looks_like": "ax",
327+
"weight": "2100 g",
328+
"volume": "1900 ml",
329+
"longest_side": "80 cm",
330+
"price": "25 USD",
331+
"price_postapoc": "12 USD 50 cent",
332+
"symbol": "P",
333+
"color": "brown",
334+
"qualities": [ [ "AXE", 2 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
335+
"to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "uneven" },
336+
"techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
337+
"weapon_category": [ "GREAT_AXES" ],
338+
"faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
339+
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
340+
"melee_damage": { "bash": 14, "cut": 26 }
341+
},
342+
{
343+
"id": "brush_pole",
344+
"type": "ITEM",
345+
"subtypes": [ "TOOL" ],
346+
"name": { "str": "bill pole" },
347+
"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.",
314348
"weight": "2400 g",
315349
"volume": "2500 ml",
316350
"longest_side": "150 cm",
317-
"price": "55 USD",
318-
"price_postapoc": "2 USD 50 cent",
351+
"price": "30 USD",
352+
"price_postapoc": "24 USD",
319353
"to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
320354
"material": [ "wood", "mc_steel" ],
321355
"symbol": "/",
322356
"color": "brown",
323357
"looks_like": "glaive",
324358
"qualities": [ [ "AXE", 1 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
325359
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
326-
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
327-
"weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
328-
"melee_damage": { "bash": 20, "cut": 30 }
360+
"faults": [ { "fault_group": "handle_long", "weight_mult": 4 }, { "fault_group": "blade_general" } ],
361+
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
362+
"weapon_category": [ "SPEAR" ],
363+
"melee_damage": { "bash": 16, "cut": 28 }
329364
},
330365
{
331-
"id": "bronze_brush_axe",
366+
"id": "bronze_brush_handaxe",
332367
"type": "ITEM",
368+
"subtypes": [ "TOOL" ],
333369
"name": { "str": "bronze bill" },
370+
"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.",
371+
"looks_like": "brush_handaxe",
372+
"copy-from": "brush_handaxe",
373+
"material": [ "wood", "bronze" ],
374+
"color": "yellow",
375+
"melee_damage": { "bash": 6, "cut": 18 }
376+
},
377+
{
378+
"id": "bronze_brush_axe",
379+
"type": "ITEM",
380+
"subtypes": [ "TOOL" ],
381+
"name": { "str": "bronze bill axe" },
382+
"description": "A slightly curved bronze blade with a nice wooden handle, not too dissimilar to a machete.",
383+
"looks_like": "brush_axe",
384+
"copy-from": "brush_axe",
385+
"material": [ "wood", "bronze" ],
386+
"color": "yellow",
387+
"melee_damage": { "bash": 14, "cut": 20 }
388+
},
389+
{
390+
"id": "bronze_brush_pole",
391+
"type": "ITEM",
392+
"subtypes": [ "TOOL" ],
393+
"name": { "str": "bronze bill pole" },
334394
"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.",
335395
"weight": "3000 g",
336-
"volume": "2500 ml",
337-
"longest_side": "150 cm",
338-
"price": "55 USD",
339-
"price_postapoc": "2 USD 50 cent",
340-
"to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
396+
"price": "25 USD",
397+
"price_postapoc": "10 USD",
341398
"material": [ "wood", "bronze" ],
342-
"symbol": "/",
343399
"color": "yellow",
344400
"looks_like": "brush_axe",
345-
"qualities": [ [ "AXE", 1 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
346-
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
347-
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
348-
"weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
349-
"melee_damage": { "bash": 20, "cut": 24 }
401+
"copy-from": "brush_pole",
402+
"melee_damage": { "bash": 16, "cut": 22 }
350403
},
351404
{
352405
"id": "trimmer_off",

‎data/json/recipes/tools/tools_hand.json‎

Lines changed: 149 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,14 +1243,106 @@
12431243
[ [ "stick", 1 ], [ "2x4", 1 ] ]
12441244
]
12451245
},
1246+
{
1247+
"type": "recipe",
1248+
"activity_level": "BRISK_EXERCISE",
1249+
"result": "brush_handaxe",
1250+
"id_suffix": "from_scratch",
1251+
"category": "CC_WEAPON",
1252+
"subcategory": "CSC_WEAPON_CUTTING",
1253+
"skill_used": "fabrication",
1254+
"difficulty": 5,
1255+
"time": "6 h",
1256+
"autolearn": true,
1257+
"proficiencies": [
1258+
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3.0 },
1259+
{ "proficiency": "prof_bladesmith" }
1260+
],
1261+
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
1262+
"qualities": [ { "id": "GRIND", "level": 2 } ],
1263+
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
1264+
"components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
1265+
},
1266+
{
1267+
"type": "recipe",
1268+
"activity_level": "BRISK_EXERCISE",
1269+
"result": "brush_handaxe",
1270+
"id_suffix": "from_brush_axe",
1271+
"category": "CC_WEAPON",
1272+
"subcategory": "CSC_WEAPON_CUTTING",
1273+
"skill_used": "fabrication",
1274+
"difficulty": 0,
1275+
"time": "5 m",
1276+
"autolearn": true,
1277+
"qualities": [ { "id": "SAW_W", "level": 2 } ],
1278+
"byproducts": [ [ "2x4", 1 ] ],
1279+
"components": [ [ [ "brush_axe", 1 ] ] ]
1280+
},
1281+
{
1282+
"type": "recipe",
1283+
"activity_level": "BRISK_EXERCISE",
1284+
"result": "brush_handaxe",
1285+
"id_suffix": "from_brush_pole",
1286+
"category": "CC_WEAPON",
1287+
"subcategory": "CSC_WEAPON_CUTTING",
1288+
"skill_used": "fabrication",
1289+
"difficulty": 0,
1290+
"time": "5 m",
1291+
"autolearn": true,
1292+
"qualities": [ { "id": "SAW_W", "level": 2 } ],
1293+
"byproducts": [ [ "stick_long", 1 ] ],
1294+
"components": [ [ [ "brush_pole", 1 ] ] ]
1295+
},
12461296
{
12471297
"type": "recipe",
12481298
"activity_level": "BRISK_EXERCISE",
12491299
"result": "brush_axe",
1300+
"id_suffix": "from_scratch",
12501301
"category": "CC_WEAPON",
12511302
"subcategory": "CSC_WEAPON_CUTTING",
12521303
"skill_used": "fabrication",
1253-
"difficulty": 7,
1304+
"difficulty": 5,
1305+
"time": "6 h",
1306+
"autolearn": true,
1307+
"proficiencies": [
1308+
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3.0 },
1309+
{ "proficiency": "prof_bladesmith" }
1310+
],
1311+
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
1312+
"qualities": [ { "id": "GRIND", "level": 2 } ],
1313+
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
1314+
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
1315+
},
1316+
{
1317+
"type": "recipe",
1318+
"activity_level": "BRISK_EXERCISE",
1319+
"result": "brush_axe",
1320+
"id_suffix": "from_bill",
1321+
"category": "CC_WEAPON",
1322+
"subcategory": "CSC_WEAPON_CUTTING",
1323+
"skill_used": "fabrication",
1324+
"difficulty": 2,
1325+
"time": "20 m",
1326+
"autolearn": true,
1327+
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 } ],
1328+
"qualities": [ { "id": "DRILL", "level": 2 } ],
1329+
"byproducts": [ [ "splinter", 1 ] ],
1330+
"components": [
1331+
[ [ "brush_handaxe", 1 ] ],
1332+
[ [ "nails", 4, "LIST" ] ],
1333+
[ [ "2x4", 1 ], [ "stick", 2 ] ],
1334+
[ [ "fur", 2 ], [ "leather", 2 ] ]
1335+
]
1336+
},
1337+
{
1338+
"type": "recipe",
1339+
"activity_level": "BRISK_EXERCISE",
1340+
"result": "brush_pole",
1341+
"id_suffix": "from_scratch",
1342+
"category": "CC_WEAPON",
1343+
"subcategory": "CSC_WEAPON_CUTTING",
1344+
"skill_used": "fabrication",
1345+
"difficulty": 5,
12541346
"time": "7 h 40 m",
12551347
"autolearn": true,
12561348
"proficiencies": [
@@ -1265,13 +1357,68 @@
12651357
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
12661358
},
12671359
{
1360+
"type": "recipe",
1361+
"activity_level": "BRISK_EXERCISE",
1362+
"result": "brush_pole",
1363+
"id_suffix": "from_bill",
1364+
"category": "CC_WEAPON",
1365+
"subcategory": "CSC_WEAPON_CUTTING",
1366+
"skill_used": "fabrication",
1367+
"difficulty": 2,
1368+
"time": "20 m",
1369+
"autolearn": true,
1370+
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 } ],
1371+
"qualities": [ { "id": "DRILL", "level": 2 } ],
1372+
"byproducts": [ [ "splinter", 3 ] ],
1373+
"components": [ [ [ "brush_handaxe", 1 ] ], [ [ "nails", 4, "LIST" ] ], [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
1374+
},
1375+
{
1376+
"type": "recipe",
1377+
"activity_level": "BRISK_EXERCISE",
1378+
"result": "bronze_brush_handaxe",
1379+
"category": "CC_WEAPON",
1380+
"subcategory": "CSC_WEAPON_CUTTING",
1381+
"skill_used": "fabrication",
1382+
"difficulty": 4,
1383+
"time": "6 h",
1384+
"autolearn": true,
1385+
"proficiencies": [
1386+
{ "proficiency": "prof_metalworking" },
1387+
{ "proficiency": "prof_redsmithing" },
1388+
{ "proficiency": "prof_redsmithing_adv" }
1389+
],
1390+
"using": [ [ "forging_standard", 2 ], [ "bronzesmithing_tools", 1 ] ],
1391+
"tools": [ [ [ "casting_mold", -1 ] ] ],
1392+
"qualities": [ { "id": "GRIND", "level": 2 } ],
1393+
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ], [ [ "scrap_bronze", 10 ] ] ]
1394+
},
1395+
{
1396+
"type": "recipe",
1397+
"activity_level": "BRISK_EXERCISE",
12681398
"result": "bronze_brush_axe",
1399+
"category": "CC_WEAPON",
1400+
"subcategory": "CSC_WEAPON_CUTTING",
1401+
"skill_used": "fabrication",
1402+
"difficulty": 4,
1403+
"time": "6 h",
1404+
"autolearn": true,
1405+
"proficiencies": [
1406+
{ "proficiency": "prof_metalworking" },
1407+
{ "proficiency": "prof_redsmithing" },
1408+
{ "proficiency": "prof_redsmithing_adv" }
1409+
],
1410+
"using": [ [ "forging_standard", 2 ], [ "bronzesmithing_tools", 1 ] ],
1411+
"tools": [ [ [ "casting_mold", -1 ] ] ],
1412+
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
1413+
},
1414+
{
1415+
"result": "bronze_brush_pole",
12691416
"type": "recipe",
12701417
"activity_level": "BRISK_EXERCISE",
12711418
"category": "CC_WEAPON",
12721419
"subcategory": "CSC_WEAPON_CUTTING",
12731420
"skill_used": "fabrication",
1274-
"difficulty": 6,
1421+
"difficulty": 4,
12751422
"time": "4 h",
12761423
"book_learn": [ [ "bronze_book", 5 ] ],
12771424
"autolearn": true,

‎data/json/recipes/weapon/cutting.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,6 +2204,27 @@
22042204
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
22052205
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
22062206
},
2207+
{
2208+
"type": "recipe",
2209+
"activity_level": "BRISK_EXERCISE",
2210+
"result": "bill_hook",
2211+
"category": "CC_WEAPON",
2212+
"subcategory": "CSC_WEAPON_CUTTING",
2213+
"skill_used": "fabrication",
2214+
"difficulty": 7,
2215+
"time": "9 h",
2216+
"book_learn": [ [ "textbook_weapwest", 6 ] ],
2217+
"proficiencies": [
2218+
{ "proficiency": "prof_metalworking" },
2219+
{ "proficiency": "prof_blacksmithing" },
2220+
{ "proficiency": "prof_bladesmith" },
2221+
{ "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0 }
2222+
],
2223+
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
2224+
"qualities": [ { "id": "GRIND", "level": 2 } ],
2225+
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
2226+
"components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
2227+
},
22072228
{
22082229
"type": "recipe",
22092230
"activity_level": "BRISK_EXERCISE",

0 commit comments

Comments
 (0)