Skip to content

Commit de49cd7

Browse files
authored
Unhardcode grass cutting and add a stone sickle (#55086)
* Add stone sickle and GRASS_CUT quality * Reduce cutting damage and needed hammering quality
1 parent b5fddbb commit de49cd7

File tree

5 files changed

+54
-9
lines changed

5 files changed

+54
-9
lines changed

data/json/construction.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3260,24 +3260,24 @@
32603260
"id": "constr_cut_grass_long",
32613261
"group": "cut_grass",
32623262
"category": "OTHER",
3263+
"qualities": [ [ { "id": "GRASS_CUT", "level": 1 } ] ],
32633264
"required_skills": [ [ "survival", 0 ] ],
32643265
"time": "6 m",
32653266
"byproducts": [ { "item": "straw_pile" } ],
32663267
"pre_terrain": "t_grass_long",
3267-
"post_terrain": "t_grass",
3268-
"tools": [ [ [ "machete", -1 ], [ "makeshift_machete", -1 ], [ "scythe", -1 ], [ "sickle", -1 ], [ "survivor_machete", -1 ] ] ]
3268+
"post_terrain": "t_grass"
32693269
},
32703270
{
32713271
"type": "construction",
32723272
"id": "constr_cut_grass_tall",
32733273
"group": "cut_grass",
32743274
"category": "OTHER",
3275+
"qualities": [ [ { "id": "GRASS_CUT", "level": 1 } ] ],
32753276
"required_skills": [ [ "survival", 0 ] ],
32763277
"time": "6 m",
32773278
"byproducts": [ { "item": "straw_pile", "count": [ 1, 2 ] } ],
32783279
"pre_terrain": "t_grass_tall",
3279-
"post_terrain": "t_grass",
3280-
"tools": [ [ [ "machete", -1 ], [ "makeshift_machete", -1 ], [ "scythe", -1 ], [ "sickle", -1 ], [ "survivor_machete", -1 ] ] ]
3280+
"post_terrain": "t_grass"
32813281
},
32823282
{
32833283
"type": "construction",

data/json/items/melee/swords_and_blades.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
"material": [ "steel" ],
355355
"symbol": "/",
356356
"color": "light_gray",
357-
"qualities": [ [ "CUT", 2 ], [ "BUTCHER", -27 ] ],
357+
"qualities": [ [ "CUT", 2 ], [ "GRASS_CUT", 1 ], [ "BUTCHER", -27 ] ],
358358
"techniques": [ "WBLOCK_1" ],
359359
"flags": [ "SHEATH_SWORD" ],
360360
"weapon_category": [ "BLADED_FARMING" ]
@@ -377,7 +377,7 @@
377377
"symbol": "/",
378378
"color": "dark_gray",
379379
"techniques": [ "WBLOCK_2" ],
380-
"qualities": [ [ "CUT", 2 ], [ "BUTCHER", 15 ] ],
380+
"qualities": [ [ "CUT", 2 ], [ "GRASS_CUT", 1 ], [ "BUTCHER", 15 ] ],
381381
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
382382
"weapon_category": [ "BLADED_FARMING" ]
383383
},
@@ -796,7 +796,7 @@
796796
"symbol": "/",
797797
"color": "dark_gray",
798798
"techniques": [ "WBLOCK_2", "RAPID" ],
799-
"qualities": [ [ "CUT", 2 ], [ "BUTCHER", 10 ] ],
799+
"qualities": [ [ "CUT", 2 ], [ "GRASS_CUT", 1 ], [ "BUTCHER", 10 ] ],
800800
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
801801
"weapon_category": [ "BLADED_FARMING" ]
802802
},

data/json/items/tool/landscaping.json

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"symbol": "/",
125125
"color": "light_gray",
126126
"techniques": [ "WIDE", "BRUTAL" ],
127-
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", -22 ] ],
127+
"qualities": [ [ "CUT", 1 ], [ "GRASS_CUT", 1 ], [ "BUTCHER", -22 ] ],
128128
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
129129
"weapon_category": [ "BLADED_FARMING", "HOOKING_WEAPONRY", "POLEARMS" ]
130130
},
@@ -189,6 +189,27 @@
189189
"techniques": [ "WBLOCK_1" ],
190190
"flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE" ]
191191
},
192+
{
193+
"id": "sickle_stone",
194+
"type": "TOOL",
195+
"name": { "str": "stone sickle" },
196+
"description": "A primitive tool to cut grass with. The sharp, crescent-shaped stone at the end of the handle is barely good enough for the job.",
197+
"weight": "470 g",
198+
"volume": "800 ml",
199+
"longest_side": "35 cm",
200+
"price": 1000,
201+
"price_postapoc": 100,
202+
"to_hit": -2,
203+
"bashing": 3,
204+
"cutting": 10,
205+
"material": [ "stone", "wood" ],
206+
"symbol": "/",
207+
"color": "light_gray",
208+
"qualities": [ [ "CUT", 1 ], [ "GRASS_CUT", 1 ], [ "BUTCHER", 2 ] ],
209+
"techniques": [ "WBLOCK_1" ],
210+
"flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE" ],
211+
"weapon_category": [ "BLADED_FARMING" ]
212+
},
192213
{
193214
"id": "sickle",
194215
"type": "TOOL",
@@ -205,7 +226,7 @@
205226
"material": [ "steel", "wood" ],
206227
"symbol": "/",
207228
"color": "light_gray",
208-
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", 7 ] ],
229+
"qualities": [ [ "CUT", 1 ], [ "GRASS_CUT", 1 ], [ "BUTCHER", 7 ] ],
209230
"techniques": [ "WBLOCK_1" ],
210231
"flags": [ "DURABLE_MELEE" ],
211232
"weapon_category": [ "BLADED_FARMING" ]

data/json/recipes/tools/tools_primitive.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,25 @@
162162
[ [ "material_sand", 1 ], [ "material_gravel", 1 ] ]
163163
]
164164
},
165+
{
166+
"type": "recipe",
167+
"activity_level": "MODERATE_EXERCISE",
168+
"result": "sickle_stone",
169+
"category": "CC_OTHER",
170+
"subcategory": "CSC_OTHER_TOOLS",
171+
"skill_used": "fabrication",
172+
"skills_required": [ "survival", 2 ],
173+
"difficulty": 2,
174+
"time": "1 h",
175+
"autolearn": true,
176+
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ],
177+
"proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
178+
"components": [
179+
[ [ "stick", 1 ], [ "2x4", 1 ] ],
180+
[ [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "sharp_rock", 1 ] ],
181+
[ [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ]
182+
]
183+
},
165184
{
166185
"type": "recipe",
167186
"activity_level": "MODERATE_EXERCISE",

data/json/tool_qualities.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"name": { "str": "cutting" },
66
"usages": [ [ 1, [ "salvage", "inscribe", "cauterize" ] ] ]
77
},
8+
{
9+
"type": "tool_quality",
10+
"id": "GRASS_CUT",
11+
"name": { "str": "grass cutting" }
12+
},
813
{
914
"type": "tool_quality",
1015
"id": "CUT_FINE",

0 commit comments

Comments
 (0)