Skip to content

Commit 5bf0e20

Browse files
mwhit030github-actions[bot]mwhit
authored
Spring recipes (#82932)
* recipes * lint * Update data/json/requirements/toolsets.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/requirements/toolsets.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/requirements/toolsets.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * json issue * cursed idk how i managed to do this * uncrafts * make you have to sand your sticks/springs --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mwhit <[email protected]>
1 parent d1be24f commit 5bf0e20

File tree

13 files changed

+132
-35
lines changed

13 files changed

+132
-35
lines changed

‎data/json/furniture_and_terrain/furniture-recreation.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@
177177
"flags": [ "BLOCKSDOOR", "TRANSPARENT", "SMALL_HIDE" ],
178178
"deconstruct": {
179179
"items": [
180-
{ "item": "spring", "count": [ 4, 6 ] },
180+
{ "item": "spring_small", "count": [ 2, 4 ] },
181+
{ "item": "spring_medium", "count": [ 1, 2 ] },
181182
{ "item": "plastic_chunk", "count": [ 3, 5 ] },
182183
{ "item": "circuit", "count": 1 },
183184
{ "item": "2x4", "count": 4 },

‎data/json/furniture_and_terrain/furniture-seats.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
{ "item": "cotton_patchwork", "count": 4 },
8787
{ "item": "seatbelt" },
8888
{ "item": "plastic_chunk", "count": 10 },
89-
{ "item": "spring", "count": 3 }
89+
{ "item": "qt_wire", "count": 3 }
9090
]
9191
},
9292
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT", "SMALL_HIDE" ],
@@ -147,7 +147,7 @@
147147
{ "item": "sheet_cotton", "count": 10 },
148148
{ "item": "cotton_patchwork", "count": 5 },
149149
{ "item": "nuts_bolts", "charges": 16 },
150-
{ "item": "spring", "count": 2 },
150+
{ "item": "qt_wire", "count": 3 },
151151
{ "item": "splinter", "count": [ 1, 25 ] }
152152
]
153153
},

‎data/json/items/fake.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@
527527
"type": "ITEM",
528528
"subtypes": [ "TOOL" ],
529529
"name": { "str": "vertical mill" },
530+
"charged_qualities": [ [ "DRILL", 3 ] ],
530531
"charges_per_use": 25
531532
},
532533
{

‎data/json/items/generic.json‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@
11191119
"id": "spring",
11201120
"symbol": ",",
11211121
"color": "light_gray",
1122-
"name": { "str": "spring" },
1122+
"name": { "str": "large spring" },
11231123
"category": "spare_parts",
11241124
"description": "A large, heavy-duty spring. Expands with significant force when compressed.",
11251125
"price": "10 USD",
@@ -1130,6 +1130,36 @@
11301130
"to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
11311131
"melee_damage": { "bash": 3 }
11321132
},
1133+
{
1134+
"type": "ITEM",
1135+
"id": "spring_medium",
1136+
"symbol": ",",
1137+
"color": "light_gray",
1138+
"name": { "str": "medium spring" },
1139+
"category": "spare_parts",
1140+
"description": "A medium spring wound from tempered steel wire. Resists corrosion and expands consistently when compressed.",
1141+
"price": "50 cents",
1142+
"price_postapoc": "10 cent",
1143+
"material": [ "steel" ],
1144+
"weight": "100 g",
1145+
"volume": "50 ml",
1146+
"longest_side": "10 cm"
1147+
},
1148+
{
1149+
"type": "ITEM",
1150+
"id": "spring_small",
1151+
"symbol": ",",
1152+
"color": "light_gray",
1153+
"name": { "str": "small spring" },
1154+
"category": "spare_parts",
1155+
"description": "A small spring wound from tempered steel wire. Resists corrosion and expands consistently when compressed.",
1156+
"price": "20 cents",
1157+
"price_postapoc": "5 cent",
1158+
"material": [ "steel" ],
1159+
"weight": "10 g",
1160+
"volume": "5 ml",
1161+
"longest_side": "3 cm"
1162+
},
11331163
{
11341164
"type": "ITEM",
11351165
"id": "lawnmower",

‎data/json/recipes/other/parts.json‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,34 @@
7272
],
7373
"tools": [ [ [ "swage", -1 ] ] ]
7474
},
75+
{
76+
"type": "recipe",
77+
"activity_level": "NO_EXERCISE",
78+
"result": "spring_medium",
79+
"category": "CC_OTHER",
80+
"subcategory": "CSC_OTHER_MATERIALS",
81+
"skill_used": "fabrication",
82+
"difficulty": 2,
83+
"time": "15 m",
84+
"autolearn": false,
85+
"using": [ [ "spring_standard", 2 ] ],
86+
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
87+
"book_learn": [ [ "reference_fabrication1", 2 ] ]
88+
},
89+
{
90+
"type": "recipe",
91+
"activity_level": "NO_EXERCISE",
92+
"result": "spring_small",
93+
"category": "CC_OTHER",
94+
"subcategory": "CSC_OTHER_MATERIALS",
95+
"skill_used": "fabrication",
96+
"difficulty": 2,
97+
"time": "15 m",
98+
"autolearn": false,
99+
"using": [ [ "spring_standard", 1 ] ],
100+
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
101+
"book_learn": [ [ "reference_fabrication1", 2 ] ]
102+
},
75103
{
76104
"type": "recipe",
77105
"activity_level": "MODERATE_EXERCISE",
@@ -767,7 +795,7 @@
767795
{ "proficiency": "prof_welding_basic", "skill_penalty": 0.5 },
768796
{ "proficiency": "prof_welding" }
769797
],
770-
"components": [ [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "nylon", 20 ], [ "sheet_nylon", 3 ] ], [ [ "pipe_fittings", 4 ] ] ]
798+
"components": [ [ [ "pipe", 4 ] ], [ [ "spring_medium", 2 ] ], [ [ "nylon", 20 ], [ "sheet_nylon", 3 ] ], [ [ "pipe_fittings", 4 ] ] ]
771799
},
772800
{
773801
"type": "recipe",
@@ -791,7 +819,7 @@
791819
],
792820
"components": [
793821
[ [ "pipe", 4 ] ],
794-
[ [ "spring", 2 ] ],
822+
[ [ "spring_medium", 2 ] ],
795823
[ [ "leather", 12 ], [ "fur", 12 ], [ "tanned_hide", 3 ], [ "tanned_pelt", 3 ] ],
796824
[ [ "pipe_fittings", 4 ] ],
797825
[ [ "nylon", 8 ] ]
@@ -815,7 +843,7 @@
815843
{ "proficiency": "prof_welding_basic", "skill_penalty": 0.5 },
816844
{ "proficiency": "prof_welding" }
817845
],
818-
"components": [ [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "nylon", 20 ], [ "sheet_nylon", 3 ] ], [ [ "pipe_fittings", 4 ] ] ]
846+
"components": [ [ [ "pipe", 4 ] ], [ [ "spring_medium", 2 ] ], [ [ "nylon", 20 ], [ "sheet_nylon", 3 ] ], [ [ "pipe_fittings", 4 ] ] ]
819847
},
820848
{
821849
"type": "recipe",
@@ -839,7 +867,7 @@
839867
],
840868
"components": [
841869
[ [ "pipe", 4 ] ],
842-
[ [ "spring", 2 ] ],
870+
[ [ "spring_medium", 2 ] ],
843871
[ [ "leather", 12 ], [ "fur", 12 ], [ "tanned_hide", 3 ], [ "tanned_pelt", 3 ] ],
844872
[ [ "pipe_fittings", 4 ] ],
845873
[ [ "nylon", 8 ] ]

‎data/json/recipes/recipe_vehicle.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[ [ "pipe", 16 ] ],
2020
[ [ "scrap", 90 ], [ "steel_chunk_any", 30, "LIST" ], [ "steel_lump_any", 10, "LIST" ] ],
2121
[ [ "chain", 4 ] ],
22-
[ [ "spring", 4 ] ],
22+
[ [ "spring_medium", 4 ] ],
2323
[ [ "30gal_drum", 3 ] ],
2424
[ [ "filter_air", 1 ], [ "filter_air_makeshift", 1 ] ],
2525
[ [ "well_pump", 2 ] ],
@@ -852,7 +852,7 @@
852852
{ "id": "WRENCH", "level": 1 },
853853
{ "id": "SCREW", "level": 1 }
854854
],
855-
"components": [ [ [ "pipe", 3 ] ], [ [ "motor_tiny", 2 ] ], [ [ "spring", 1 ] ], [ [ "cable", 10 ] ] ]
855+
"components": [ [ [ "pipe", 3 ] ], [ [ "motor_tiny", 2 ] ], [ [ "spring_medium", 1 ] ], [ [ "cable", 10 ] ] ]
856856
},
857857
{
858858
"type": "recipe",

‎data/json/recipes/tools/tools_electronic.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
[ [ "scrap_aluminum", 4 ] ],
527527
[ [ "e_scrap", 2 ] ],
528528
[ [ "cable", 8 ] ],
529-
[ [ "spring", 2 ] ],
529+
[ [ "spring_small", 2 ] ],
530530
[ [ "radio_car_wheel", 1 ] ]
531531
]
532532
},

‎data/json/recipes/weapon/magazines.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
],
134134
"using": [ [ "223_casehead", 1 ] ],
135135
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
136-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
136+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
137137
},
138138
{
139139
"result": "ruger_makeshiftmag",
@@ -149,7 +149,7 @@
149149
"tools": [ [ [ "ruger_mini", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
150150
"using": [ [ "223_casehead", 1 ] ],
151151
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
152-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
152+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
153153
},
154154
{
155155
"result": "m14_makeshiftmag",
@@ -165,7 +165,7 @@
165165
"tools": [ [ [ "m14ebr", -1 ], [ "m1a", -1 ], [ "M24", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
166166
"using": [ [ "308_casehead", 1 ] ],
167167
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
168-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
168+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
169169
},
170170
{
171171
"result": "hk417_makeshiftmag",
@@ -181,7 +181,7 @@
181181
"tools": [ [ [ "hk417_13", -1 ], [ "m110a1", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
182182
"using": [ [ "308_casehead", 1 ] ],
183183
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
184-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
184+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
185185
},
186186
{
187187
"result": "ar10_makeshiftmag",
@@ -197,7 +197,7 @@
197197
"tools": [ [ [ "ar10", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
198198
"using": [ [ "308_casehead", 1 ] ],
199199
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
200-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
200+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
201201
},
202202
{
203203
"result": "steyr_scout_mag_makeshift",
@@ -213,7 +213,7 @@
213213
"tools": [ [ [ "steyr_scout", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
214214
"using": [ [ "308_casehead", 1 ] ],
215215
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
216-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
216+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
217217
},
218218
{
219219
"result": "g3_makeshiftmag",
@@ -229,7 +229,7 @@
229229
"tools": [ [ [ "hk_g3", -1 ], [ "m1a", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
230230
"using": [ [ "308_casehead", 1 ] ],
231231
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
232-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
232+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
233233
},
234234
{
235235
"result": "fal_makeshiftmag",
@@ -245,7 +245,7 @@
245245
"tools": [ [ [ "fn_fal_semi", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
246246
"using": [ [ "308_casehead", 1 ] ],
247247
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
248-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
248+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
249249
},
250250
{
251251
"result": "scarh_makeshiftmag",
@@ -261,7 +261,7 @@
261261
"tools": [ [ [ "scar_h", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
262262
"using": [ [ "308_casehead", 1 ] ],
263263
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
264-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
264+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
265265
},
266266
{
267267
"result": "scarh_makeshiftmag",
@@ -334,7 +334,7 @@
334334
"tools": [ [ [ "smg_40", -1 ] ] ],
335335
"using": [ [ "40_casehead", 1 ] ],
336336
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
337-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
337+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
338338
},
339339
{
340340
"result": "smg_45_mag",
@@ -350,7 +350,7 @@
350350
"tools": [ [ [ "mac_10", -1 ], [ "smg_45", -1 ] ] ],
351351
"using": [ [ "45_casehead", 1 ] ],
352352
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
353-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
353+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
354354
},
355355
{
356356
"result": "ump45_makeshiftmag",
@@ -366,7 +366,7 @@
366366
"tools": [ [ [ "modular_ump", -1 ] ] ],
367367
"using": [ [ "45_casehead", 1 ] ],
368368
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
369-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
369+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
370370
},
371371
{
372372
"result": "thompson_makeshiftmag",
@@ -382,7 +382,7 @@
382382
"tools": [ [ [ "tommygun", -1 ] ] ],
383383
"using": [ [ "45_casehead", 1 ] ],
384384
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
385-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
385+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
386386
},
387387
{
388388
"result": "survivor9mm_mag",
@@ -398,7 +398,7 @@
398398
"tools": [ [ [ "smg_9mm", -1 ], [ "sten", -1 ] ] ],
399399
"using": [ [ "9mm_casehead", 1 ] ],
400400
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
401-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]
401+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "duct_tape", 40 ] ] ]
402402
},
403403
{
404404
"result": "nailmag",
@@ -412,7 +412,7 @@
412412
"autolearn": true,
413413
"tools": [ [ [ "coilgun", -1 ] ], [ [ "nail", -1 ], [ "combatnail", -1 ] ] ],
414414
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ],
415-
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "scrap", 1 ] ], [ [ "duct_tape", 20 ] ] ]
415+
"components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "duct_tape", 20 ] ] ]
416416
},
417417
{
418418
"result": "stanag20_beowulf",

‎data/json/recipes/weapon/mods.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@
546546
"using": [ [ "welding_standard", 15 ], [ "plastic_molding", 2 ] ],
547547
"proficiencies": [ { "proficiency": "prof_plasticworking" } ],
548548
"qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ],
549-
"components": [ [ [ "scrap", 3 ], [ "steel_chunk_any", 1, "LIST" ] ], [ [ "plastic_chunk", 1 ] ], [ [ "spring", 1 ] ] ]
549+
"components": [ [ [ "scrap", 3 ], [ "steel_chunk_any", 1, "LIST" ] ], [ [ "plastic_chunk", 1 ] ], [ [ "spring_medium", 1 ] ] ]
550550
},
551551
{
552552
"type": "recipe",
@@ -878,7 +878,11 @@
878878
],
879879
"//": "25cm weld",
880880
"using": [ [ "welding_standard", 25 ] ],
881-
"components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk_any", 2, "LIST" ] ], [ [ "spring", 1 ] ], [ [ "plastic_chunk", 3 ] ] ]
881+
"components": [
882+
[ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk_any", 2, "LIST" ] ],
883+
[ [ "spring_medium", 1 ] ],
884+
[ [ "plastic_chunk", 3 ] ]
885+
]
882886
},
883887
{
884888
"type": "recipe",
@@ -1056,7 +1060,11 @@
10561060
],
10571061
"//": "25cm weld",
10581062
"using": [ [ "welding_standard", 25 ] ],
1059-
"components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk_any", 2, "LIST" ] ], [ [ "plastic_chunk", 3 ] ], [ [ "spring", 2 ] ] ]
1063+
"components": [
1064+
[ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk_any", 2, "LIST" ] ],
1065+
[ [ "plastic_chunk", 3 ] ],
1066+
[ [ "spring_medium", 2 ] ]
1067+
]
10601068
},
10611069
{
10621070
"type": "recipe",

‎data/json/recipes/weapon/ranged.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@
765765
"components": [
766766
[ [ "shotgun_s", 1 ], [ "pipe_shotgun", 1 ] ],
767767
[ [ "pipe", 3 ] ],
768-
[ [ "spring", 1 ] ],
768+
[ [ "spring_medium", 2 ] ],
769769
[ [ "steel_chunk_any", 3, "LIST" ], [ "scrap", 9 ] ]
770770
]
771771
},
@@ -810,7 +810,7 @@
810810
"components": [
811811
[ [ "2x4", 2 ], [ "stick", 3 ] ],
812812
[ [ "cordage_superior_short", 1, "LIST" ] ],
813-
[ [ "spring", 1 ] ],
813+
[ [ "spring_small", 1 ] ],
814814
[ [ "scrap", 4 ] ],
815815
[ [ "nails", 10, "LIST" ] ]
816816
]
@@ -1163,7 +1163,7 @@
11631163
[ [ "2x4", 8 ], [ "stick", 16 ] ],
11641164
[ [ "rope_superior_short", 2, "LIST" ] ],
11651165
[ [ "simple_crank", 1 ], [ "foot_crank", 1 ] ],
1166-
[ [ "spring", 4 ] ],
1166+
[ [ "spring_medium", 4 ] ],
11671167
[ [ "steel_chunk_any", 4, "LIST" ], [ "scrap", 12 ] ],
11681168
[ [ "nails", 60, "LIST" ] ]
11691169
]
@@ -1189,7 +1189,7 @@
11891189
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
11901190
"components": [
11911191
[ [ "2x4", 4 ], [ "stick", 8 ] ],
1192-
[ [ "spring", 1 ] ],
1192+
[ [ "spring_medium", 1 ] ],
11931193
[ [ "cordage_superior", 1, "LIST" ] ],
11941194
[ [ "nails", 20, "LIST" ] ]
11951195
]

0 commit comments

Comments
 (0)