diff --git a/data/json/construction.json b/data/json/construction.json index ded770e3d743..4fcf6df6c6f4 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -680,7 +680,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], "time": "60 m", - "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], + "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ], "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 6 ] ], [ [ "sheet_metal", 2 ] ] ], "pre_terrain": "t_floor", @@ -933,7 +933,7 @@ "required_skills": [ [ "fabrication", 4 ] ], "time": "90 m", "qualities": [ { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ], + "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ] ] ], "components": [ [ [ "steel_plate", 2 ] ] ], "pre_terrain": "t_pit_shallow", "post_terrain": "t_scrap_wall_halfway" @@ -947,7 +947,7 @@ "required_skills": [ [ "fabrication", 4 ] ], "time": "90 m", "qualities": [ { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ], + "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ] ] ], "components": [ [ [ "steel_plate", 2 ] ] ], "pre_terrain": "t_scrap_wall_halfway", "post_terrain": "t_scrap_wall" @@ -1187,7 +1187,7 @@ "required_skills": [ [ "fabrication", 5 ] ], "time": "90 m", "qualities": [ { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ] ], + "tools": [ [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ] ] ], "components": [ [ [ "steel_plate", 2 ] ] ], "pre_note": "Must be supported on at least two sides.", "pre_special": "check_support", @@ -3869,7 +3869,7 @@ "category": "REINFORCE", "required_skills": [ [ "fabrication", 5 ] ], "time": "90 m", - "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], + "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ], "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 12 ] ], [ [ "sheet_metal", 4 ] ] ], "pre_terrain": "t_window_reinforced", @@ -3883,7 +3883,7 @@ "category": "REINFORCE", "required_skills": [ [ "fabrication", 5 ] ], "time": "90 m", - "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], + "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ], "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 12 ] ], [ [ "sheet_metal", 4 ] ] ], "pre_terrain": "t_window_reinforced_noglass", @@ -3897,7 +3897,7 @@ "category": "REINFORCE", "required_skills": [ [ "fabrication", 2 ] ], "time": "30 m", - "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], + "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ], "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ], "pre_terrain": "t_metal_grate_window", @@ -3911,7 +3911,7 @@ "category": "REINFORCE", "required_skills": [ [ "fabrication", 2 ] ], "time": "30 m", - "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], + "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 30 ] ] ], "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ], "pre_terrain": "t_metal_grate_window", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 29f9ab22c5c1..36cb883f28a6 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -1163,43 +1163,6 @@ ], "magazine_well": "500 ml" }, - { - "id": "welder_crude", - "type": "TOOL", - "category": "tools", - "name": { "str": "makeshift arc welder" }, - "description": "This crude arc welder has been fashioned from a few small transformers, some wire, improvised electrode holder and complete disregard for personal safety. While it's not as efficient as a factory welder, it will serve in a pinch.", - "weight": "7250 g", - "volume": "3500 ml", - "price": 5000, - "price_postapoc": 250, - "to_hit": -2, - "bashing": 7, - "material": "steel", - "symbol": ";", - "color": "light_red", - "ammo": "battery", - "charges_per_use": 10, - "qualities": [ [ "WELD", 1 ] ], - "use_action": [ - { - "type": "repair_item", - "item_action_type": "repair_metal", - "materials": [ "iron", "steel", "hardsteel", "aluminum", "copper", "bronze", "silver", "gold", "platinum", "superalloy", "glass" ], - "skill": "fabrication", - "tool_quality": 5, - "cost_scaling": 0.1, - "move_cost": 1000 - } - ], - "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] - ] - }, { "id": "wood_smoother", "type": "GENERIC", diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json index 95c7d7041062..619a76d1f638 100644 --- a/data/json/obsoletion/items.json +++ b/data/json/obsoletion/items.json @@ -5027,5 +5027,42 @@ "copy-from": "AID_abstract", "name": { "str_sp": "Weather Reader CBM installation data" }, "description": "Precise step-by-step instructions and other required data for installation of Weather Reader CBM, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance. Integrated security subroutine renders it unusable after installation." + }, + { + "id": "welder_crude", + "type": "TOOL", + "category": "tools", + "name": { "str": "makeshift arc welder" }, + "description": "This crude arc welder has been fashioned from a few small transformers, some wire, improvised electrode holder and complete disregard for personal safety. While it's not as efficient as a factory welder, it will serve in a pinch.", + "weight": "7250 g", + "volume": "3500 ml", + "price": 5000, + "price_postapoc": 250, + "to_hit": -2, + "bashing": 7, + "material": "steel", + "symbol": ";", + "color": "light_red", + "ammo": "battery", + "charges_per_use": 10, + "qualities": [ [ "WELD", 1 ] ], + "use_action": [ + { + "type": "repair_item", + "item_action_type": "repair_metal", + "materials": [ "iron", "steel", "hardsteel", "aluminum", "copper", "bronze", "silver", "gold", "platinum", "superalloy", "glass" ], + "skill": "fabrication", + "tool_quality": 5, + "cost_scaling": 0.1, + "move_cost": 1000 + } + ], + "flags": [ "ALLOWS_REMOTE_USE" ], + "magazines": [ + [ + "battery", + [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + ] + ] } ] diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migration.json index 46886f1a230e..b660e8302e01 100644 --- a/data/json/obsoletion/migration.json +++ b/data/json/obsoletion/migration.json @@ -1902,5 +1902,11 @@ "type": "MIGRATION", "replace": "leg_warmers", "flags": [ "resized_large" ] + }, + { + "id": "welder_crude", + "type": "MIGRATION", + "replace": "welder", + "flags": [ "resized_large" ] } ] diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json index e402f9a62924..3d0718342359 100644 --- a/data/json/obsoletion/recipes.json +++ b/data/json/obsoletion/recipes.json @@ -3264,5 +3264,10 @@ "type": "recipe", "result": "sights_mount", "obsolete": true + }, + { + "type": "recipe", + "result": "welder_crude", + "obsolete": true } ] diff --git a/data/json/recipes/ammo/other.json b/data/json/recipes/ammo/other.json index 8e0fdde73153..08376320a20d 100644 --- a/data/json/recipes/ammo/other.json +++ b/data/json/recipes/ammo/other.json @@ -179,10 +179,7 @@ "time": "8 m", "book_learn": [ [ "manual_launcher", 4 ] ], "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ], - "tools": [ - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "welder_crude", 45 ], [ "toolset", 45 ] ], - [ [ "hotplate", 50 ], [ "toolset", 50 ] ] - ], + "tools": [ [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ] ], [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ], "components": [ [ [ "pipe", 2 ] ], [ [ "spike", 1 ] ], diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index e0db319fb658..429446eeab93 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -62,7 +62,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "nomex", 8 ] ], [ [ "kevlar_plate", 4 ] ], @@ -96,7 +96,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "kevlar_plate", 4 ] ], @@ -116,7 +116,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], - "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "fabric_standard", 4, "LIST" ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ], @@ -137,7 +137,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], - "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "rag", 4 ] ], [ [ "leather", 4 ] ], @@ -185,7 +185,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "rag", 8 ] ], [ [ "kevlar_plate", 4 ] ], @@ -243,7 +243,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "fabric_hides_proper", 8, "LIST" ] ], [ [ "kevlar_plate", 4 ] ], @@ -286,7 +286,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 80 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "fur", 12 ] ], [ [ "kevlar_plate", 4 ] ], @@ -518,7 +518,7 @@ "time": "30 m", "book_learn": [ [ "mag_swimming", 3 ], [ "manual_swimming", 2 ] ], "using": [ [ "sewing_standard", 20 ] ], - "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "duct_tape", 80 ], [ "medical_tape", 80 ] ], [ [ "superglue", 1 ] ] ] }, { diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index c156026cbc32..b9274bd07260 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -187,7 +187,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], - "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], + "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], "components": [ [ [ "nomex", 6 ] ], [ [ "fabric_hides_proper", 2, "LIST" ] ], @@ -221,7 +221,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], - "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], + "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "duct_tape", 120 ] ], @@ -240,7 +240,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "fabric_standard", 2, "LIST" ] ], [ [ "fabric_hides_proper", 2, "LIST" ] ], @@ -267,7 +267,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "rag", 2 ] ], [ [ "leather", 2 ] ], @@ -345,7 +345,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], - "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], + "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], "components": [ [ [ "rag", 6 ] ], [ [ "fabric_hides_proper", 2, "LIST" ] ], @@ -406,7 +406,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], - "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], + "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], "components": [ [ [ "fabric_standard", 2, "LIST" ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ], @@ -504,7 +504,7 @@ "time": "1 h", "autolearn": true, "using": [ [ "sewing_standard", 50 ] ], - "tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], + "tools": [ [ [ "welder", 14 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ], "components": [ [ [ "fabric_standard", 2, "LIST" ] ], [ [ "fur", 8 ] ], diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 62a000ee86d1..cad4b3b91d87 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -588,7 +588,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ], [ [ "tac_helmet", 1 ], [ "tac_fullhelmet", 1 ], [ "helmet_army", 1 ], [ "kevlar_plate", 6 ] ], @@ -620,7 +620,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ], [ [ "helmet_army", 1 ] ], @@ -652,7 +652,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ [ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ], [ [ "helmet_army", 1 ] ], @@ -699,7 +699,7 @@ "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ] ], "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "nomex", 8 ] ], [ [ "kevlar_plate", 4 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ] }, { @@ -713,7 +713,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "kevlar_plate", 4 ] ], [ [ "wetsuit_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ] }, { @@ -727,7 +727,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "rag", 8 ] ], [ [ "kevlar_plate", 4 ] ], [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], [ [ "duct_tape", 100 ] ] ] }, { @@ -753,7 +753,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "fabric_hides_proper", 6, "LIST" ] ], [ [ "fabric_standard", 2, "LIST" ] ], @@ -773,7 +773,7 @@ "time": "45 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], + "tools": [ [ [ "welder", 21 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ [ [ "fur", 8 ] ], [ [ "fabric_standard", 2, "LIST" ] ], @@ -895,7 +895,7 @@ "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 4 ] ], [ [ "mask_bal", 1 ], [ "kevlar_plate", 4 ] ] ] }, { @@ -937,7 +937,7 @@ [ "textbook_gaswarfare", 3 ] ], "qualities": [ { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "goggles_ski", 1 ], [ "goggles_swim", 2 ] ], [ [ "mask_filter", 3 ] ], @@ -965,7 +965,7 @@ [ "textbook_gaswarfare", 3 ] ], "qualities": [ { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_gas", 1 ] ], [ [ "mask_filter", 1 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -979,7 +979,7 @@ "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "rebreather", 1 ] ], [ [ "goggles_swim", 1 ] ], @@ -999,7 +999,7 @@ "autolearn": true, "using": [ [ "adhesive", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], @@ -1019,7 +1019,7 @@ "autolearn": true, "using": [ [ "adhesive", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], @@ -1038,7 +1038,7 @@ "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], @@ -1082,7 +1082,7 @@ "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], @@ -1101,7 +1101,7 @@ "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], @@ -1170,7 +1170,7 @@ "time": "1 h 20 m", "book_learn": [ [ "manual_swimming", 3 ], [ "atomic_survival", 3 ], [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 1 ] ], [ [ "power_supply", 2 ] ], @@ -1192,7 +1192,7 @@ "time": "1 h 25 m", "book_learn": [ [ "manual_swimming", 3 ], [ "atomic_survival", 3 ], [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "mask_filter", 2 ] ], [ [ "power_supply", 2 ] ], @@ -1215,7 +1215,7 @@ "time": "20 m", "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "rebreather", 1 ] ], [ [ "mask_filter", 1 ], [ "mask_gas", 1 ] ], @@ -1327,7 +1327,7 @@ "time": "20 m", "autolearn": true, "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "goggles_ski", 1 ], diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index bde0d113d1aa..1020fba56f57 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -374,7 +374,7 @@ "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 10 ], [ "welder_crude", 15 ], [ "soldering_iron", 15 ], [ "toolset", 15 ] ] ], + "tools": [ [ [ "welder", 10 ], [ "soldering_iron", 15 ], [ "toolset", 15 ] ] ], "components": [ [ [ "rag", 15 ] ], [ [ "bag_plastic", 4 ] ], diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index 2d734275b30b..f0057fcc9147 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -10,7 +10,7 @@ "time": "3 h", "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_tailor", 8 ], [ "textbook_fireman", 6 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], + "tools": [ [ [ "welder", 112 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], "components": [ [ [ "cleansuit", 1 ] ], [ [ "duct_tape", 600 ] ], @@ -29,7 +29,7 @@ "time": "3 h 40 m", "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], + "tools": [ [ [ "welder", 112 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], "components": [ [ [ "hazmat_suit", 1 ] ], [ [ "duct_tape", 800 ] ], @@ -442,7 +442,7 @@ "time": "2 h 40 m", "book_learn": [ [ "textbook_fireman", 8 ], [ "tailor_portfolio", 8 ] ], "using": [ [ "sewing_standard", 200 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "nomex", 40 ] ], [ [ "kevlar_plate", 8 ] ], @@ -462,7 +462,7 @@ "autolearn": true, "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], "using": [ [ "sewing_standard", 200 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "fabric_standard", 4, "LIST" ] ], [ [ "nomex_suit", 1 ], [ "entry_suit", 1 ], [ "nomex", 20 ] ], @@ -506,7 +506,7 @@ "time": "5 h", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "fabric_standard", 10, "LIST" ] ], [ [ "wetsuit", 1 ], [ "wetsuit_spring", 1 ] ], @@ -536,7 +536,7 @@ "time": "6 h", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "fabric_standard", 20, "LIST" ] ], [ [ "fabric_hides_proper", 20, "LIST" ] ], @@ -568,7 +568,7 @@ "time": "6 h", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 56 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ [ [ "rag", 20 ] ], [ [ "leather", 20 ] ], @@ -624,7 +624,7 @@ "time": "3 h", "autolearn": true, "using": [ [ "sewing_standard", 100 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "rag", 30 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], @@ -681,7 +681,7 @@ "time": "4 h", "autolearn": true, "using": [ [ "sewing_standard", 150 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "fabric_standard", 20, "LIST" ] ], [ [ "fabric_hides_proper", 20, "LIST" ] ], @@ -826,7 +826,7 @@ "time": "5 h", "autolearn": true, "using": [ [ "sewing_standard", 200 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ [ [ "fabric_standard", 10, "LIST" ] ], [ [ "leather", 20 ] ], diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 8c9aaaed57e7..4de9749baed6 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -503,7 +503,7 @@ "time": "2 h", "autolearn": true, "using": [ [ "sewing_standard", 60 ] ], - "tools": [ [ [ "welder", 18 ], [ "welder_crude", 27 ], [ "soldering_iron", 27 ], [ "toolset", 27 ] ] ], + "tools": [ [ [ "welder", 18 ], [ "soldering_iron", 27 ], [ "toolset", 27 ] ] ], "components": [ [ [ "rag", 15 ] ], [ [ "coat_rain", 1 ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json index 872aa83f7e5d..95c63f1e1872 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json @@ -16,7 +16,7 @@ "time": "1 d 7 h 35 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 120 ], [ "oxy_torch", 24 ], [ "toolset", 180 ], [ "welder", 120 ], [ "welder_crude", 180 ] ] ], + "tools": [ [ [ "fake_gridwelder", 120 ], [ "oxy_torch", 24 ], [ "toolset", 180 ], [ "welder", 120 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], @@ -56,7 +56,7 @@ "time": "1 d 18 h 55 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 180 ], [ "oxy_torch", 36 ], [ "toolset", 270 ], [ "welder", 180 ], [ "welder_crude", 270 ] ] ], + "tools": [ [ [ "fake_gridwelder", 180 ], [ "oxy_torch", 36 ], [ "toolset", 270 ], [ "welder", 180 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], @@ -96,7 +96,7 @@ "time": "1 d 19 h 25 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 120 ], [ "oxy_torch", 24 ], [ "toolset", 180 ], [ "welder", 120 ], [ "welder_crude", 180 ] ] ], + "tools": [ [ [ "fake_gridwelder", 120 ], [ "oxy_torch", 24 ], [ "toolset", 180 ], [ "welder", 120 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], @@ -133,7 +133,7 @@ "time": "2 d 12 h 10 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 300 ], [ "oxy_torch", 60 ], [ "toolset", 450 ], [ "welder", 300 ], [ "welder_crude", 450 ] ] ], + "tools": [ [ [ "fake_gridwelder", 300 ], [ "oxy_torch", 60 ], [ "toolset", 450 ], [ "welder", 300 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], @@ -169,7 +169,7 @@ "time": "1 d 7 h 20 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 120 ], [ "oxy_torch", 24 ], [ "toolset", 180 ], [ "welder", 120 ], [ "welder_crude", 180 ] ] ], + "tools": [ [ [ "fake_gridwelder", 120 ], [ "oxy_torch", 24 ], [ "toolset", 180 ], [ "welder", 120 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], @@ -209,7 +209,7 @@ "time": "1 d 10 h 5 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 140 ], [ "oxy_torch", 28 ], [ "toolset", 210 ], [ "welder", 140 ], [ "welder_crude", 210 ] ] ], + "tools": [ [ [ "fake_gridwelder", 140 ], [ "oxy_torch", 28 ], [ "toolset", 210 ], [ "welder", 140 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], @@ -245,7 +245,7 @@ "time": "16 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 40 ], [ "oxy_torch", 8 ], [ "toolset", 60 ], [ "welder", 40 ], [ "welder_crude", 60 ] ] ], + "tools": [ [ [ "fake_gridwelder", 40 ], [ "oxy_torch", 8 ], [ "toolset", 60 ], [ "welder", 40 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "DRILL" } ], diff --git a/data/json/recipes/basecamps/recipe_modular_field_metal.json b/data/json/recipes/basecamps/recipe_modular_field_metal.json index 8e12b7e3945d..4db1918c0a50 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_field_metal.json @@ -16,7 +16,7 @@ "time": "20 h", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ], [ "welder_crude", 900 ] ] ], + "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "steel_plate", 24 ] ] ] } @@ -39,7 +39,7 @@ "time": "19 h 45 m", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 550 ], [ "oxy_torch", 110 ], [ "toolset", 825 ], [ "welder", 550 ], [ "welder_crude", 825 ] ] ], + "tools": [ [ [ "fake_gridwelder", 550 ], [ "oxy_torch", 110 ], [ "toolset", 825 ], [ "welder", 550 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 30 ] ], [ [ "steel_plate", 22 ] ] ] } @@ -62,9 +62,7 @@ "time": "1 d 4 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 700 ], [ "oxy_torch", 140 ], [ "toolset", 1050 ], [ "welder", 700 ], [ "welder_crude", 1050 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 700 ], [ "oxy_torch", 140 ], [ "toolset", 1050 ], [ "welder", 700 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -93,9 +91,7 @@ "time": "3 d 20 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -132,9 +128,7 @@ "time": "3 d 12 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -171,9 +165,7 @@ "time": "3 d 20 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -210,9 +202,7 @@ "time": "3 d 12 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -249,9 +239,7 @@ "time": "2 d 19 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1850 ], [ "oxy_torch", 370 ], [ "toolset", 2775 ], [ "welder", 1850 ], [ "welder_crude", 2775 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1850 ], [ "oxy_torch", 370 ], [ "toolset", 2775 ], [ "welder", 1850 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -288,9 +276,7 @@ "time": "3 d 20 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -327,9 +313,7 @@ "time": "3 d 12 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -366,9 +350,7 @@ "time": "3 d 20 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2500 ], [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -405,9 +387,7 @@ "time": "3 d 12 h 15 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2300 ], [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -444,9 +424,7 @@ "time": "1 d 19 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1200 ], [ "oxy_torch", 240 ], [ "toolset", 1800 ], [ "welder", 1200 ], [ "welder_crude", 1800 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1200 ], [ "oxy_torch", 240 ], [ "toolset", 1800 ], [ "welder", 1200 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -475,9 +453,7 @@ "time": "1 d 9 h", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1050 ], [ "oxy_torch", 210 ], [ "toolset", 1575 ], [ "welder", 1050 ], [ "welder_crude", 1575 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1050 ], [ "oxy_torch", 210 ], [ "toolset", 1575 ], [ "welder", 1050 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "steel_plate", 42 ] ] ] } @@ -500,9 +476,7 @@ "time": "1 d 19 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -531,9 +505,7 @@ "time": "1 d 9 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 950 ], [ "oxy_torch", 190 ], [ "toolset", 1425 ], [ "welder", 950 ], [ "welder_crude", 1425 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 950 ], [ "oxy_torch", 190 ], [ "toolset", 1425 ], [ "welder", 950 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -562,9 +534,7 @@ "time": "2 d 18 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2000 ], [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ], [ "welder_crude", 3000 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2000 ], [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -593,9 +563,7 @@ "time": "1 d 19 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -624,9 +592,7 @@ "time": "1 d 9 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 950 ], [ "oxy_torch", 190 ], [ "toolset", 1425 ], [ "welder", 950 ], [ "welder_crude", 1425 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 950 ], [ "oxy_torch", 190 ], [ "toolset", 1425 ], [ "welder", 950 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -655,9 +621,7 @@ "time": "1 d 19 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1200 ], [ "oxy_torch", 240 ], [ "toolset", 1800 ], [ "welder", 1200 ], [ "welder_crude", 1800 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1200 ], [ "oxy_torch", 240 ], [ "toolset", 1800 ], [ "welder", 1200 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -686,9 +650,7 @@ "time": "1 d 9 h", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1050 ], [ "oxy_torch", 210 ], [ "toolset", 1575 ], [ "welder", 1050 ], [ "welder_crude", 1575 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1050 ], [ "oxy_torch", 210 ], [ "toolset", 1575 ], [ "welder", 1050 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "steel_plate", 42 ] ] ] } @@ -716,9 +678,7 @@ "time": "2 d 18 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2000 ], [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ], [ "welder_crude", 3000 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2000 ], [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_firestation1.json b/data/json/recipes/basecamps/recipe_modular_firestation1.json index a97bda59aceb..6071c5f24333 100644 --- a/data/json/recipes/basecamps/recipe_modular_firestation1.json +++ b/data/json/recipes/basecamps/recipe_modular_firestation1.json @@ -660,7 +660,7 @@ "time": "2 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 16 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ] ] } diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json index c17e7431ff5f..a4380417e119 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json @@ -16,9 +16,7 @@ "time": "3 d 8 h 45 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1800 ], [ "oxy_torch", 360 ], [ "toolset", 2700 ], [ "welder", 1800 ], [ "welder_crude", 2700 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1800 ], [ "oxy_torch", 360 ], [ "toolset", 2700 ], [ "welder", 1800 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -53,9 +51,7 @@ "time": "2 d 12 h 30 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -93,9 +89,7 @@ "time": "3 d 30 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1500 ], [ "oxy_torch", 300 ], [ "toolset", 2250 ], [ "welder", 1500 ], [ "welder_crude", 2250 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1500 ], [ "oxy_torch", 300 ], [ "toolset", 2250 ], [ "welder", 1500 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ], @@ -130,9 +124,7 @@ "time": "2 d 19 h 30 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1300 ], [ "oxy_torch", 260 ], [ "toolset", 1950 ], [ "welder", 1300 ], [ "welder_crude", 1950 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1300 ], [ "oxy_torch", 260 ], [ "toolset", 1950 ], [ "welder", 1300 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ], @@ -167,9 +159,7 @@ "time": "2 d 22 h", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1400 ], [ "oxy_torch", 280 ], [ "toolset", 2100 ], [ "welder", 1400 ], [ "welder_crude", 2100 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1400 ], [ "oxy_torch", 280 ], [ "toolset", 2100 ], [ "welder", 1400 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json index 8983d5e9cb1c..0a5bf1154300 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json @@ -16,9 +16,7 @@ "time": "3 d 6 h 40 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2000 ], [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ], [ "welder_crude", 3000 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2000 ], [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -53,9 +51,7 @@ "time": "2 d 4 h 30 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -93,9 +89,7 @@ "time": "3 d 13 h", "skills": [ [ "cooking", 3 ], [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 2100 ], [ "oxy_torch", 420 ], [ "toolset", 3150 ], [ "welder", 2100 ], [ "welder_crude", 3150 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 2100 ], [ "oxy_torch", 420 ], [ "toolset", 3150 ], [ "welder", 2100 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json b/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json index 8c56caeaa9f1..f6ecd2dbc427 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json @@ -672,7 +672,7 @@ "time": "2 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 16 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ] ] } diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json index dae5f10cb3c4..d4b2d9d32b05 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json @@ -870,7 +870,7 @@ "time": "3 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 30 ], [ "toolset", 225 ], [ "welder", 150 ], [ "welder_crude", 225 ] ] ], + "tools": [ [ [ "oxy_torch", 30 ], [ "toolset", 225 ], [ "welder", 150 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 24 ] ], [ [ "sheet_metal", 6 ] ], [ [ "sheet_metal_small", 12 ] ] ] } diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json b/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json index 489b50479cc0..10a66b3632c9 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json @@ -1220,7 +1220,7 @@ "time": "2 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 16 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ] ] } diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json index 664aa1fbdc4d..1c4baf0a19e6 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json @@ -16,9 +16,7 @@ "time": "2 d 12 h", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1800 ], [ "oxy_torch", 360 ], [ "toolset", 2700 ], [ "welder", 1800 ], [ "welder_crude", 2700 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1800 ], [ "oxy_torch", 360 ], [ "toolset", 2700 ], [ "welder", 1800 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "steel_plate", 72 ] ] ] } @@ -41,9 +39,7 @@ "time": "2 d 12 h", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1800 ], [ "oxy_torch", 360 ], [ "toolset", 2700 ], [ "welder", 1800 ], [ "welder_crude", 2700 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1800 ], [ "oxy_torch", 360 ], [ "toolset", 2700 ], [ "welder", 1800 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "steel_plate", 72 ] ] ] } @@ -66,7 +62,7 @@ "time": "21 h 45 m", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ], [ "welder_crude", 900 ] ] ], + "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 30 ] ], [ [ "steel_plate", 24 ] ] ] } @@ -89,7 +85,7 @@ "time": "21 h 45 m", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ], [ "welder_crude", 900 ] ] ], + "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 30 ] ], [ [ "steel_plate", 24 ] ] ] } @@ -112,7 +108,7 @@ "time": "21 h 45 m", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ], [ "welder_crude", 900 ] ] ], + "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 30 ] ], [ [ "steel_plate", 24 ] ] ] } @@ -135,7 +131,7 @@ "time": "21 h 45 m", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ], [ "welder_crude", 900 ] ] ], + "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 30 ] ], [ [ "steel_plate", 24 ] ] ] } @@ -158,9 +154,7 @@ "time": "2 d 12 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1600 ], [ "oxy_torch", 320 ], [ "toolset", 2400 ], [ "welder", 1600 ], [ "welder_crude", 2400 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1600 ], [ "oxy_torch", 320 ], [ "toolset", 2400 ], [ "welder", 1600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -197,9 +191,7 @@ "time": "2 d 12 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1600 ], [ "oxy_torch", 320 ], [ "toolset", 2400 ], [ "welder", 1600 ], [ "welder_crude", 2400 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1600 ], [ "oxy_torch", 320 ], [ "toolset", 2400 ], [ "welder", 1600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -236,7 +228,7 @@ "time": "3 d 18 h", "skills": [ [ "fabrication", 5 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 600 ], [ "welder", 3000 ], [ "welder_crude", 4500 ], [ "toolset", 4500 ] ] ], + "tools": [ [ [ "oxy_torch", 600 ], [ "welder", 3000 ], [ "toolset", 4500 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "steel_plate", 120 ] ] ] } diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json index d449960d177e..6aba0cd0a78d 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json @@ -146,7 +146,7 @@ "time": "1 d 16 h 10 m", "skills": [ [ "fabrication", 6 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json index 711248383c3d..0b8711cebb3a 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json @@ -52,7 +52,7 @@ "time": "4 h 20 m", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 30 ], [ "toolset", 225 ], [ "welder", 150 ], [ "welder_crude", 225 ] ] ], + "tools": [ [ [ "oxy_torch", 30 ], [ "toolset", 225 ], [ "welder", 150 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ], "components": [ [ [ "2x4", 6 ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json index 590aac428201..5c59c80bdde9 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json @@ -133,7 +133,7 @@ "time": "1 d 5 h 40 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json index 5a527a61c9d2..d03c1c617557 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json @@ -16,9 +16,7 @@ "time": "2 d 12 h", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 900 ], [ "oxy_torch", 180 ], [ "toolset", 1350 ], [ "welder", 900 ], [ "welder_crude", 1350 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 900 ], [ "oxy_torch", 180 ], [ "toolset", 1350 ], [ "welder", 900 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -52,7 +50,7 @@ "time": "1 d 13 h 40 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ], [ "welder_crude", 900 ] ] ], + "tools": [ [ [ "fake_gridwelder", 600 ], [ "oxy_torch", 120 ], [ "toolset", 900 ], [ "welder", 600 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -90,7 +88,7 @@ "time": "2 d 3 h 15 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 400 ], [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ], [ "welder_crude", 600 ] ] ], + "tools": [ [ [ "fake_gridwelder", 400 ], [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -130,7 +128,7 @@ "time": "1 d 8 h 45 m", "skills": [ [ "fabrication", 4 ], [ "tailor", 3 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 400 ], [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ], [ "welder_crude", 600 ] ] ], + "tools": [ [ [ "fake_gridwelder", 400 ], [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -170,7 +168,7 @@ "time": "1 d 8 h", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 400 ], [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ], [ "welder_crude", 600 ] ] ], + "tools": [ [ [ "fake_gridwelder", 400 ], [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -210,9 +208,7 @@ "time": "2 d 12 h", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1100 ], [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], @@ -252,9 +248,7 @@ "time": "3 d 9 h", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 1000 ], [ "oxy_torch", 200 ], [ "toolset", 1500 ], [ "welder", 1000 ], [ "welder_crude", 1500 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 1000 ], [ "oxy_torch", 200 ], [ "toolset", 1500 ], [ "welder", 1000 ] ] ], "qualities": [ [ { "id": "DIG" } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json index 72f835c982ba..a4d0b7ac4e83 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json @@ -119,7 +119,7 @@ "time": "1 d 7 h 10 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ], [ { "id": "SMOOTH" } ] ], "components": [ [ [ "2x4", 12 ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json index 172690d6b0a9..4b8a62cfc982 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json @@ -168,10 +168,7 @@ "time": "1 d 10 h 55 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ - [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ], - [ [ "log", -1 ] ] - ], + "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json index 987d437b5394..f7171f8ad7f7 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json @@ -189,7 +189,7 @@ "time": "1 d 3 h 10 m", "skills": [ [ "survival", 3 ], [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "CUT" } ], [ { "id": "GLARE", "level": 2 } ], diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json index 4a667f8b6124..98153c58669d 100644 --- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json @@ -139,7 +139,7 @@ "time": "1 d 2 h 40 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "tools": [ [ [ "fake_gridwelder", 100 ], [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 162 ] ], diff --git a/data/json/recipes/chem/chemicals.json b/data/json/recipes/chem/chemicals.json index a4449429e573..596e4b8f4372 100644 --- a/data/json/recipes/chem/chemicals.json +++ b/data/json/recipes/chem/chemicals.json @@ -368,11 +368,7 @@ "//": "abstracted chloralkali process, followed by 'burning' resulting chlorine and hydrogen with electric arc as uv source and crucible serving as reaction furnace, then dissolving resulting hydrogen chloride gas in water", "book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], - "tools": [ - [ [ "electrolysis_kit", 500 ] ], - [ [ "welder", 100 ], [ "welder_crude", 150 ] ], - [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] - ], + "tools": [ [ [ "electrolysis_kit", 500 ] ], [ [ "welder", 100 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ [ "salt_water", 4 ] ], [ [ "water_clean", 1 ] ] ] }, { diff --git a/data/json/recipes/electronic/parts.json b/data/json/recipes/electronic/parts.json index 9d7d4af39e04..1af5b1a78c1f 100644 --- a/data/json/recipes/electronic/parts.json +++ b/data/json/recipes/electronic/parts.json @@ -270,7 +270,7 @@ "decomp_learn": 4, "book_learn": [ [ "textbook_mechanics", 6 ], [ "textbook_electronics", 8 ], [ "textbook_fabrication", 8 ], [ "welding_book", 5 ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "soldering_iron", 1 ] ], [ [ "welder", 1 ], [ "welder_crude", 2 ] ] ] + "components": [ [ [ "soldering_iron", 1 ] ], [ [ "welder", 1 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 41adf4a00514..1a0348e0c665 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -347,7 +347,7 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 }, { "id": "GLARE", "level": 2 } ], "using": [ [ "steel_tiny", 1 ] ], - "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ], [ [ "soldering_iron", 10 ] ] ], + "tools": [ [ [ "welder", 50 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ], [ [ "soldering_iron", 10 ] ] ], "components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 2 ] ], [ [ "chain", 1 ] ], [ [ "circuit", 1 ] ] ] }, { @@ -1121,7 +1121,7 @@ "//": "sawing it down doesn't teach anything useful", "autolearn": true, "qualities": [ { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], + "tools": [ [ [ "welder", 50 ], [ "toolset", 75 ], [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], "components": [ [ [ "steel_lump", 4 ] ] ] }, { diff --git a/data/json/recipes/other/other.json b/data/json/recipes/other/other.json index c33c78679a5a..b64422b30743 100644 --- a/data/json/recipes/other/other.json +++ b/data/json/recipes/other/other.json @@ -169,7 +169,7 @@ { "id": "WRENCH", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ], [ "soldering_iron", 150 ] ] ], + "tools": [ [ [ "welder", 100 ], [ "toolset", 150 ], [ "soldering_iron", 150 ] ] ], "components": [ [ [ "steel_chunk", 6 ], [ "scrap", 18 ] ], [ [ "pipe", 2 ] ] ] }, { diff --git a/data/json/recipes/other/tools.json b/data/json/recipes/other/tools.json index 27287dbad6b3..4529a4d5f2ce 100644 --- a/data/json/recipes/other/tools.json +++ b/data/json/recipes/other/tools.json @@ -815,7 +815,7 @@ }, { "type": "recipe", - "result": "welder_crude", + "result": "welder", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "electronics", @@ -863,7 +863,7 @@ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "welder", 200 ], [ "welder_crude", 300 ], [ "toolset", 300 ], [ "soldering_iron", 300 ], [ "oxy_torch", 40 ] ] ], + "tools": [ [ [ "welder", 200 ], [ "toolset", 300 ], [ "soldering_iron", 300 ], [ "oxy_torch", 40 ] ] ], "components": [ [ [ "element", 8 ] ], [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ], @@ -1416,7 +1416,7 @@ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ], [ "soldering_iron", 150 ], [ "oxy_torch", 20 ] ] ], + "tools": [ [ [ "welder", 100 ], [ "toolset", 150 ], [ "soldering_iron", 150 ], [ "oxy_torch", 20 ] ] ], "components": [ [ [ "pilot_light", 1 ] ], [ [ "steel_lump", 3 ], [ "steel_chunk", 12 ], [ "scrap", 36 ] ], @@ -1442,7 +1442,7 @@ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "soldering_iron", 75 ], [ "oxy_torch", 10 ] ] ], + "tools": [ [ [ "welder", 50 ], [ "toolset", 75 ], [ "soldering_iron", 75 ], [ "oxy_torch", 10 ] ] ], "components": [ [ [ "pilot_light", 1 ] ], [ [ "scrap", 4 ] ], [ [ "metal_tank_little", 1 ] ] ] }, { @@ -1568,7 +1568,7 @@ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "tools": [ [ [ "welder", 150 ], [ "welder_crude", 225 ], [ "toolset", 225 ], [ "soldering_iron", 225 ], [ "oxy_torch", 30 ] ] ], + "tools": [ [ [ "welder", 150 ], [ "toolset", 225 ], [ "soldering_iron", 225 ], [ "oxy_torch", 30 ] ] ], "components": [ [ [ "steel_lump", 5 ], [ "steel_chunk", 20 ], [ "scrap", 60 ] ], [ [ "metal_tank_little", 1 ] ], [ [ "pipe", 6 ] ] ] }, { diff --git a/data/json/recipes/other/vehicles.json b/data/json/recipes/other/vehicles.json index 17a00bf61e0f..5a1cd89cfbab 100644 --- a/data/json/recipes/other/vehicles.json +++ b/data/json/recipes/other/vehicles.json @@ -830,7 +830,7 @@ "autolearn": true, "using": [ [ "steel_standard", 20 ] ], "qualities": [ { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ] ] + "tools": [ [ [ "welder", 50 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ] ] }, { "type": "recipe", @@ -845,7 +845,7 @@ "autolearn": true, "qualities": [ { "id": "GLARE", "level": 2 } ], "using": [ [ "steel_standard", 100 ] ], - "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ] ] + "tools": [ [ [ "welder", 50 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index bf4ce9ad3239..de5e5abf7753 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -254,7 +254,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ], [ "soldering_iron", 30 ] ] ], + "tools": [ [ [ "welder", 20 ], [ "toolset", 30 ], [ "soldering_iron", 30 ] ] ], "components": [ [ [ "metal_tank_little", 1 ] ], [ [ "nail", 200 ], [ "scrap", 16 ] ], [ [ "fuse", 1 ] ], [ [ "dynamite", 1 ] ] ] }, { diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index 059185de5468..b6059de72076 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -130,16 +130,7 @@ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "tools": [ [ [ "oxy_torch", 3 ], [ "welder", 15 ], [ "toolset", 25 ], [ "small_repairkit", 15 ], [ "large_repairkit", 15 ] ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -159,16 +150,7 @@ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "tools": [ [ [ "oxy_torch", 3 ], [ "welder", 15 ], [ "toolset", 25 ], [ "small_repairkit", 15 ], [ "large_repairkit", 15 ] ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "spring", 1 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -207,16 +189,7 @@ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 2 ], - [ "welder", 10 ], - [ "welder_crude", 20 ], - [ "toolset", 20 ], - [ "small_repairkit", 10 ], - [ "large_repairkit", 10 ] - ] - ], + "tools": [ [ [ "oxy_torch", 2 ], [ "welder", 10 ], [ "toolset", 20 ], [ "small_repairkit", 10 ], [ "large_repairkit", 10 ] ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -293,16 +266,7 @@ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "tools": [ [ [ "oxy_torch", 3 ], [ "welder", 15 ], [ "toolset", 25 ], [ "small_repairkit", 15 ], [ "large_repairkit", 15 ] ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 3 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -328,16 +292,7 @@ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "tools": [ [ [ "oxy_torch", 3 ], [ "welder", 15 ], [ "toolset", 25 ], [ "small_repairkit", 15 ], [ "large_repairkit", 15 ] ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "plastic_chunk", 3 ] ], [ [ "spring", 2 ] ] ] }, { @@ -375,7 +330,7 @@ "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "DRILL", "level": 1 } ], "tools": [ [ [ "ar15", -1 ], [ "h&k416a5", -1 ], [ "m27iar", -1 ], [ "m4a1", -1 ], [ "m16a4", -1 ] ], - [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 40 ], [ "toolset", 40 ] ], + [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "toolset", 40 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ], "components": [ [ [ "steel_plate", 1 ], [ "steel_lump", 2 ] ], [ [ "pipe", 1 ], [ "sheet_metal_small", 1 ] ], [ [ "scrap", 1 ] ] ] diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 4d911b8afa51..f4d084070900 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -231,16 +231,7 @@ "autolearn": true, "book_learn": [ [ "manual_shotgun", 2 ], [ "manual_pistol", 2 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 6 ], - [ "welder", 30 ], - [ "welder_crude", 45 ], - [ "toolset", 45 ], - [ "small_repairkit", 150 ], - [ "large_repairkit", 30 ] - ] - ], + "tools": [ [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "small_repairkit", 150 ], [ "large_repairkit", 30 ] ] ], "components": [ [ [ "shotgun_s", 1 ], [ "pipe_shotgun", 1 ] ], [ [ "pipe", 3 ] ], @@ -260,16 +251,7 @@ "autolearn": true, "book_learn": [ [ "manual_pistol", 3 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 6 ], - [ "welder", 30 ], - [ "welder_crude", 45 ], - [ "toolset", 45 ], - [ "small_repairkit", 150 ], - [ "large_repairkit", 30 ] - ] - ], + "tools": [ [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "small_repairkit", 150 ], [ "large_repairkit", 30 ] ] ], "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ] }, { @@ -284,16 +266,7 @@ "autolearn": true, "book_learn": [ [ "manual_pistol", 5 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 6 ], - [ "welder", 30 ], - [ "welder_crude", 45 ], - [ "toolset", 45 ], - [ "small_repairkit", 150 ], - [ "large_repairkit", 30 ] - ] - ], + "tools": [ [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "small_repairkit", 150 ], [ "large_repairkit", 30 ] ] ], "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ] }, { @@ -459,16 +432,7 @@ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 7 ], - [ "welder", 36 ], - [ "welder_crude", 54 ], - [ "toolset", 54 ], - [ "small_repairkit", 180 ], - [ "large_repairkit", 75 ] - ] - ], + "tools": [ [ [ "oxy_torch", 7 ], [ "welder", 36 ], [ "toolset", 54 ], [ "small_repairkit", 180 ], [ "large_repairkit", 75 ] ] ], "components": [ [ [ "pipe", 2 ] ], [ [ "nail", 2 ] ], [ [ "spring", 1 ] ], [ [ "scrap", 3 ] ], [ [ "shotgun_d", 1 ] ] ] }, { @@ -529,14 +493,7 @@ { "id": "GLARE", "level": 2 } ], "tools": [ - [ - [ "oxy_torch", 30 ], - [ "welder", 150 ], - [ "large_repairkit", 75 ], - [ "small_repairkit", 150 ], - [ "welder_crude", 225 ], - [ "toolset", 225 ] - ] + [ [ "oxy_torch", 30 ], [ "welder", 150 ], [ "large_repairkit", 75 ], [ "small_repairkit", 150 ], [ "toolset", 225 ] ] ], "components": [ [ [ "pipe", 3 ] ], [ [ "spring", 2 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] }, @@ -557,14 +514,7 @@ { "id": "GLARE", "level": 2 } ], "tools": [ - [ - [ "oxy_torch", 40 ], - [ "welder", 200 ], - [ "large_repairkit", 100 ], - [ "small_repairkit", 200 ], - [ "welder_crude", 300 ], - [ "toolset", 300 ] - ] + [ [ "oxy_torch", 40 ], [ "welder", 200 ], [ "large_repairkit", 100 ], [ "small_repairkit", 200 ], [ "toolset", 300 ] ] ], "components": [ [ [ "pipe", 3 ] ], [ [ "nail", 3 ] ], [ [ "scrap", 3 ] ], [ [ "2x4", 1 ] ] ] }, @@ -641,7 +591,7 @@ { "id": "WRENCH_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ] ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "toolset", 150 ] ] ], "components": [ [ [ "pipe", 1 ] ], [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "scrap", 2 ] ] ] }, { @@ -778,7 +728,7 @@ "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], "tools": [ - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "welder_crude", 45 ], [ "toolset", 45 ] ], + [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ] ], [ [ "small_repairkit", 150 ], [ "large_repairkit", 30 ] ] ], "components": [ [ [ "m2browning", 1 ] ], [ [ "2x4", 1 ] ] ] @@ -1098,7 +1048,7 @@ { "id": "WRENCH_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "oxy_torch", 60 ], [ "welder", 300 ], [ "welder_crude", 450 ], [ "toolset", 450 ] ] ], + "tools": [ [ [ "oxy_torch", 60 ], [ "welder", 300 ], [ "toolset", 450 ] ] ], "components": [ [ [ "cable", 80 ] ], [ [ "2x4", 1 ], [ "stick", 1 ] ], diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json index 9d6cfe0176a7..31309161a83a 100644 --- a/data/json/requirements/toolsets.json +++ b/data/json/requirements/toolsets.json @@ -70,7 +70,7 @@ "type": "requirement", "//": "Crafting or repair of steel items or installation of vehicle parts", "qualities": [ { "id": "GLARE", "level": 2 } ], - "tools": [ [ [ "welder", 10 ], [ "welder_crude", 15 ], [ "toolset", 15 ], [ "oxy_torch", 2 ] ] ] + "tools": [ [ [ "welder", 10 ], [ "toolset", 15 ], [ "oxy_torch", 2 ] ] ] }, { "id": "chainmail_standard",