Skip to content

Commit

Permalink
Fix grid constructions calling for solder twice (cataclysmbnteam#2973)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaosvolt
chaosvolt authored Jun 18, 2023
1 parent 910b218 commit 21df39d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
40 changes: 20 additions & 20 deletions data/json/construction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4287,7 +4287,7 @@
"time": "45 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid.",
"pre_special": "check_empty",
"post_furniture": "f_cable_connector"
Expand All @@ -4301,7 +4301,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "cable", 5 ] ], [ [ "battery_charger", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "cable", 5 ] ], [ [ "battery_charger", 1 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in a building with an electric grid.",
"pre_special": "check_empty",
"post_furniture": "f_charger"
Expand All @@ -4315,7 +4315,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "cable", 5 ] ], [ [ "recharge_station", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "cable", 5 ] ], [ [ "recharge_station", 1 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in a building with an electric grid.",
"pre_special": "check_empty",
"post_furniture": "f_recharge_station"
Expand All @@ -4329,7 +4329,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "welder", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "welder", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridwelder"
Expand All @@ -4343,7 +4343,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "weldrig", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "weldrig", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_welderrig"
Expand All @@ -4357,7 +4357,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "forge", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "forge", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridforge"
Expand All @@ -4371,7 +4371,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "forgerig", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "forgerig", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_forgerig"
Expand All @@ -4385,7 +4385,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "kiln", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "kiln", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridkiln"
Expand All @@ -4399,7 +4399,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "electrolysis_kit", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "electrolysis_kit", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridelectrolysis_kit"
Expand All @@ -4413,7 +4413,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "chemistry_set", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "chemistry_set", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_chemistry_set"
Expand All @@ -4427,7 +4427,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "chemlab", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "chemlab", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_chemlab"
Expand All @@ -4441,7 +4441,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "autoclave", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "autoclave", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridautoclave"
Expand All @@ -4455,7 +4455,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "dehydrator", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "dehydrator", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_griddehydrator"
Expand All @@ -4469,7 +4469,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "food_processor", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "food_processor", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridfood_processor"
Expand All @@ -4483,7 +4483,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "vac_sealer", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "vac_sealer", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridvac_sealer"
Expand All @@ -4497,7 +4497,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "craftrig", 1 ] ], [ [ "cable", 5 ] ], [ [ "solder_wire", 10 ] ] ],
"components": [ [ [ "craftrig", 1 ] ], [ [ "cable", 5 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_craftrig"
Expand All @@ -4511,7 +4511,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "kitchen_unit", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "kitchen_unit", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_rvoven"
Expand All @@ -4525,7 +4525,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "soldering_iron", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "soldering_iron", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_gridsolderingiron"
Expand All @@ -4539,7 +4539,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "small_space_heater", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "small_space_heater", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_space_heater_off"
Expand All @@ -4553,7 +4553,7 @@
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "large_space_heater", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"components": [ [ [ "large_space_heater", 1 ] ], [ [ "cable", 5 ] ], [ [ "power_supply", 1 ] ] ],
"pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
"pre_special": "check_empty",
"post_furniture": "f_space_heater_large_off"
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/basecamps/recipe_modular_firestation1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@
"inline": {
"tools": [ [ [ "fake_gridsolderingiron", 20 ], [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ],
"qualities": [ [ { "id": "SCREW" } ] ],
"components": [ [ [ "cable", 5 ] ], [ [ "forge", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 25 ] ] ]
"components": [ [ [ "cable", 5 ] ], [ [ "forge", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 20 ] ] ]
}
}
},
Expand Down

0 comments on commit 21df39d

Please sign in to comment.