diff --git a/data/json/construction.json b/data/json/construction.json index 62fb9435574ee..5e1f87291525b 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -77,7 +77,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "survival", 2 ] ], "time": "60 m", - "qualities": [ [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ] ], + "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ], "components": [ [ [ "stick", 12 ], [ "2x4", 6 ], [ "wood_panel", 1 ] ], [ [ "pine_bough", 24 ], [ "willowbark", 24 ] ] ], "pre_terrain": "t_pit_shallow", "post_terrain": "t_improvised_shelter" @@ -620,7 +620,7 @@ "required_skills": [ [ "fabrication", 5 ] ], "time": "60 m", "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ], - "qualities": [ [ { "id": "SAW_M", "level": 1 }, { "id": "GLARE", "level": 2 } ] ], + "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 6 ] ], [ [ "sheet_metal", 2 ] ] ], "pre_terrain": "t_floor", "post_terrain": "t_bars" @@ -1214,7 +1214,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], "time": "180 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 12 ] ], [ [ "pebble", 50 ] ], [ [ "mortar_build", 1 ] ] ], "pre_special": "check_empty", "post_terrain": "t_rock_wall_half" @@ -1227,7 +1227,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], "time": "180 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "rock", 12 ] ], [ [ "mortar_build", 1 ] ] ], "pre_terrain": "t_rock_wall_half", "post_terrain": "t_rock_wall" @@ -2658,7 +2658,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], "time": "40 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 8 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ], @@ -2675,7 +2675,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 5 ] ], "time": "40 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 4 ] ], [ [ "2x4", 4 ], [ "wood_sheet", 1 ], [ "wood_panel", 2 ] ], @@ -2693,7 +2693,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], "time": "40 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_water_moving_sh", "post_terrain": "t_dock" @@ -2706,7 +2706,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 6 ] ], "time": "720 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], "components": [ [ [ "wood_beam", 1 ] ], [ [ "spike", 4 ] ] ], "pre_terrain": "t_water_moving_dp", "post_terrain": "t_dock_deep_pile" @@ -2719,7 +2719,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], "time": "120 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "log", 4 ] ], [ [ "spike", 8 ] ] ], "pre_terrain": "t_dock_deep_pile", "post_terrain": "t_dock_deep_frame" @@ -2732,7 +2732,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 2 ] ], "time": "30 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 28 ] ] ], "pre_terrain": "t_dock_deep_frame", "post_terrain": "t_dock_deep" @@ -2771,7 +2771,7 @@ "category": "CONSTRUCT", "required_skills": [ [ "fabrication", 4 ] ], "time": "30 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ], "pre_terrain": "t_water_sh", "post_terrain": "t_sh_bridge" @@ -2783,7 +2783,7 @@ "category": "FURN", "required_skills": [ [ "fabrication", 3 ] ], "time": "25 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 36 ] ], [ [ "pebble", 200 ] ], [ [ "material_soil", 75 ] ] ], "post_terrain": "f_planter" }, diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json index d6f8832379f72..e8934b821aaaf 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json +++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json @@ -102,13 +102,11 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 1060 ] ], + [ [ "2x4", 360 ] ], [ [ "glass_sheet", 2 ] ], [ [ "log", 60 ] ], - [ [ "stick", 90 ], [ "2x4", 180 ] ], - [ [ "wood_sheet", 25 ], [ "wood_panel", 50 ] ], - [ [ "2x4", 150 ] ] + [ [ "nail", 1060 ] ], + [ [ "wood_panel", 50 ], [ "wood_sheet", 25 ] ] ] } } 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 045bc632db256..3e7ea8a66a403 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 @@ -26,19 +26,16 @@ [ { "id": "WRENCH", "level": 2 } ] ], "components": [ - [ [ "pipe", 108 ], [ "frame", 18 ], [ "xlframe", 30 ] ], - [ [ "wire", 144 ], [ "spike", 144 ], [ "nail", 288 ] ], - [ [ "scrap", 240 ], [ "sheet_metal", 6 ], [ "sheet_metal_small", 120 ] ], - [ [ "sheet_metal_small", 120 ], [ "scrap", 240 ] ], - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "2x4", 45 ], [ "log", 6 ] ], - [ [ "nail", 530 ] ], + [ [ "2x4", 111 ] ], + [ [ "frame", 18 ], [ "pipe", 108 ], [ "xlframe", 30 ] ], [ [ "glass_sheet", 3 ] ], - [ [ "wood_sheet", 11 ], [ "wood_panel", 22 ] ], - [ [ "2x4", 66 ] ] + [ [ "hinge", 3 ] ], + [ [ "nail", 818 ] ], + [ [ "scrap", 480 ], [ "sheet_metal_small", 240 ] ], + [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], + [ [ "sheet_metal", 8 ], [ "steel_plate", 2 ] ], + [ [ "spike", 8 ] ], + [ [ "wood_panel", 22 ], [ "wood_sheet", 11 ] ] ] } } @@ -70,19 +67,16 @@ [ { "id": "WRENCH", "level": 2 } ] ], "components": [ - [ [ "pipe", 162 ], [ "frame", 27 ], [ "xlframe", 45 ] ], - [ [ "wire", 216 ], [ "spike", 216 ], [ "nail", 432 ] ], - [ [ "scrap", 360 ], [ "sheet_metal", 9 ], [ "sheet_metal_small", 180 ] ], - [ [ "sheet_metal_small", 180 ], [ "scrap", 360 ] ], - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 670 ] ], + [ [ "2x4", 111 ] ], + [ [ "frame", 27 ], [ "pipe", 162 ], [ "xlframe", 45 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "wood_sheet", 16 ], [ "wood_panel", 32 ] ], - [ [ "2x4", 96 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 1102 ] ], + [ [ "scrap", 720 ], [ "sheet_metal_small", 360 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "sheet_metal", 16 ], [ "steel_plate", 4 ] ], + [ [ "spike", 16 ] ], + [ [ "wood_panel", 32 ], [ "wood_sheet", 16 ] ] ] } } @@ -115,10 +109,9 @@ ], "components": [ [ [ "2x4", 180 ] ], + [ [ "frame", 18 ], [ "pipe", 108 ], [ "xlframe", 30 ] ], [ [ "nail", 736 ] ], - [ [ "pipe", 108 ], [ "frame", 18 ], [ "xlframe", 30 ] ], - [ [ "scrap", 240 ], [ "sheet_metal", 6 ], [ "sheet_metal_small", 120 ] ], - [ [ "sheet_metal_small", 120 ], [ "scrap", 240 ] ], + [ [ "scrap", 480 ], [ "sheet_metal_small", 240 ] ], [ [ "wood_panel", 22 ] ] ] } @@ -151,15 +144,12 @@ [ { "id": "WRENCH", "level": 2 } ] ], "components": [ - [ [ "pipe", 270 ], [ "frame", 45 ], [ "xlframe", 75 ] ], - [ [ "wire", 360 ], [ "spike", 360 ], [ "nail", 720 ] ], - [ [ "scrap", 600 ], [ "sheet_metal", 15 ], [ "sheet_metal_small", 300 ] ], - [ [ "sheet_metal_small", 300 ], [ "scrap", 600 ] ], - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 1060 ] ], + [ [ "2x4", 180 ] ], + [ [ "frame", 45 ], [ "pipe", 270 ], [ "xlframe", 75 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "wood_sheet", 25 ], [ "wood_panel", 50 ] ], - [ [ "2x4", 150 ] ] + [ [ "nail", 1780 ] ], + [ [ "scrap", 1200 ], [ "sheet_metal_small", 600 ] ], + [ [ "wood_panel", 50 ], [ "wood_sheet", 25 ] ] ] } } @@ -192,16 +182,15 @@ ], "components": [ [ [ "2x4", 108 ] ], + [ [ "frame", 18 ], [ "pipe", 108 ], [ "xlframe", 30 ] ], + [ [ "glass_sheet", 2 ] ], + [ [ "hinge", 3 ] ], [ [ "nail", 818 ] ], - [ [ "pipe", 108 ], [ "frame", 18 ], [ "xlframe", 30 ] ], - [ [ "scrap", 240 ], [ "sheet_metal", 6 ], [ "sheet_metal_small", 120 ] ], - [ [ "sheet_metal_small", 120 ], [ "scrap", 240 ] ], + [ [ "scrap", 480 ], [ "sheet_metal_small", 240 ] ], + [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], + [ [ "sheet_metal", 8 ], [ "steel_plate", 2 ] ], [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "glass_sheet", 2 ] ], - [ [ "wood_sheet", 11 ], [ "wood_panel", 22 ] ] + [ [ "wood_panel", 22 ], [ "wood_sheet", 11 ] ] ] } } @@ -234,12 +223,11 @@ ], "components": [ [ [ "2x4", 159 ] ], - [ [ "nail", 1136 ] ], - [ [ "pipe", 126 ], [ "frame", 21 ], [ "xlframe", 35 ] ], - [ [ "scrap", 280 ], [ "sheet_metal", 7 ], [ "sheet_metal_small", 140 ] ], - [ [ "sheet_metal_small", 140 ], [ "scrap", 280 ] ], + [ [ "frame", 21 ], [ "pipe", 126 ], [ "xlframe", 35 ] ], [ [ "glass_sheet", 3 ] ], - [ [ "wood_sheet", 17 ], [ "wood_panel", 34 ] ] + [ [ "nail", 1136 ] ], + [ [ "scrap", 560 ], [ "sheet_metal_small", 280 ] ], + [ [ "wood_panel", 34 ], [ "wood_sheet", 17 ] ] ] } } @@ -271,19 +259,16 @@ [ { "id": "WRENCH", "level": 2 } ] ], "components": [ - [ [ "pipe", 36 ], [ "frame", 6 ], [ "xlframe", 10 ] ], - [ [ "wire", 48 ], [ "spike", 48 ], [ "nail", 96 ] ], - [ [ "scrap", 80 ], [ "sheet_metal", 2 ], [ "sheet_metal_small", 40 ] ], - [ [ "sheet_metal_small", 40 ], [ "scrap", 80 ] ], - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 990 ] ], + [ [ "2x4", 159 ] ], + [ [ "frame", 6 ], [ "pipe", 36 ], [ "xlframe", 10 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "wood_sheet", 24 ], [ "wood_panel", 48 ] ], - [ [ "2x4", 144 ] ] + [ [ "hinge", 3 ] ], + [ [ "nail", 1086 ] ], + [ [ "scrap", 160 ], [ "sheet_metal_small", 80 ] ], + [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], + [ [ "sheet_metal", 8 ], [ "steel_plate", 2 ] ], + [ [ "spike", 8 ] ], + [ [ "wood_panel", 48 ], [ "wood_sheet", 24 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json index d8a8820ef6ad5..df177b1e0c3e8 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json @@ -124,14 +124,13 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 30 ], [ "spear_wood", 30 ] ], + [ [ "2x4", 230 ] ], + [ [ "concrete", 15 ], [ "material_quicklime", 300 ], [ "material_sand", 300 ] ], [ [ "material_soil", 3600 ] ], - [ [ "water", 1500 ], [ "water_clean", 1500 ] ], - [ [ "material_sand", 300 ], [ "material_quicklime", 300 ], [ "concrete", 15 ] ], - [ [ "2x4", 30 ], [ "log", 4 ] ], [ [ "nail", 560 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ] + [ [ "pointy_stick", 30 ], [ "spear_wood", 30 ] ], + [ [ "water", 1500 ], [ "water_clean", 1500 ] ], + [ [ "wood_panel", 25 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json index b336c58beed1e..7b1cf960d09f3 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json +++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json @@ -113,14 +113,13 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 1060 ] ], + [ [ "2x4", 180 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "rock", 360 ] ], - [ [ "pebble", 750 ] ], [ [ "mortar_build", 30 ] ], - [ [ "wood_sheet", 25 ], [ "wood_panel", 50 ] ], - [ [ "2x4", 150 ] ] + [ [ "nail", 1060 ] ], + [ [ "pebble", 750 ] ], + [ [ "rock", 360 ] ], + [ [ "wood_panel", 50 ], [ "wood_sheet", 25 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json index e511b5e631202..39269eb482cf2 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json @@ -114,14 +114,13 @@ "tools": [ ], "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 160 ], [ "stick", 320 ] ], - [ [ "material_quicklime", 128 ], [ "material_limestone", 128 ], [ "clay_lump", 128 ] ], - [ [ "pebble", 320 ], [ "material_sand", 320 ] ], - [ [ "straw_pile", 128 ], [ "cattail_stalk", 128 ], [ "dogbane", 128 ], [ "pine_bough", 128 ] ], + [ [ "2x4", 360 ] ], + [ [ "cattail_stalk", 128 ], [ "dogbane", 128 ], [ "pine_bough", 128 ], [ "straw_pile", 128 ] ], + [ [ "clay_lump", 128 ], [ "material_limestone", 128 ], [ "material_quicklime", 128 ] ], + [ [ "material_sand", 320 ], [ "pebble", 320 ] ], + [ [ "nail", 500 ] ], [ [ "water", 160 ], [ "water_clean", 160 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ], - [ [ "nail", 500 ] ] + [ [ "wood_panel", 25 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json index fd4b0a767b247..7e317ca88b339 100644 --- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json @@ -64,7 +64,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ [ [ "2x4", 240 ] ], [ [ "nail", 688 ] ], [ [ "wood_sheet", 6 ], [ "wood_panel", 12 ] ], [ [ "wood_panel", 22 ] ] ] + "components": [ [ [ "2x4", 240 ] ], [ [ "nail", 688 ] ], [ [ "wood_panel", 34 ] ] ] } } }, @@ -87,13 +87,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 1660 ] ], - [ [ "glass_sheet", 2 ] ], - [ [ "2x4", 300 ] ], - [ [ "wood_sheet", 40 ], [ "wood_panel", 80 ] ] - ] + "components": [ [ [ "2x4", 330 ] ], [ [ "glass_sheet", 2 ] ], [ [ "nail", 1660 ] ], [ [ "wood_panel", 80 ], [ "wood_sheet", 40 ] ] ] } } }, diff --git a/data/json/recipes/basecamps/recipe_modular_field_metal.json b/data/json/recipes/basecamps/recipe_modular_field_metal.json index 73434d03df041..4ac0475156902 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_field_metal.json @@ -62,15 +62,9 @@ "time": "1 d 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 140 ], [ "welder", 700 ], [ "welder_crude", 1050 ], [ "toolset", 1050 ] ] ], + "tools": [ [ [ "oxy_torch", 140 ], [ "toolset", 1050 ], [ "welder", 700 ], [ "welder_crude", 1050 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 28 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 30 ] ], [ [ "spike", 8 ] ] ] } } }, @@ -91,17 +85,16 @@ "time": "3 d 11 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 500 ], [ "welder", 2500 ], [ "welder_crude", 3750 ], [ "toolset", 3750 ] ] ], + "tools": [ [ [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 100 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 104 ] ], + [ [ "spike", 16 ] ] ] } } @@ -123,17 +116,16 @@ "time": "3 d 5 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 460 ], [ "welder", 2300 ], [ "welder_crude", 3450 ], [ "toolset", 3450 ] ] ], + "tools": [ [ [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 92 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 96 ] ], + [ [ "spike", 16 ] ] ] } } @@ -155,17 +147,16 @@ "time": "3 d 11 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 500 ], [ "welder", 2500 ], [ "welder_crude", 3750 ], [ "toolset", 3750 ] ] ], + "tools": [ [ [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 100 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 104 ] ], + [ [ "spike", 16 ] ] ] } } @@ -187,17 +178,16 @@ "time": "3 d 5 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 460 ], [ "welder", 2300 ], [ "welder_crude", 3450 ], [ "toolset", 3450 ] ] ], + "tools": [ [ [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 92 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 96 ] ], + [ [ "spike", 16 ] ] ] } } @@ -219,17 +209,16 @@ "time": "2 d 12 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 370 ], [ "welder", 1850 ], [ "welder_crude", 2775 ], [ "toolset", 2775 ] ] ], + "tools": [ [ [ "oxy_torch", 370 ], [ "toolset", 2775 ], [ "welder", 1850 ], [ "welder_crude", 2775 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 74 ] ] + [ [ "hinge", 3 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], + [ [ "steel_plate", 76 ] ], + [ [ "spike", 8 ] ] ] } } @@ -251,17 +240,16 @@ "time": "3 d 11 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 500 ], [ "welder", 2500 ], [ "welder_crude", 3750 ], [ "toolset", 3750 ] ] ], + "tools": [ [ [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 100 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 104 ] ], + [ [ "spike", 16 ] ] ] } } @@ -283,17 +271,16 @@ "time": "3 d 5 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 460 ], [ "welder", 2300 ], [ "welder_crude", 3450 ], [ "toolset", 3450 ] ] ], + "tools": [ [ [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 92 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 96 ] ], + [ [ "spike", 16 ] ] ] } } @@ -315,17 +302,16 @@ "time": "3 d 11 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 500 ], [ "welder", 2500 ], [ "welder_crude", 3750 ], [ "toolset", 3750 ] ] ], + "tools": [ [ [ "oxy_torch", 500 ], [ "toolset", 3750 ], [ "welder", 2500 ], [ "welder_crude", 3750 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 100 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 104 ] ], + [ [ "spike", 16 ] ] ] } } @@ -347,17 +333,16 @@ "time": "3 d 5 h 45 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 460 ], [ "welder", 2300 ], [ "welder_crude", 3450 ], [ "toolset", 3450 ] ] ], + "tools": [ [ [ "oxy_torch", 460 ], [ "toolset", 3450 ], [ "welder", 2300 ], [ "welder_crude", 3450 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 30 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "steel_plate", 92 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 30 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 96 ] ], + [ [ "spike", 16 ] ] ] } } @@ -379,15 +364,9 @@ "time": "1 d 15 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 240 ], [ "welder", 1200 ], [ "welder_crude", 1800 ], [ "toolset", 1800 ] ] ], + "tools": [ [ [ "oxy_torch", 240 ], [ "toolset", 1800 ], [ "welder", 1200 ], [ "welder_crude", 1800 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 48 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 50 ] ], [ [ "spike", 8 ] ] ] } } }, @@ -431,15 +410,9 @@ "time": "1 d 16 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 220 ], [ "welder", 1100 ], [ "welder_crude", 1650 ], [ "toolset", 1650 ] ] ], + "tools": [ [ [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], - [ [ "steel_plate", 44 ] ] - ] + "components": [ [ [ "hinge", 6 ] ], [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], [ [ "steel_plate", 48 ] ], [ [ "spike", 16 ] ] ] } } }, @@ -460,15 +433,9 @@ "time": "1 d 8 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 190 ], [ "welder", 950 ], [ "welder_crude", 1425 ], [ "toolset", 1425 ] ] ], + "tools": [ [ [ "oxy_torch", 190 ], [ "toolset", 1425 ], [ "welder", 950 ], [ "welder_crude", 1425 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 38 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 40 ] ], [ [ "spike", 8 ] ] ] } } }, @@ -489,15 +456,9 @@ "time": "2 d 15 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 400 ], [ "welder", 2000 ], [ "welder_crude", 3000 ], [ "toolset", 3000 ] ] ], + "tools": [ [ [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ], [ "welder_crude", 3000 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 80 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 82 ] ], [ [ "spike", 8 ] ] ] } } }, @@ -518,15 +479,9 @@ "time": "1 d 16 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 220 ], [ "welder", 1100 ], [ "welder_crude", 1650 ], [ "toolset", 1650 ] ] ], + "tools": [ [ [ "oxy_torch", 220 ], [ "toolset", 1650 ], [ "welder", 1100 ], [ "welder_crude", 1650 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], - [ [ "steel_plate", 44 ] ] - ] + "components": [ [ [ "hinge", 6 ] ], [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], [ [ "steel_plate", 48 ] ], [ [ "spike", 16 ] ] ] } } }, @@ -547,15 +502,9 @@ "time": "1 d 8 h", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 190 ], [ "welder", 950 ], [ "welder_crude", 1425 ], [ "toolset", 1425 ] ] ], + "tools": [ [ [ "oxy_torch", 190 ], [ "toolset", 1425 ], [ "welder", 950 ], [ "welder_crude", 1425 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 38 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 40 ] ], [ [ "spike", 8 ] ] ] } } }, @@ -576,15 +525,9 @@ "time": "1 d 15 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 240 ], [ "welder", 1200 ], [ "welder_crude", 1800 ], [ "toolset", 1800 ] ] ], + "tools": [ [ [ "oxy_torch", 240 ], [ "toolset", 1800 ], [ "welder", 1200 ], [ "welder_crude", 1800 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 48 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 50 ] ], [ [ "spike", 8 ] ] ] } } }, @@ -633,15 +576,9 @@ "time": "2 d 15 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 400 ], [ "welder", 2000 ], [ "welder_crude", 3000 ], [ "toolset", 3000 ] ] ], + "tools": [ [ [ "oxy_torch", 400 ], [ "toolset", 3000 ], [ "welder", 2000 ], [ "welder_crude", 3000 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], - "components": [ - [ [ "spike", 8 ] ], - [ [ "steel_chunk", 16 ], [ "scrap", 48 ] ], - [ [ "steel_plate", 2 ], [ "sheet_metal", 8 ] ], - [ [ "hinge", 3 ] ], - [ [ "steel_plate", 80 ] ] - ] + "components": [ [ [ "hinge", 3 ] ], [ [ "scrap", 48 ], [ "steel_chunk", 16 ] ], [ [ "steel_plate", 82 ] ], [ [ "spike", 8 ] ] ] } } } diff --git a/data/json/recipes/basecamps/recipe_modular_field_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_field_rammed_earth.json index ed41f4c77694f..aa59f2fc3e938 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_field_rammed_earth.json @@ -50,15 +50,14 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 6 ], [ "spear_wood", 6 ] ], + [ [ "log", 12 ] ], + [ [ "2x4", 40 ], [ "stick", 20 ] ], + [ [ "birchbark", 60 ], [ "pine_bough", 60 ] ], + [ [ "concrete", 3 ], [ "material_quicklime", 60 ], [ "material_sand", 60 ] ], [ [ "material_soil", 920 ] ], - [ [ "water", 300 ], [ "water_clean", 300 ] ], - [ [ "material_sand", 60 ], [ "material_quicklime", 60 ], [ "concrete", 3 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "nail", 30 ] ], - [ [ "log", 10 ] ], - [ [ "stick", 20 ], [ "2x4", 40 ] ], - [ [ "birchbark", 60 ], [ "pine_bough", 60 ] ] + [ [ "pointy_stick", 6 ], [ "spear_wood", 6 ] ], + [ [ "water", 300 ], [ "water_clean", 300 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_field_wood.json b/data/json/recipes/basecamps/recipe_modular_field_wood.json index e273ff4ab352e..725c9cf1cbd14 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_field_wood.json @@ -41,13 +41,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 350 ] ], - [ [ "glass_sheet", 1 ] ], - [ [ "2x4", 60 ] ], - [ [ "wood_sheet", 8 ], [ "wood_panel", 16 ] ] - ] + "components": [ [ [ "2x4", 75 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 350 ] ], [ [ "wood_panel", 16 ], [ "wood_sheet", 8 ] ] ] } } }, diff --git a/data/json/recipes/basecamps/recipe_modular_firestation1.json b/data/json/recipes/basecamps/recipe_modular_firestation1.json index 648ed9ed5aaaa..5157849c4f773 100644 --- a/data/json/recipes/basecamps/recipe_modular_firestation1.json +++ b/data/json/recipes/basecamps/recipe_modular_firestation1.json @@ -654,8 +654,8 @@ "time": "2 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ ], - "qualities": [ ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "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_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json index 6675718103fd2..5ead310fd9a8f 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json @@ -58,14 +58,13 @@ ], "components": [ [ [ "2x4", 176 ] ], + [ [ "concrete", 11 ], [ "material_quicklime", 220 ], [ "material_sand", 220 ] ], + [ [ "material_soil", 2640 ] ], [ [ "nail", 512 ] ], [ [ "pointy_stick", 22 ], [ "spear_wood", 22 ] ], - [ [ "wood_sheet", 11 ], [ "wood_panel", 21 ] ], - [ [ "material_soil", 2640 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 1100 ], [ "water_clean", 1100 ] ], - [ [ "material_sand", 220 ], [ "material_quicklime", 220 ], [ "concrete", 11 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 8 ] ] + [ [ "wood_panel", 29 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json index 49cb293c6e3df..7bddbe1d691f2 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json @@ -53,14 +53,13 @@ "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 246 ] ], + [ [ "cattail_stalk", 104 ], [ "dogbane", 104 ], [ "pine_bough", 104 ], [ "straw_pile", 104 ] ], + [ [ "clay_lump", 104 ], [ "material_limestone", 104 ], [ "material_quicklime", 104 ] ], + [ [ "material_sand", 260 ], [ "pebble", 260 ] ], [ [ "nail", 392 ] ], - [ [ "wood_sheet", 11 ], [ "wood_panel", 21 ] ], - [ [ "material_quicklime", 104 ], [ "material_limestone", 104 ], [ "clay_lump", 104 ] ], - [ [ "pebble", 260 ], [ "material_sand", 260 ] ], - [ [ "straw_pile", 104 ], [ "cattail_stalk", 104 ], [ "dogbane", 104 ], [ "pine_bough", 104 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 130 ], [ "water_clean", 130 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 8 ] ] + [ [ "wood_panel", 29 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json index 2010e3331ba0d..ef709b372ac32 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json @@ -18,14 +18,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 318 ] ], - [ [ "nail", 1080 ] ], - [ [ "wire", 20 ] ], - [ [ "hinge", 2 ] ], - [ [ "wood_sheet", 18 ], [ "wood_panel", 36 ] ], - [ [ "wood_panel", 16 ] ] - ] + "components": [ [ [ "2x4", 318 ] ], [ [ "hinge", 2 ] ], [ [ "nail", 1080 ] ], [ [ "wire", 20 ] ], [ [ "wood_panel", 52 ] ] ] } } }, @@ -81,11 +74,10 @@ "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 311 ] ], + [ [ "hinge", 2 ] ], [ [ "nail", 1032 ] ], [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], - [ [ "hinge", 2 ] ], - [ [ "wood_sheet", 15 ], [ "wood_panel", 30 ] ], - [ [ "wood_panel", 17 ] ] + [ [ "wood_panel", 47 ] ] ] } } @@ -111,11 +103,10 @@ "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 308 ] ], + [ [ "hinge", 4 ] ], [ [ "nail", 984 ] ], [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], - [ [ "hinge", 4 ] ], - [ [ "wood_sheet", 13 ], [ "wood_panel", 26 ] ], - [ [ "wood_panel", 19 ] ] + [ [ "wood_panel", 45 ] ] ] } } @@ -141,11 +132,10 @@ "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 310 ] ], + [ [ "hinge", 4 ] ], [ [ "nail", 1004 ] ], [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], - [ [ "hinge", 4 ] ], - [ [ "wood_sheet", 14 ], [ "wood_panel", 28 ] ], - [ [ "wood_panel", 18 ] ] + [ [ "wood_panel", 46 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json index 79a6f82325e70..d7c1e60fa23d2 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json @@ -25,14 +25,13 @@ ], "components": [ [ [ "2x4", 211 ] ], + [ [ "concrete", 20 ], [ "material_quicklime", 400 ], [ "material_sand", 400 ] ], + [ [ "material_soil", 4800 ] ], [ [ "nail", 486 ] ], [ [ "pointy_stick", 40 ], [ "spear_wood", 40 ] ], - [ [ "wood_sheet", 3 ], [ "wood_panel", 5 ] ], - [ [ "material_soil", 4800 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 2000 ], [ "water_clean", 2000 ] ], - [ [ "material_sand", 400 ], [ "material_quicklime", 400 ], [ "concrete", 20 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 17 ] ] + [ [ "wood_panel", 22 ] ] ] } } @@ -64,16 +63,15 @@ ], "components": [ [ [ "2x4", 98 ] ], + [ [ "concrete", 11 ], [ "material_quicklime", 220 ], [ "material_sand", 220 ] ], + [ [ "material_soil", 2640 ] ], [ [ "nail", 192 ] ], - [ [ "pointy_stick", 22 ], [ "spear_wood", 22 ] ], [ [ "pipe", 60 ] ], + [ [ "pointy_stick", 22 ], [ "spear_wood", 22 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "sheet_metal", 10 ] ], - [ [ "wood_sheet", 1 ], [ "wood_panel", 1 ] ], - [ [ "material_soil", 2640 ] ], [ [ "water", 1100 ], [ "water_clean", 1100 ] ], - [ [ "material_sand", 220 ], [ "material_quicklime", 220 ], [ "concrete", 11 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 2 ] ] + [ [ "wood_panel", 3 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json index 87d5834a5bf5a..5352ac755b820 100644 --- a/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json +++ b/data/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json @@ -20,14 +20,13 @@ "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 381 ] ], + [ [ "cattail_stalk", 172 ], [ "dogbane", 172 ], [ "pine_bough", 172 ], [ "straw_pile", 172 ] ], + [ [ "clay_lump", 172 ], [ "material_limestone", 172 ], [ "material_quicklime", 172 ] ], + [ [ "material_sand", 430 ], [ "pebble", 430 ] ], [ [ "nail", 396 ] ], - [ [ "wood_sheet", 3 ], [ "wood_panel", 5 ] ], - [ [ "material_quicklime", 172 ], [ "material_limestone", 172 ], [ "clay_lump", 172 ] ], - [ [ "pebble", 430 ], [ "material_sand", 430 ] ], - [ [ "straw_pile", 172 ], [ "cattail_stalk", 172 ], [ "dogbane", 172 ], [ "pine_bough", 172 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 215 ], [ "water_clean", 215 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 17 ] ] + [ [ "wood_panel", 22 ] ] ] } } @@ -53,16 +52,15 @@ "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ], [ { "id": "WRENCH" } ] ], "components": [ [ [ "2x4", 168 ] ], + [ [ "cattail_stalk", 104 ], [ "dogbane", 104 ], [ "pine_bough", 104 ], [ "straw_pile", 104 ] ], + [ [ "clay_lump", 104 ], [ "material_limestone", 104 ], [ "material_quicklime", 104 ] ], + [ [ "material_sand", 260 ], [ "pebble", 260 ] ], [ [ "nail", 72 ] ], [ [ "pipe", 60 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "sheet_metal", 10 ] ], - [ [ "wood_sheet", 1 ], [ "wood_panel", 1 ] ], - [ [ "material_quicklime", 104 ], [ "material_limestone", 104 ], [ "clay_lump", 104 ] ], - [ [ "pebble", 260 ], [ "material_sand", 260 ] ], - [ [ "straw_pile", 104 ], [ "cattail_stalk", 104 ], [ "dogbane", 104 ], [ "pine_bough", 104 ] ], [ [ "water", 130 ], [ "water_clean", 130 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 2 ] ] + [ [ "wood_panel", 3 ] ] ] } } 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 7bff6d30aff29..84602176736e0 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,8 +672,8 @@ "time": "2 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ ], - "qualities": [ ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "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 9dce90ea5c44f..08f3eaf1dc08d 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,8 +870,8 @@ "time": "3 h", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ ], - "qualities": [ ], + "tools": [ [ [ "oxy_torch", 30 ], [ "toolset", 225 ], [ "welder", 150 ], [ "welder_crude", 225 ] ] ], + "qualities": [ [ { "id": "GLARE", "level": 2 } ] ], "components": [ [ [ "pipe", 24 ] ], [ [ "sheet_metal", 6 ] ], [ [ "sheet_metal_small", 12 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json index 3e3dad809a936..aac4804164bd7 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json +++ b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json @@ -18,13 +18,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "log", 48 ] ], - [ [ "stick", 72 ], [ "2x4", 144 ] ], - [ [ "wood_sheet", 12 ], [ "wood_panel", 24 ] ], - [ [ "2x4", 72 ] ], - [ [ "nail", 480 ] ] - ] + "components": [ [ [ "2x4", 216 ] ], [ [ "log", 48 ] ], [ [ "nail", 480 ] ], [ [ "wood_panel", 24 ], [ "wood_sheet", 12 ] ] ] } } }, @@ -47,13 +41,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "log", 48 ] ], - [ [ "stick", 72 ], [ "2x4", 144 ] ], - [ [ "wood_sheet", 12 ], [ "wood_panel", 24 ] ], - [ [ "2x4", 72 ] ], - [ [ "nail", 480 ] ] - ] + "components": [ [ [ "2x4", 216 ] ], [ [ "log", 48 ] ], [ [ "nail", 480 ] ], [ [ "wood_panel", 24 ], [ "wood_sheet", 12 ] ] ] } } }, @@ -77,13 +65,11 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 87 ] ], [ [ "glass_sheet", 1 ] ], [ [ "log", 16 ] ], - [ [ "stick", 24 ], [ "2x4", 48 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } @@ -108,13 +94,11 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 87 ] ], [ [ "glass_sheet", 1 ] ], [ [ "log", 16 ] ], - [ [ "stick", 24 ], [ "2x4", 48 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } @@ -139,13 +123,11 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 87 ] ], [ [ "glass_sheet", 1 ] ], [ [ "log", 16 ] ], - [ [ "stick", 24 ], [ "2x4", 48 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } @@ -170,13 +152,11 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 87 ] ], [ [ "glass_sheet", 1 ] ], [ [ "log", 16 ] ], - [ [ "stick", 24 ], [ "2x4", 48 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } 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 f6067de70fba3..965f832bb791b 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 @@ -154,17 +154,16 @@ "time": "2 d 10 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 320 ], [ "welder", 1600 ], [ "welder_crude", 2400 ], [ "toolset", 2400 ] ] ], + "tools": [ [ [ "oxy_torch", 320 ], [ "toolset", 2400 ], [ "welder", 1600 ], [ "welder_crude", 2400 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 60 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "steel_plate", 64 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 60 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 68 ] ], + [ [ "spike", 16 ] ] ] } } @@ -186,17 +185,16 @@ "time": "2 d 10 h 30 m", "skills": [ [ "fabrication", 7 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 320 ], [ "welder", 1600 ], [ "welder_crude", 2400 ], [ "toolset", 2400 ] ] ], + "tools": [ [ [ "oxy_torch", 320 ], [ "toolset", 2400 ], [ "welder", 1600 ], [ "welder_crude", 2400 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "WRENCH" } ] ], "components": [ - [ [ "spike", 16 ] ], - [ [ "steel_chunk", 32 ], [ "scrap", 96 ] ], - [ [ "steel_plate", 4 ], [ "sheet_metal", 16 ] ], - [ [ "hinge", 6 ] ], [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 60 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "steel_plate", 64 ] ] + [ [ "hinge", 6 ] ], + [ [ "nail", 60 ] ], + [ [ "scrap", 96 ], [ "steel_chunk", 32 ] ], + [ [ "steel_plate", 68 ] ], + [ [ "spike", 16 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json index 7f2e0e355262a..3a122fed81d13 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json +++ b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json @@ -81,15 +81,14 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "log", 10 ] ], + [ [ "2x4", 32 ], [ "stick", 16 ] ], + [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ], + [ [ "concrete", 4 ], [ "material_quicklime", 80 ], [ "material_sand", 80 ] ], [ [ "material_soil", 1120 ] ], - [ [ "water", 400 ], [ "water_clean", 400 ] ], - [ [ "material_sand", 80 ], [ "material_quicklime", 80 ], [ "concrete", 4 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "nail", 30 ] ], - [ [ "log", 8 ] ], - [ [ "stick", 16 ], [ "2x4", 32 ] ], - [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ] + [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "water", 400 ], [ "water_clean", 400 ] ] ] } } @@ -114,15 +113,14 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "log", 10 ] ], + [ [ "2x4", 32 ], [ "stick", 16 ] ], + [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ], + [ [ "concrete", 4 ], [ "material_quicklime", 80 ], [ "material_sand", 80 ] ], [ [ "material_soil", 1120 ] ], - [ [ "water", 400 ], [ "water_clean", 400 ] ], - [ [ "material_sand", 80 ], [ "material_quicklime", 80 ], [ "concrete", 4 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "nail", 30 ] ], - [ [ "log", 8 ] ], - [ [ "stick", 16 ], [ "2x4", 32 ] ], - [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ] + [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "water", 400 ], [ "water_clean", 400 ] ] ] } } @@ -147,15 +145,14 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "log", 10 ] ], + [ [ "2x4", 32 ], [ "stick", 16 ] ], + [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ], + [ [ "concrete", 4 ], [ "material_quicklime", 80 ], [ "material_sand", 80 ] ], [ [ "material_soil", 1120 ] ], - [ [ "water", 400 ], [ "water_clean", 400 ] ], - [ [ "material_sand", 80 ], [ "material_quicklime", 80 ], [ "concrete", 4 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "nail", 30 ] ], - [ [ "log", 8 ] ], - [ [ "stick", 16 ], [ "2x4", 32 ] ], - [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ] + [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "water", 400 ], [ "water_clean", 400 ] ] ] } } @@ -180,15 +177,14 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "log", 10 ] ], + [ [ "2x4", 32 ], [ "stick", 16 ] ], + [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ], + [ [ "concrete", 4 ], [ "material_quicklime", 80 ], [ "material_sand", 80 ] ], [ [ "material_soil", 1120 ] ], - [ [ "water", 400 ], [ "water_clean", 400 ] ], - [ [ "material_sand", 80 ], [ "material_quicklime", 80 ], [ "concrete", 4 ] ], - [ [ "2x4", 15 ], [ "log", 2 ] ], [ [ "nail", 30 ] ], - [ [ "log", 8 ] ], - [ [ "stick", 16 ], [ "2x4", 32 ] ], - [ [ "birchbark", 48 ], [ "pine_bough", 48 ] ] + [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], + [ [ "water", 400 ], [ "water_clean", 400 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json index 37a12a9d31b00..8f8ac662644e8 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json +++ b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json @@ -79,14 +79,13 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 39 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "rock", 96 ] ], - [ [ "pebble", 200 ] ], [ [ "mortar_build", 8 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "pebble", 200 ] ], + [ [ "rock", 96 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } @@ -111,14 +110,13 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 39 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "rock", 96 ] ], - [ [ "pebble", 200 ] ], [ [ "mortar_build", 8 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "pebble", 200 ] ], + [ [ "rock", 96 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } @@ -143,14 +141,13 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 39 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "rock", 96 ] ], - [ [ "pebble", 200 ] ], [ [ "mortar_build", 8 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "pebble", 200 ] ], + [ [ "rock", 96 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } @@ -175,14 +172,13 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 190 ] ], + [ [ "2x4", 39 ] ], [ [ "glass_sheet", 1 ] ], - [ [ "rock", 96 ] ], - [ [ "pebble", 200 ] ], [ [ "mortar_build", 8 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], - [ [ "2x4", 24 ] ] + [ [ "nail", 190 ] ], + [ [ "pebble", 200 ] ], + [ [ "rock", 96 ] ], + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } diff --git a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json index e30d683a58c3d..2afd2013978b8 100644 --- a/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json @@ -79,13 +79,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 350 ] ], - [ [ "glass_sheet", 1 ] ], - [ [ "2x4", 64 ] ], - [ [ "wood_sheet", 8 ], [ "wood_panel", 16 ] ] - ] + "components": [ [ [ "2x4", 79 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 350 ] ], [ [ "wood_panel", 16 ], [ "wood_sheet", 8 ] ] ] } } }, @@ -108,13 +102,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 350 ] ], - [ [ "glass_sheet", 1 ] ], - [ [ "2x4", 64 ] ], - [ [ "wood_sheet", 8 ], [ "wood_panel", 16 ] ] - ] + "components": [ [ [ "2x4", 79 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 350 ] ], [ [ "wood_panel", 16 ], [ "wood_sheet", 8 ] ] ] } } }, @@ -137,13 +125,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 350 ] ], - [ [ "glass_sheet", 1 ] ], - [ [ "2x4", 64 ] ], - [ [ "wood_sheet", 8 ], [ "wood_panel", 16 ] ] - ] + "components": [ [ [ "2x4", 79 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 350 ] ], [ [ "wood_panel", 16 ], [ "wood_sheet", 8 ] ] ] } } }, @@ -166,13 +148,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 15 ], [ "log", 2 ] ], - [ [ "nail", 350 ] ], - [ [ "glass_sheet", 1 ] ], - [ [ "2x4", 64 ] ], - [ [ "wood_sheet", 8 ], [ "wood_panel", 16 ] ] - ] + "components": [ [ [ "2x4", 79 ] ], [ [ "glass_sheet", 1 ] ], [ [ "nail", 350 ] ], [ [ "wood_panel", 16 ], [ "wood_sheet", 8 ] ] ] } } }, 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 4fe127bf29f23..2a5e41892bf93 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 @@ -19,14 +19,13 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 560 ] ], + [ [ "2x4", 230 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "rock", 216 ] ], - [ [ "pebble", 450 ] ], [ [ "mortar_build", 18 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ] + [ [ "nail", 560 ] ], + [ [ "pebble", 450 ] ], + [ [ "rock", 216 ] ], + [ [ "wood_panel", 25 ] ] ] } } @@ -116,14 +115,13 @@ "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 152 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 7 ] ], - [ [ "nail", 372 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "rock", 96 ] ], - [ [ "pebble", 200 ] ], [ [ "mortar_build", 8 ] ], - [ [ "wood_panel", 12 ] ] + [ [ "nail", 372 ] ], + [ [ "pebble", 200 ] ], + [ [ "rock", 96 ] ], + [ [ "wood_panel", 19 ] ] ] } } @@ -147,21 +145,24 @@ "time": "1 d 16 h 10 m", "skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], "inline": { - "tools": [ ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "qualities": [ + [ { "id": "DIG", "level": 2 } ], + [ { "id": "GLARE", "level": 2 } ], + [ { "id": "HAMMER", "level": 2 } ], + [ { "id": "SAW_W", "level": 2 } ] + ], "components": [ [ [ "2x4", 132 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], + [ [ "mortar_build", 7 ] ], [ [ "nail", 380 ] ], + [ [ "pebble", 150 ] ], [ [ "pipe", 16 ] ], + [ [ "rock", 112 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 112 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], - [ [ "pebble", 150 ] ], - [ [ "mortar_build", 6 ] ], - [ [ "wood_panel", 15 ] ] + [ [ "wood_panel", 23 ] ] ] } } 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 16828fc35f461..4b42e265a5855 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 @@ -51,15 +51,15 @@ "time": "4 h 20 m", "skills": [ [ "fabrication", 3 ] ], "inline": { - "tools": [ ], - "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ], + "tools": [ [ [ "oxy_torch", 30 ], [ "toolset", 225 ], [ "welder", 150 ], [ "welder_crude", 225 ] ] ], + "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ] ], "components": [ [ [ "2x4", 6 ] ], - [ [ "wood_sheet", 2 ], [ "wood_panel", 4 ] ], [ [ "nail", 40 ] ], [ [ "pipe", 24 ] ], [ [ "sheet_metal", 6 ] ], - [ [ "sheet_metal_small", 12 ] ] + [ [ "sheet_metal_small", 12 ] ], + [ [ "wood_panel", 4 ], [ "wood_sheet", 2 ] ] ] } } 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 058793efe6459..33dd0ad456761 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 @@ -18,15 +18,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 560 ] ], - [ [ "glass_sheet", 2 ] ], - [ [ "log", 36 ] ], - [ [ "stick", 54 ], [ "2x4", 108 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ] - ] + "components": [ [ [ "2x4", 338 ] ], [ [ "glass_sheet", 2 ] ], [ [ "log", 36 ] ], [ [ "nail", 560 ] ], [ [ "wood_panel", 25 ] ] ] } } }, @@ -112,12 +104,11 @@ "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 200 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 7 ] ], - [ [ "nail", 372 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], [ [ "glass_sheet", 2 ] ], [ [ "log", 16 ] ], - [ [ "wood_panel", 12 ] ] + [ [ "nail", 372 ] ], + [ [ "wood_panel", 19 ] ] ] } } @@ -141,20 +132,24 @@ "time": "1 d 4 h 10 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "qualities": [ + [ { "id": "DIG", "level": 2 } ], + [ { "id": "GLARE", "level": 2 } ], + [ { "id": "HAMMER", "level": 2 } ], + [ { "id": "SAW_W", "level": 2 } ] + ], "components": [ [ [ "2x4", 168 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], + [ [ "clay_lump", 12 ], [ "material_cement", 50 ], [ "mortar_build", 1 ] ], + [ [ "log", 12 ] ], [ [ "nail", 380 ] ], [ [ "pipe", 16 ] ], + [ [ "rock", 40 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 40 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], - [ [ "log", 12 ] ], - [ [ "wood_panel", 15 ] ] + [ [ "wood_panel", 23 ] ] ] } } @@ -211,16 +206,15 @@ "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "metal_tank", 2 ] ], - [ [ "water_faucet", 2 ] ], + [ [ "2x4", 472 ] ], [ [ "anvil", 1 ] ], [ [ "chain", 4 ] ], - [ [ "pipe", 3 ] ], [ [ "log", 40 ] ], - [ [ "stick", 60 ], [ "2x4", 120 ] ], - [ [ "wood_panel", 44 ] ], - [ [ "2x4", 352 ] ], - [ [ "nail", 880 ] ] + [ [ "metal_tank", 2 ] ], + [ [ "nail", 880 ] ], + [ [ "pipe", 3 ] ], + [ [ "water_faucet", 2 ] ], + [ [ "wood_panel", 44 ] ] ] } } 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 31f07f567b31f..452e2c6323bc8 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,15 +16,14 @@ "time": "2 d 7 h 30 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 180 ], [ "welder", 900 ], [ "welder_crude", 1350 ], [ "toolset", 1350 ] ] ], + "tools": [ [ [ "oxy_torch", 180 ], [ "toolset", 1350 ], [ "welder", 900 ], [ "welder_crude", 1350 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 560 ] ], + [ [ "2x4", 230 ] ], [ [ "glass_sheet", 2 ] ], + [ [ "nail", 560 ] ], [ [ "steel_plate", 36 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ] + [ [ "wood_panel", 25 ] ] ] } } @@ -122,7 +121,7 @@ "time": "1 d 6 h 45 m", "skills": [ [ "fabrication", 4 ], [ "tailor", 3 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 80 ], [ "welder", 400 ], [ "welder_crude", 600 ], [ "toolset", 600 ] ] ], + "tools": [ [ [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ], [ "welder_crude", 600 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], @@ -131,14 +130,13 @@ ], "components": [ [ [ "2x4", 146 ] ], - [ [ "wood_sheet", 2 ], [ "wood_panel", 3 ] ], + [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], + [ [ "glass_sheet", 2 ] ], [ [ "nail", 332 ] ], [ [ "pipe", 12 ] ], [ [ "sheet_metal", 2 ] ], - [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], - [ [ "glass_sheet", 2 ] ], [ [ "steel_plate", 16 ] ], - [ [ "wood_panel", 12 ] ] + [ [ "wood_panel", 15 ] ] ] } } @@ -162,7 +160,7 @@ "time": "1 d 6 h 30 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ [ [ "oxy_torch", 60 ], [ "welder", 300 ], [ "welder_crude", 450 ], [ "toolset", 450 ] ] ], + "tools": [ [ [ "oxy_torch", 80 ], [ "toolset", 600 ], [ "welder", 400 ], [ "welder_crude", 600 ] ] ], "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], @@ -170,16 +168,16 @@ [ { "id": "WRENCH" } ] ], "components": [ + [ [ "2x4", 120 ] ], + [ [ "clay_lump", 12 ], [ "material_cement", 50 ], [ "mortar_build", 1 ] ], + [ [ "nail", 300 ] ], [ [ "pipe", 40 ] ], + [ [ "rock", 40 ] ], [ [ "sheet_metal", 8 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 40 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], - [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "steel_plate", 12 ] ], - [ [ "wood_panel", 15 ] ], - [ [ "2x4", 120 ] ], - [ [ "nail", 300 ] ] + [ [ "water", 2 ], [ "water_clean", 2 ] ], + [ [ "wood_panel", 15 ] ] ] } } 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 7907057ad4568..c067fd9d7576c 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 @@ -118,19 +118,19 @@ "time": "1 d 7 h 10 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ ], - "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ], [ { "id": "SMOOTH" } ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W" } ], [ { "id": "SMOOTH" } ] ], "components": [ [ [ "2x4", 12 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], + [ [ "alien_pod_resin", 36 ] ], + [ [ "clay_lump", 12 ], [ "material_cement", 50 ], [ "mortar_build", 1 ] ], [ [ "nail", 80 ] ], [ [ "pipe", 16 ] ], + [ [ "rock", 40 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 40 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], - [ [ "alien_pod_resin", 36 ] ] + [ [ "wood_panel", 8 ], [ "wood_sheet", 4 ] ] ] } } 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 1c7c1c1bc991b..ab5f8a13d4624 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 @@ -19,14 +19,13 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 18 ], [ "spear_wood", 18 ] ], + [ [ "2x4", 230 ] ], + [ [ "concrete", 9 ], [ "material_quicklime", 180 ], [ "material_sand", 180 ] ], [ [ "material_soil", 2160 ] ], - [ [ "water", 900 ], [ "water_clean", 900 ] ], - [ [ "material_sand", 180 ], [ "material_quicklime", 180 ], [ "concrete", 9 ] ], - [ [ "2x4", 30 ], [ "log", 4 ] ], [ [ "nail", 560 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ] + [ [ "pointy_stick", 18 ], [ "spear_wood", 18 ] ], + [ [ "water", 900 ], [ "water_clean", 900 ] ], + [ [ "wood_panel", 25 ] ] ] } } @@ -57,14 +56,13 @@ ], "components": [ [ [ "2x4", 135 ] ], + [ [ "concrete", 6 ], [ "material_quicklime", 120 ], [ "material_sand", 120 ] ], + [ [ "material_soil", 1440 ] ], [ [ "nail", 382 ] ], [ [ "pointy_stick", 12 ], [ "spear_wood", 12 ] ], - [ [ "wood_sheet", 6 ], [ "wood_panel", 12 ] ], - [ [ "material_soil", 1440 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 600 ], [ "water_clean", 600 ] ], - [ [ "material_sand", 120 ], [ "material_quicklime", 120 ], [ "concrete", 6 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 10 ] ] + [ [ "wood_panel", 22 ] ] ] } } @@ -95,15 +93,14 @@ ], "components": [ [ [ "2x4", 285 ] ], + [ [ "concrete", 4 ], [ "material_quicklime", 80 ], [ "material_sand", 80 ] ], + [ [ "material_soil", 960 ] ], [ [ "nail", 734 ] ], [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], [ [ "rock", 40 ] ], - [ [ "material_soil", 960 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 400 ], [ "water_clean", 400 ] ], - [ [ "material_sand", 80 ], [ "material_quicklime", 80 ], [ "concrete", 4 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 30 ] ] + [ [ "wood_panel", 38 ] ] ] } } @@ -128,15 +125,14 @@ "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], [ [ "2x4", 152 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 7 ] ], - [ [ "nail", 372 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], + [ [ "concrete", 4 ], [ "material_quicklime", 80 ], [ "material_sand", 80 ] ], [ [ "material_soil", 960 ] ], + [ [ "nail", 372 ] ], + [ [ "pointy_stick", 8 ], [ "spear_wood", 8 ] ], [ [ "water", 400 ], [ "water_clean", 400 ] ], - [ [ "material_sand", 80 ], [ "material_quicklime", 80 ], [ "concrete", 4 ] ], - [ [ "wood_panel", 12 ] ] + [ [ "wood_panel", 19 ] ] ] } } @@ -160,22 +156,30 @@ "time": "1 d 16 h 55 m", "skills": [ [ "fabrication", 4 ], [ "survival", 2 ] ], "inline": { - "tools": [ [ [ "frame_wood_light", -1 ] ], [ [ "log", -1 ] ] ], - "qualities": [ [ { "id": "DIG", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], + "tools": [ + [ [ "frame_wood_light", -1 ] ], + [ [ "log", -1 ] ], + [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] + ], + "qualities": [ + [ { "id": "DIG", "level": 2 } ], + [ { "id": "GLARE", "level": 2 } ], + [ { "id": "HAMMER", "level": 2 } ], + [ { "id": "SAW_W", "level": 2 } ] + ], "components": [ - [ [ "pointy_stick", 6 ], [ "spear_wood", 6 ] ], [ [ "2x4", 132 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], + [ [ "clay_lump", 12 ], [ "material_cement", 50 ], [ "mortar_build", 1 ] ], + [ [ "concrete", 3 ], [ "material_quicklime", 60 ], [ "material_sand", 60 ] ], + [ [ "material_soil", 720 ] ], [ [ "nail", 380 ] ], [ [ "pipe", 16 ] ], + [ [ "pointy_stick", 6 ], [ "spear_wood", 6 ] ], + [ [ "rock", 40 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 40 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], [ [ "water", 302 ], [ "water_clean", 302 ] ], - [ [ "material_soil", 720 ] ], - [ [ "material_sand", 60 ], [ "material_quicklime", 60 ], [ "concrete", 3 ] ], - [ [ "wood_panel", 15 ] ] + [ [ "wood_panel", 23 ] ] ] } } @@ -198,9 +202,15 @@ "skills": [ [ "fabrication", 3 ], [ "survival", 2 ] ], "inline": { "tools": [ - [ [ "machete", -1 ], [ "makeshift_machete", -1 ], [ "scythe", -1 ], [ "sickle", -1 ], [ "survivor_machete", -1 ] ], [ [ "frame_wood_light", -1 ] ], - [ [ "log", -1 ] ] + [ [ "log", -1 ] ], + [ + [ "machete", -1 ], + [ "makeshift_machete", -1 ], + [ "scythe", -1 ], + [ "sickle", -1 ], + [ "survivor_machete", -1 ] + ] ], "qualities": [ [ { "id": "CUT" } ], @@ -210,14 +220,13 @@ ], "components": [ [ [ "2x4", 170 ] ], + [ [ "concrete", 11 ], [ "material_quicklime", 220 ], [ "material_sand", 220 ] ], + [ [ "material_soil", 2640 ] ], [ [ "nail", 514 ] ], [ [ "pointy_stick", 22 ], [ "spear_wood", 22 ] ], - [ [ "wood_sheet", 10 ], [ "wood_panel", 20 ] ], - [ [ "material_soil", 2640 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 1100 ], [ "water_clean", 1100 ] ], - [ [ "material_sand", 220 ], [ "material_quicklime", 220 ], [ "concrete", 11 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 10 ] ] + [ [ "wood_panel", 30 ] ] ] } } 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 9f7376504a055..f1e80bdf60f41 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 @@ -19,14 +19,13 @@ "tools": [ ], "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "2x4", 100 ], [ "stick", 200 ] ], - [ [ "material_quicklime", 80 ], [ "material_limestone", 80 ], [ "clay_lump", 80 ] ], - [ [ "pebble", 200 ], [ "material_sand", 200 ] ], - [ [ "straw_pile", 80 ], [ "cattail_stalk", 80 ], [ "dogbane", 80 ], [ "pine_bough", 80 ] ], + [ [ "2x4", 300 ] ], + [ [ "cattail_stalk", 80 ], [ "dogbane", 80 ], [ "pine_bough", 80 ], [ "straw_pile", 80 ] ], + [ [ "clay_lump", 80 ], [ "material_limestone", 80 ], [ "material_quicklime", 80 ] ], + [ [ "material_sand", 200 ], [ "pebble", 200 ] ], + [ [ "nail", 500 ] ], [ [ "water", 100 ], [ "water_clean", 100 ] ], - [ [ "wood_panel", 25 ] ], - [ [ "2x4", 200 ] ], - [ [ "nail", 500 ] ] + [ [ "wood_panel", 25 ] ] ] } } @@ -52,14 +51,13 @@ "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 185 ] ], + [ [ "cattail_stalk", 52 ], [ "dogbane", 52 ], [ "pine_bough", 52 ], [ "straw_pile", 52 ] ], + [ [ "clay_lump", 52 ], [ "material_limestone", 52 ], [ "material_quicklime", 52 ] ], + [ [ "material_sand", 130 ], [ "pebble", 130 ] ], [ [ "nail", 352 ] ], - [ [ "wood_sheet", 6 ], [ "wood_panel", 12 ] ], - [ [ "material_quicklime", 52 ], [ "material_limestone", 52 ], [ "clay_lump", 52 ] ], - [ [ "pebble", 130 ], [ "material_sand", 130 ] ], - [ [ "straw_pile", 52 ], [ "cattail_stalk", 52 ], [ "dogbane", 52 ], [ "pine_bough", 52 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 65 ], [ "water_clean", 65 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 10 ] ] + [ [ "wood_panel", 22 ] ] ] } } @@ -90,15 +88,14 @@ ], "components": [ [ [ "2x4", 315 ] ], + [ [ "cattail_stalk", 36 ], [ "dogbane", 36 ], [ "pine_bough", 36 ], [ "straw_pile", 36 ] ], + [ [ "clay_lump", 36 ], [ "material_limestone", 36 ], [ "material_quicklime", 36 ] ], + [ [ "material_sand", 90 ], [ "pebble", 90 ] ], [ [ "nail", 704 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], [ [ "rock", 40 ] ], - [ [ "material_quicklime", 36 ], [ "material_limestone", 36 ], [ "clay_lump", 36 ] ], - [ [ "pebble", 90 ], [ "material_sand", 90 ] ], - [ [ "straw_pile", 36 ], [ "cattail_stalk", 36 ], [ "dogbane", 36 ], [ "pine_bough", 36 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 45 ], [ "water_clean", 45 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 30 ] ] + [ [ "wood_panel", 38 ] ] ] } } @@ -124,14 +121,13 @@ "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 172 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 7 ] ], - [ [ "nail", 312 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], - [ [ "material_quicklime", 40 ], [ "material_limestone", 40 ], [ "clay_lump", 40 ] ], - [ [ "pebble", 100 ], [ "material_sand", 100 ] ], - [ [ "straw_pile", 40 ], [ "cattail_stalk", 40 ], [ "dogbane", 40 ], [ "pine_bough", 40 ] ], + [ [ "cattail_stalk", 40 ], [ "dogbane", 40 ], [ "pine_bough", 40 ], [ "straw_pile", 40 ] ], + [ [ "clay_lump", 40 ], [ "material_limestone", 40 ], [ "material_quicklime", 40 ] ], + [ [ "material_sand", 100 ], [ "pebble", 100 ] ], + [ [ "nail", 312 ] ], [ [ "water", 50 ], [ "water_clean", 50 ] ], - [ [ "wood_panel", 12 ] ] + [ [ "wood_panel", 19 ] ] ] } } @@ -155,22 +151,26 @@ "time": "1 d 3 h 10 m", "skills": [ [ "fabrication", 4 ], [ "survival", 3 ] ], "inline": { - "tools": [ ], - "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "qualities": [ + [ { "id": "CUT" } ], + [ { "id": "GLARE", "level": 2 } ], + [ { "id": "HAMMER", "level": 2 } ], + [ { "id": "SAW_W", "level": 2 } ] + ], "components": [ [ [ "2x4", 162 ] ], - [ [ "wood_sheet", 4 ], [ "wood_panel", 8 ] ], + [ [ "cattail_stalk", 24 ], [ "dogbane", 24 ], [ "pine_bough", 24 ], [ "straw_pile", 24 ] ], + [ [ "clay_lump", 12 ], [ "material_cement", 50 ], [ "mortar_build", 1 ] ], + [ [ "clay_lump", 24 ], [ "material_limestone", 24 ], [ "material_quicklime", 24 ] ], + [ [ "material_sand", 60 ], [ "pebble", 60 ] ], [ [ "nail", 380 ] ], [ [ "pipe", 16 ] ], + [ [ "rock", 40 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 40 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], [ [ "water", 32 ], [ "water_clean", 32 ] ], - [ [ "material_quicklime", 24 ], [ "material_limestone", 24 ], [ "clay_lump", 24 ] ], - [ [ "pebble", 60 ], [ "material_sand", 60 ] ], - [ [ "straw_pile", 24 ], [ "cattail_stalk", 24 ], [ "dogbane", 24 ], [ "pine_bough", 24 ] ], - [ [ "wood_panel", 15 ] ] + [ [ "wood_panel", 23 ] ] ] } } @@ -196,14 +196,13 @@ "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 260 ] ], + [ [ "cattail_stalk", 96 ], [ "dogbane", 96 ], [ "pine_bough", 96 ], [ "straw_pile", 96 ] ], + [ [ "clay_lump", 96 ], [ "material_limestone", 96 ], [ "material_quicklime", 96 ] ], + [ [ "material_sand", 240 ], [ "pebble", 240 ] ], [ [ "nail", 454 ] ], - [ [ "wood_sheet", 10 ], [ "wood_panel", 20 ] ], - [ [ "material_quicklime", 96 ], [ "material_limestone", 96 ], [ "clay_lump", 96 ] ], - [ [ "pebble", 240 ], [ "material_sand", 240 ] ], - [ [ "straw_pile", 96 ], [ "cattail_stalk", 96 ], [ "dogbane", 96 ], [ "pine_bough", 96 ] ], + [ [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ] ], [ [ "water", 120 ], [ "water_clean", 120 ] ], - [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ], - [ [ "wood_panel", 10 ] ] + [ [ "wood_panel", 30 ] ] ] } } @@ -230,19 +229,18 @@ "tools": [ ], "qualities": [ [ { "id": "CUT" } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "metal_tank", 2 ] ], - [ [ "water_faucet", 2 ] ], + [ [ "2x4", 452 ] ], [ [ "anvil", 1 ] ], + [ [ "cattail_stalk", 80 ], [ "dogbane", 80 ], [ "pine_bough", 80 ], [ "straw_pile", 80 ] ], [ [ "chain", 4 ] ], + [ [ "clay_lump", 80 ], [ "material_limestone", 80 ], [ "material_quicklime", 80 ] ], + [ [ "material_sand", 200 ], [ "pebble", 200 ] ], + [ [ "metal_tank", 2 ] ], + [ [ "nail", 880 ] ], [ [ "pipe", 3 ] ], - [ [ "2x4", 100 ], [ "stick", 200 ] ], - [ [ "material_quicklime", 80 ], [ "material_limestone", 80 ], [ "clay_lump", 80 ] ], - [ [ "pebble", 200 ], [ "material_sand", 200 ] ], - [ [ "straw_pile", 80 ], [ "cattail_stalk", 80 ], [ "dogbane", 80 ], [ "pine_bough", 80 ] ], [ [ "water", 100 ], [ "water_clean", 100 ] ], - [ [ "wood_panel", 44 ] ], - [ [ "2x4", 352 ] ], - [ [ "nail", 880 ] ] + [ [ "water_faucet", 2 ] ], + [ [ "wood_panel", 44 ] ] ] } } 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 950d3921cec32..44588e7d0ccfe 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 @@ -33,14 +33,7 @@ "inline": { "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], - "components": [ - [ [ "2x4", 30 ], [ "log", 4 ] ], - [ [ "nail", 920 ] ], - [ [ "glass_sheet", 2 ] ], - [ [ "2x4", 290 ] ], - [ [ "wood_sheet", 9 ], [ "wood_panel", 18 ] ], - [ [ "wood_panel", 25 ] ] - ] + "components": [ [ [ "2x4", 320 ] ], [ [ "glass_sheet", 2 ] ], [ [ "nail", 920 ] ], [ [ "wood_panel", 43 ] ] ] } } }, @@ -118,11 +111,10 @@ "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 192 ] ], - [ [ "wood_sheet", 8 ], [ "wood_panel", 15 ] ], - [ [ "nail", 532 ] ], [ [ "blanket", 1 ], [ "down_blanket", 1 ], [ "fur_blanket", 1 ] ], [ [ "glass_sheet", 2 ] ], - [ [ "wood_panel", 12 ] ] + [ [ "nail", 532 ] ], + [ [ "wood_panel", 27 ] ] ] } } @@ -146,19 +138,18 @@ "time": "1 d 2 h 10 m", "skills": [ [ "fabrication", 4 ] ], "inline": { - "tools": [ ], - "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], + "tools": [ [ [ "oxy_torch", 20 ], [ "toolset", 150 ], [ "welder", 100 ], [ "welder_crude", 150 ] ] ], + "qualities": [ [ { "id": "GLARE", "level": 2 } ], [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ [ [ "2x4", 162 ] ], - [ [ "wood_sheet", 7 ], [ "wood_panel", 14 ] ], + [ [ "clay_lump", 12 ], [ "material_cement", 50 ], [ "mortar_build", 1 ] ], [ [ "nail", 500 ] ], [ [ "pipe", 16 ] ], + [ [ "rock", 40 ] ], [ [ "sheet_metal", 4 ] ], [ [ "sheet_metal_small", 8 ] ], - [ [ "rock", 40 ] ], - [ [ "material_cement", 50 ], [ "mortar_build", 1 ], [ "clay_lump", 12 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], - [ [ "wood_panel", 15 ] ] + [ [ "wood_panel", 29 ] ] ] } } @@ -208,15 +199,14 @@ "tools": [ ], "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], "components": [ - [ [ "metal_tank", 2 ] ], - [ [ "water_faucet", 2 ] ], + [ [ "2x4", 452 ] ], [ [ "anvil", 1 ] ], [ [ "chain", 4 ] ], - [ [ "pipe", 3 ] ], - [ [ "2x4", 452 ] ], + [ [ "metal_tank", 2 ] ], [ [ "nail", 1280 ] ], - [ [ "wood_sheet", 10 ], [ "wood_panel", 20 ] ], - [ [ "wood_panel", 44 ] ] + [ [ "pipe", 3 ] ], + [ [ "water_faucet", 2 ] ], + [ [ "wood_panel", 64 ] ] ] } } diff --git a/src/requirements.cpp b/src/requirements.cpp index 65f13e0ef78d1..dd3cd3e8359c1 100644 --- a/src/requirements.cpp +++ b/src/requirements.cpp @@ -1087,98 +1087,130 @@ requirement_data requirement_data::continue_requirements( const std::vector +static std::vector> consolidate( std::vector> old_vec, + const Accum &accum ) { - std::map all_quals; - for( const std::vector &qual_vector : qualities ) { - for( const quality_requirement &qual_data : qual_vector ) { - if( all_quals.find( qual_data.type ) == all_quals.end() ) { - all_quals[qual_data.type] = qual_data; - } else { - all_quals[qual_data.type].count = std::max( all_quals[qual_data.type].count, - qual_data.count ); - all_quals[qual_data.type].level = std::max( all_quals[qual_data.type].level, - qual_data.level ); - } - } - } - qualities.clear(); - std::transform( all_quals.begin(), all_quals.end(), std::back_inserter( qualities ), - []( auto & qual_data ) { - return std::vector( { qual_data.second } ); + const auto type_lt = []( const T & lhs, const T & rhs ) -> bool { + return std::forward_as_tuple( lhs.type, lhs.requirement ) + < std::forward_as_tuple( rhs.type, rhs.requirement ); + }; + // in order to simplify blueprint requirements, we merge a longer requirement + // list into a shorter requirement list whose types are a subsequence of the + // longer list's types. However, this operation is not symmetric and depends + // on the order of the requirement lists. Thus we sort the lists first, to + // ensure consistent results when the order of construction requirements changes. + for( std::vector &old_inner : old_vec ) { + std::sort( old_inner.begin(), old_inner.end(), type_lt ); + } + std::sort( old_vec.begin(), old_vec.end(), + [&type_lt]( const std::vector &lhs, const std::vector &rhs ) -> bool { + return std::lexicographical_compare( lhs.begin(), lhs.end(), rhs.begin(), rhs.end(), + type_lt ); } ); - // elegance? I've heard of it - std::vector> all_tools; - for( const std::vector &old_tool_vector : tools ) { + std::vector> new_vec; + for( std::vector &old_inner : old_vec ) { bool match = false; - for( std::vector &con_tool_vector : all_tools ) { - size_t need_matches = con_tool_vector.size(); - size_t has_matches = 0; - for( const tool_comp &old_tool : old_tool_vector ) { - for( const tool_comp &con_tool : con_tool_vector ) { - if( old_tool.type == con_tool.type ) { - has_matches += 1; - break; - } - } - } - if( has_matches == need_matches ) { + for( std::vector &new_inner : new_vec ) { + // in order to simplify blueprint requirements, we merge a longer + // requirement list into a shorter requirement list whose types are + // a subsequence of the longer list's types. + // + // note this actually may make a requirement stricter. + // for example, if the item requirement was + // [ [ [ "a", 1 ], [ "b", 1 ], [ "c", 1 ] ], + // [ [ "a", 1 ], [ "b", 1 ] ] ] + // then you could satisfy it by having one "a" and one "b", one + // "c" and one "a", two "a", or two "b", etc. + // + // but after consolidation, it becomes + // [ [ [ "a", 2 ], [ "b", 2 ] ] ] + // then you can only satisfy it by having either 2 "a" or 2 "b" + if( std::includes( new_inner.begin(), new_inner.end(), + old_inner.begin(), old_inner.end(), + type_lt ) ) { + // old_inner is a subsequence of new_inner + match = true; + std::swap( old_inner, new_inner ); + } else if( std::includes( old_inner.begin(), old_inner.end(), + new_inner.begin(), new_inner.end(), + type_lt ) ) { + // new_inner is a subsequence of old_inner match = true; - for( const tool_comp &old_tool : old_tool_vector ) { - for( tool_comp &con_tool : con_tool_vector ) { - if( old_tool.type == con_tool.type ) { - con_tool.count += old_tool.count; - break; - } + } + if( match ) { + for( auto it1 = new_inner.begin(), it2 = old_inner.begin(); + it1 < new_inner.end(); ++it2 ) { + if( !type_lt( *it2, *it1 ) ) { + // which means *it2 and *it1 have the same type, since + // we know new_inner is a subsequence of old_inner + *it1 = accum( *it1, *it2 ); + ++it1; } } break; } } if( !match ) { - all_tools.emplace_back( old_tool_vector ); + new_vec.emplace_back( old_inner ); } } - tools = std::move( all_tools ); + return new_vec; +} - std::vector> all_comps; - for( const std::vector &old_item_vector : components ) { - bool match = false; - for( auto &con_item_vector : all_comps ) { - size_t need_matches = con_item_vector.size(); - size_t has_matches = 0; - for( const item_comp &old_item : old_item_vector ) { - for( const item_comp &con_item : con_item_vector ) { - if( old_item.type == con_item.type ) { - has_matches += 1; - break; - } - } - } - if( has_matches == need_matches ) { - match = true; - for( const item_comp &old_item : old_item_vector ) { - for( item_comp &con_item : con_item_vector ) { - if( old_item.type == con_item.type ) { - con_item.count += old_item.count; - break; - } - } - } - break; - } - } - if( !match ) { - all_comps.emplace_back( old_item_vector ); +void requirement_data::consolidate() +{ + qualities = ::consolidate( qualities, + []( const quality_requirement & lhs, const quality_requirement & rhs ) { + quality_requirement ret = lhs; + ret.count = std::max( ret.count, rhs.count ); + ret.level = std::max( ret.level, rhs.level ); + return ret; + } ); + + tools = ::consolidate( tools, + []( const tool_comp & lhs, const tool_comp & rhs ) { + tool_comp ret = lhs; + if( ret.count < 0 && rhs.count < 0 ) { + ret.count = std::min( ret.count, rhs.count ); + } else if( ret.count > 0 && rhs.count > 0 ) { + ret.count += rhs.count; + } else { + debugmsg( "required counts of the same tool have different signs" ); } + return ret; + } ); + + components = ::consolidate( components, + []( const item_comp & lhs, const item_comp & rhs ) { + item_comp ret = lhs; + ret.count += rhs.count; + return ret; + } ); +} + +template +static bool sorted_equal( std::vector> lhs, std::vector> rhs ) +{ + if( lhs.size() != rhs.size() ) { + return false; + } + for( auto &inner : lhs ) { + std::sort( inner.begin(), inner.end() ); + } + for( auto &inner : rhs ) { + std::sort( inner.begin(), inner.end() ); } - components = std::move( all_comps ); + std::sort( lhs.begin(), lhs.end() ); + std::sort( rhs.begin(), rhs.end() ); + return lhs == rhs; } bool requirement_data::has_same_requirements_as( const requirement_data &that ) const { - return tools == that.tools && qualities == that.qualities && components == that.components; + return sorted_equal( tools, that.tools ) && sorted_equal( qualities, that.qualities ) + && sorted_equal( components, that.components ); } template diff --git a/src/requirements.h b/src/requirements.h index 7c94afa674a0e..a9fccc5554c9e 100644 --- a/src/requirements.h +++ b/src/requirements.h @@ -64,12 +64,17 @@ struct component { // needs explicit specification due to the mutable member. update this when you add new // members! bool operator==( const component &rhs ) const { - return type == rhs.type && count == rhs.count && recoverable == rhs.recoverable - && requirement == rhs.requirement; + return std::forward_as_tuple( type, requirement, count, recoverable ) + == std::forward_as_tuple( rhs.type, rhs.requirement, rhs.count, rhs.recoverable ); } bool operator!=( const component &rhs ) const { return !operator==( rhs ); } + // lexicographic comparison + bool operator<( const component &rhs ) const { + return std::forward_as_tuple( type, requirement, count, recoverable ) + < std::forward_as_tuple( rhs.type, rhs.requirement, rhs.count, rhs.recoverable ); + } component() = default; component( const itype_id &TYPE, int COUNT ) : type( TYPE ), count( COUNT ) { } @@ -123,12 +128,17 @@ struct quality_requirement { // needs explicit specification due to the mutable member. update this when you add new // members! bool operator==( const quality_requirement &rhs ) const { - return type == rhs.type && count == rhs.count && level == rhs.level - && requirement == rhs.requirement; + return std::forward_as_tuple( type, requirement, count, level ) + == std::forward_as_tuple( rhs.type, rhs.requirement, rhs.count, rhs.level ); } bool operator!=( const quality_requirement &rhs ) const { return !operator==( rhs ); } + // lexicographic comparison + bool operator<( const quality_requirement &rhs ) const { + return std::forward_as_tuple( type, requirement, count, level ) + < std::forward_as_tuple( rhs.type, rhs.requirement, rhs.count, rhs.level ); + } quality_requirement() = default; quality_requirement( const quality_id &TYPE, int COUNT, int LEVEL ) : type( TYPE ), count( COUNT ), @@ -328,15 +338,14 @@ struct requirement_data { const std::list &remaining_comps ); /** - * Removes duplicated qualities and tools, and merge similar component lists. - * This actually changes the exact meaning of the requirement. + * Merge similar quality/tool/component lists. + * This simplifies the requirement but may make the requirement stricter. */ void consolidate(); /** * Compares if two requiremen_data are the same, but does not compare the requirement ids. - * - * TODO: sort and compare + * The order inside requirement vectors does not matter. */ bool has_same_requirements_as( const requirement_data &that ) const;