Skip to content

Commit 4acb587

Browse files
authored
Merge pull request #82618 from ehughsbaird/using-optional
Load recipe `using` with optional
2 parents 339627c + 421f674 commit 4acb587

File tree

15 files changed

+173
-182
lines changed

15 files changed

+173
-182
lines changed

data/json/recipes/food/canned.json

Lines changed: 139 additions & 139 deletions
Large diffs are not rendered by default.

data/json/recipes/food/carnivore.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@
752752
"book_learn": [ [ "vacuum_sealing", 1 ] ],
753753
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
754754
"proficiencies": [ { "proficiency": "prof_preservation" } ],
755-
"using": [ [ "vacuum_sealing_standard", 1, "LIST" ] ],
755+
"using": [ [ "vacuum_sealing_standard", 1 ] ],
756756
"components": [ [ [ "fish", 5 ] ], [ [ "salt_preservation", 5, "LIST" ] ] ]
757757
},
758758
{

data/json/recipes/food/egg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
"book_learn": [ [ "vacuum_sealing", 1 ] ],
286286
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
287287
"proficiencies": [ { "proficiency": "prof_preservation" } ],
288-
"using": [ [ "vacuum_sealing_standard", 1, "LIST" ] ],
288+
"using": [ [ "vacuum_sealing_standard", 1 ] ],
289289
"components": [ [ [ "curing_roe", 2 ] ] ]
290290
},
291291
{

data/json/recipes/food/fruit_dishes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"book_learn": [ [ "vacuum_sealing", 1 ] ],
7171
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
7272
"proficiencies": [ { "proficiency": "prof_preservation" } ],
73-
"using": [ [ "vacuum_sealing_standard", 1, "LIST" ] ],
73+
"using": [ [ "vacuum_sealing_standard", 1 ] ],
7474
"components": [ [ [ "water_clean", 1 ] ], [ [ "sweet_fruit", 4, "LIST" ] ], [ [ "sugar_standard", 1, "LIST" ] ] ]
7575
},
7676
{

data/json/recipes/food/meat_dishes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@
952952
"book_learn": [ [ "vacuum_sealing", 1 ] ],
953953
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
954954
"proficiencies": [ { "proficiency": "prof_preservation" } ],
955-
"using": [ [ "vacuum_sealing_standard", 1, "LIST" ] ],
955+
"using": [ [ "vacuum_sealing_standard", 1 ] ],
956956
"//": "since vacuum sealed meat is cooked, need 40u surface_heat - sealing in salt is not sufficient to cook it",
957957
"components": [
958958
[

data/json/recipes/food/vegetable_dishes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@
842842
"book_learn": [ [ "vacuum_sealing", 1 ] ],
843843
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
844844
"proficiencies": [ { "proficiency": "prof_preservation" } ],
845-
"using": [ [ "vacuum_sealing_standard", 1, "LIST" ] ],
845+
"using": [ [ "vacuum_sealing_standard", 1 ] ],
846846
"components": [ [ [ "veggy_any_uncooked", 2, "LIST" ] ], [ [ "salt_preservation", 2, "LIST" ] ] ]
847847
},
848848
{

data/json/recipes/other/parts.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
"result": "ch_sheet_metal_small",
335335
"type": "recipe",
336336
"copy-from": "sheet_metal_small",
337-
"using": [ [ "blacksmithing_standard", 4 ], [ "carbon", 1 ] ],
337+
"extend": { "using": [ [ "carbon", 1 ] ] },
338338
"components": [ [ [ "lc_steel_chunk", 1 ] ] ]
339339
},
340340
{

data/json/recipes/recipe_others.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3089,7 +3089,7 @@
30893089
"autolearn": true,
30903090
"proficiencies": [ { "proficiency": "prof_carpentry_basic" } ],
30913091
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ],
3092-
"using": [ [ "marking_hard", 1, "LIST" ] ],
3092+
"using": [ [ "marking_hard", 1 ] ],
30933093
"components": [
30943094
[ [ "wood_panel", 1 ] ],
30953095
[ [ "2x4", 2 ] ],
@@ -3245,7 +3245,7 @@
32453245
"skill_used": "fabrication",
32463246
"time": "8 m",
32473247
"autolearn": true,
3248-
"using": [ [ "fabric_standard", 200 ], [ "marking_hard", 1, "LIST" ] ],
3248+
"using": [ [ "fabric_standard", 200 ], [ "marking_hard", 1 ] ],
32493249
"components": [ [ [ "box_medium", 1 ] ] ]
32503250
},
32513251
{
@@ -3296,7 +3296,7 @@
32963296
"//1": "80 cm weld",
32973297
"qualities": [ { "id": "SAW_M", "level": 2 } ],
32983298
"tools": [ [ [ "swage", -1 ] ] ],
3299-
"using": [ [ "steel_standard", 2 ], [ "welding_standard", 80, "LIST" ], [ "blacksmithing_standard", 8 ] ],
3299+
"using": [ [ "steel_standard", 2 ], [ "welding_standard", 80 ], [ "blacksmithing_standard", 8 ] ],
33003300
"components": [ [ [ "pipe", 2 ] ], [ [ "grip_hook", 1 ] ], [ [ "sheet_metal_small", 8 ] ] ]
33013301
},
33023302
{

data/mods/MindOverMatter/mod_interactions/innawood/recipes.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
{ "proficiency": "prof_intro_chemistry", "required": false },
5454
{ "proficiency": "prof_inorganic_chemistry", "required": false }
5555
],
56-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
56+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
5757
"components": [ [ [ "matrix_crystal_biokin_dust", 3 ] ] ],
5858
"flags": [ "BLIND_HARD" ]
5959
},
@@ -75,7 +75,7 @@
7575
{ "proficiency": "prof_intro_chemistry", "required": false },
7676
{ "proficiency": "prof_inorganic_chemistry", "required": false }
7777
],
78-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
78+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
7979
"components": [ [ [ "matrix_crystal_clair_dust", 3 ] ] ],
8080
"flags": [ "BLIND_HARD" ]
8181
},
@@ -97,7 +97,7 @@
9797
{ "proficiency": "prof_intro_chemistry", "required": false },
9898
{ "proficiency": "prof_inorganic_chemistry", "required": false }
9999
],
100-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
100+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
101101
"components": [ [ [ "matrix_crystal_electrokin_dust", 3 ] ] ],
102102
"flags": [ "BLIND_HARD" ]
103103
},
@@ -119,7 +119,7 @@
119119
{ "proficiency": "prof_intro_chemistry", "required": false },
120120
{ "proficiency": "prof_inorganic_chemistry", "required": false }
121121
],
122-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
122+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
123123
"components": [ [ [ "matrix_crystal_photokin_dust", 3 ] ] ],
124124
"flags": [ "BLIND_HARD" ]
125125
},
@@ -141,7 +141,7 @@
141141
{ "proficiency": "prof_intro_chemistry", "required": false },
142142
{ "proficiency": "prof_inorganic_chemistry", "required": false }
143143
],
144-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
144+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
145145
"components": [ [ [ "matrix_crystal_pyrokin_dust", 3 ] ] ],
146146
"flags": [ "BLIND_HARD" ]
147147
},
@@ -163,7 +163,7 @@
163163
{ "proficiency": "prof_intro_chemistry", "required": false },
164164
{ "proficiency": "prof_inorganic_chemistry", "required": false }
165165
],
166-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
166+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
167167
"components": [ [ [ "matrix_crystal_telekin_dust", 3 ] ] ],
168168
"flags": [ "BLIND_HARD" ]
169169
},
@@ -185,7 +185,7 @@
185185
{ "proficiency": "prof_intro_chemistry", "required": false },
186186
{ "proficiency": "prof_inorganic_chemistry", "required": false }
187187
],
188-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
188+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
189189
"components": [ [ [ "matrix_crystal_telepath_dust", 3 ] ] ],
190190
"flags": [ "BLIND_HARD" ]
191191
},
@@ -207,7 +207,7 @@
207207
{ "proficiency": "prof_intro_chemistry", "required": false },
208208
{ "proficiency": "prof_inorganic_chemistry", "required": false }
209209
],
210-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
210+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
211211
"components": [ [ [ "matrix_crystal_teleport_dust", 3 ] ] ],
212212
"flags": [ "BLIND_HARD" ]
213213
},
@@ -229,7 +229,7 @@
229229
{ "proficiency": "prof_intro_chemistry", "required": false },
230230
{ "proficiency": "prof_inorganic_chemistry", "required": false }
231231
],
232-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
232+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
233233
"components": [ [ [ "matrix_crystal_vitakin_dust", 3 ] ] ],
234234
"flags": [ "BLIND_HARD" ]
235235
},
@@ -251,7 +251,7 @@
251251
{ "proficiency": "prof_intro_chemistry", "required": false },
252252
{ "proficiency": "prof_inorganic_chemistry", "required": false }
253253
],
254-
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
254+
"using": [ [ "any_strong_acid", 2 ], [ "surface_heat", 30 ] ],
255255
"components": [ [ [ "matrix_crystal_drained_dust", 3 ] ] ],
256256
"flags": [ "BLIND_HARD" ]
257257
}

data/mods/MindOverMatter/obsolete/recipes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"autolearn": false,
6565
"proficiencies": [ { "proficiency": "prof_matrix_technology_beginner", "required": false } ],
6666
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "MATRIX_CHANNEL", "level": 1 } ],
67-
"using": [ [ "volatile_explosive", 20, "LIST" ], [ "explosives_casting_standard", 1 ] ],
67+
"using": [ [ "volatile_explosive", 20 ], [ "explosives_casting_standard", 1 ] ],
6868
"components": [
6969
[ [ "fuse", 1 ] ],
7070
[ [ "glue_strong", 4 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ],

0 commit comments

Comments
 (0)