From 3ff69d9cc17cd74603aba7bf33ed210396e332e8 Mon Sep 17 00:00:00 2001 From: krulunio Date: Wed, 9 Jun 2021 17:29:39 +0200 Subject: [PATCH 1/6] Add mansion basecamp Adds mansion basecamp (4 variants) and mansion expansions, which are simple and sometimes useless. Upgrade paths are short, because: 1. mansions are already built, not much to add to them 2. I don't know how to properly make expansions on rotatable terrain --- .../fbmc_mansion/fbmc_mansion_+1.json | 62 +++++ .../fbmc_mansion/fbmc_mansion_+2.json | 19 ++ .../fbmc_mansion/fbmc_mansion_+3.json | 19 ++ .../fbmc_mansion/fbmc_mansion_+4.json | 49 ++++ .../fbmc_mansion/fbmc_mansion_common.json | 34 +++ .../fbmc_mansion/fbmc_mansion_expansion.json | 110 ++++++++ .../fbmc_mansion/fbmc_mansion_overmap.json | 86 +++++++ .../overmap_terrain_faction_base.json | 112 +++++++++ .../fbmc_mansion/fbmc_mansion_+1.json | 92 +++++++ .../fbmc_mansion/fbmc_mansion_+2.json | 75 ++++++ .../fbmc_mansion/fbmc_mansion_+3.json | 75 ++++++ .../fbmc_mansion/fbmc_mansion_+4.json | 92 +++++++ .../fbmc_mansion_expansion_surveys.json | 236 ++++++++++++++++++ .../json/recipes/basecamps/recipe_groups.json | 36 ++- 14 files changed, 1096 insertions(+), 1 deletion(-) create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_expansion.json create mode 100644 data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_overmap.json create mode 100644 data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+1.json create mode 100644 data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+2.json create mode 100644 data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+3.json create mode 100644 data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+4.json create mode 100644 data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json new file mode 100644 index 0000000000000..aa4513225b6fe --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+1.json @@ -0,0 +1,62 @@ +[ + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+1", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 9, "y": 9 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+1_radio", + "method": "json", + "object": { + "set": [ + { "point": "terrain", "id": "t_radio_tower", "x": 8, "y": 9 }, + { "point": "terrain", "id": "t_radio_controls", "x": 8, "y": 10 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_mansion_+1_prefarm", + "object": { + "mapgensize": [ 12, 12 ], + "rows": [ + "dddd dddd", + "d d", + "d d", + "d d", + " ", + " ", + " ", + " ", + "d d", + "d d", + "d d", + "dddd dddd" + ], + "terrain": { "d": "t_dirt" } + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+1_farm", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "fbmc_mansion_+1_prefarm" ], "x": 6, "y": 6 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 6, "y": 5 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 13, "y": 5 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 1, "y": 17 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 6, "y": 17 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 1, "y": 20 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 6, "y": 20 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 13, "y": 17 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 18, "y": 17 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 13, "y": 20 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 18, "y": 20 } + ] + } + } +] diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json new file mode 100644 index 0000000000000..765c603dd88ea --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+2.json @@ -0,0 +1,19 @@ +[ + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+2", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 18, "y": 6 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+2_radio", + "method": "json", + "object": { + "set": [ + { "point": "terrain", "id": "t_radio_tower", "x": 12, "y": 0 }, + { "point": "terrain", "id": "t_radio_controls", "x": 12, "y": 1 } + ] + } + } +] diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json new file mode 100644 index 0000000000000..a74f6acd8f4ff --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+3.json @@ -0,0 +1,19 @@ +[ + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+3", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 17, "y": 20 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+3_radio", + "method": "json", + "object": { + "set": [ + { "point": "terrain", "id": "t_radio_tower", "x": 6, "y": 0 }, + { "point": "terrain", "id": "t_radio_controls", "x": 6, "y": 1 } + ] + } + } +] diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json new file mode 100644 index 0000000000000..1ce3050d2a783 --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_+4.json @@ -0,0 +1,49 @@ +[ + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+4", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_bulletin", "x": 9, "y": 2 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+4_radio", + "method": "json", + "object": { + "set": [ + { "point": "terrain", "id": "t_radio_tower", "x": 9, "y": 0 }, + { "point": "terrain", "id": "t_radio_controls", "x": 9, "y": 1 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_mansion_+4_prefarm", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "dddddd", + "dddddd", + "dddddd", + "dddddd", + " ", + " " + ], + "terrain": { "d": "t_dirt" } + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_mansion_+4_farm", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "fbmc_mansion_+4_prefarm" ], "x": 4, "y": 10 }, + { "chunks": [ "fbmc_mansion_+4_prefarm" ], "x": 14, "y": 10 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 4, "y": 11 }, + { "chunks": [ "fbmc_mansion_farm_field" ], "x": 15, "y": 11 } + ] + } + } +] diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json new file mode 100644 index 0000000000000..9e20a4e62d5b9 --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_common.json @@ -0,0 +1,34 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_mansion_farm_field", + "object": { + "mapgensize": [ 5, 5 ], + "rows": [ + "fffff", + "fffff", + " ", + " ", + " " + ], + "terrain": { "f": "t_dirtmound" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_mansion_farm_field_thin", + "object": { + "mapgensize": [ 5, 5 ], + "rows": [ + "fffff", + " ", + " ", + " ", + " " + ], + "terrain": { "f": "t_dirtmound" } + } + } +] diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_expansion.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_expansion.json new file mode 100644 index 0000000000000..29334103aa596 --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_expansion.json @@ -0,0 +1,110 @@ +[ + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_e1", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_e2", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t1", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t2", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t3", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t4", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t5", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t6", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_t7", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_+1", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_+2", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_+3", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_+4", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_c1", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_c2", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_c3", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_c4", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_mansion_c5", + "method": "json", + "object": { "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } + } +] diff --git a/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_overmap.json b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_overmap.json new file mode 100644 index 0000000000000..967028dc4dc3b --- /dev/null +++ b/data/json/mapgen/basecamps/fbmc_mansion/fbmc_mansion_overmap.json @@ -0,0 +1,86 @@ +[ + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_e1" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_e2" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t1" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t2" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t3" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t4" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t5" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t6" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_t7" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_c1" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_c2" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_c3" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_c4" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + }, + { + "type": "mapgen", + "om_terrain": [ "faction_base_mansion_c5" ], + "method": "json", + "object": { "fill_ter": "t_dirt" } + } +] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json index aceb9c17e4519..9d285c8bb4b88 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json @@ -189,5 +189,117 @@ "name": "canteen survey", "color": "i_green", "delete": { "flags": [ "SOURCE_PEOPLE" ] } + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_e1", + "name": "mansion base entrance", + "sym": "M", + "color": "white", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_e2", + "name": "mansion base entrance", + "sym": "M", + "color": "white", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t1", + "name": "mansion base swimming pool", + "sym": "M", + "color": "blue", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t2", + "name": "mansion base bedrooms", + "sym": "M", + "color": "light_green", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t3", + "name": "mansion base???", + "sym": "M", + "color": "white", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t4", + "name": "mansion base kitchen", + "sym": "M", + "color": "pink", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t5", + "name": "mansion base library", + "sym": "M", + "color": "brown", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t6", + "name": "mansion base bedroom", + "sym": "M", + "color": "light_green", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_t7", + "name": "mansion base living rooms", + "sym": "M", + "color": "green", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_c1", + "name": "mansion base swimming pool", + "sym": "M", + "color": "blue", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_c2", + "name": "mansion base bar", + "sym": "M", + "color": "magenta", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_c3", + "name": "mansion base living rooms", + "sym": "M", + "color": "green", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_c4", + "name": "mansion base bedroom", + "sym": "M", + "color": "light_green", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_mansion_c5", + "name": "mansion base kitchen", + "sym": "M", + "color": "pink", + "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] } ] diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+1.json b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+1.json new file mode 100644 index 0000000000000..11e044bd65e94 --- /dev/null +++ b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+1.json @@ -0,0 +1,92 @@ +[ + { + "type": "recipe", + "result": "faction_base_mansion_+1_0", + "description": "We should survey the base site and set up a bulletin board.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "time": "1 h", + "construction_blueprint": "fbmc_mansion_+1", + "blueprint_provides": [ + { "id": "fbmc_mansion_+1" }, + { "id": "primitive_camp_recipes_1" }, + { "id": "gathering" }, + { "id": "firewood" }, + { "id": "foraging" }, + { "id": "sorting" }, + { "id": "logging" }, + { "id": "tool_storage" }, + { "id": "bed", "amount": 8 } + ], + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_name": "basic survey", + "check_blueprint_needs": false + }, + { + "type": "recipe", + "result": "faction_base_mansion_+1_garden", + "description": "Let's remove plants from garden and plow a few plots.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_mansion_+1_farm", + "blueprint_name": "prepare garden", + "blueprint_requires": [ { "id": "fbmc_mansion_+1" } ], + "blueprint_provides": [ { "id": "fbmc_mansion_+1_farm" }, { "id": "farming" }, { "id": "farm_recipes_1" } ], + "blueprint_excludes": [ { "id": "fbmc_mansion_+1_farm" } ], + "blueprint_needs": { "time": "7 h", "inline": { "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 1 } ] ] } }, + "check_blueprint_needs": false + }, + { + "type": "recipe", + "result": "faction_base_mansion_+1_radio", + "description": "Let's set up a radio tower to improve our recruitment efforts.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_mansion_+1_radio", + "blueprint_name": "build a radio tower and console", + "blueprint_requires": [ { "id": "fbmc_mansion_+1_farm" } ], + "blueprint_provides": [ { "id": "fbmc_mansion_+1_radio" }, { "id": "recruiting" }, { "id": "radio" } ], + "blueprint_excludes": [ { "id": "fbmc_mansion_+1_radio" } ], + "blueprint_needs": { + "time": "2 d", + "skills": [ [ "fabrication", 3 ] ], + "inline": { + "tools": [ ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SCREW" } ], [ { "id": "WRENCH" } ] ], + "components": [ + [ + [ "wind_turbine", 4 ], + [ "xl_wind_turbine", 1 ], + [ "solar_panel", 4 ], + [ "reinforced_solar_panel", 4 ], + [ "solar_panel_v2", 2 ], + [ "reinforced_solar_panel_v2", 2 ], + [ "solar_panel_v3", 1 ] + ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ], + [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "pipe", 24 ] ], + [ [ "processor", 2 ] ], + [ [ "RAM", 2 ] ], + [ [ "large_lcd_screen", 1 ] ], + [ [ "e_scrap", 8 ] ], + [ [ "frame", 1 ] ], + [ [ "circuit", 4 ] ], + [ [ "power_supply", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "cable", 80 ] ], + [ [ "motor_small", 1 ], [ "motor_tiny", 2 ] ] + ] + } + }, + "check_blueprint_needs": false + } +] diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+2.json b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+2.json new file mode 100644 index 0000000000000..7251239ab70c4 --- /dev/null +++ b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+2.json @@ -0,0 +1,75 @@ +[ + { + "type": "recipe", + "result": "faction_base_mansion_+2_0", + "description": "We should survey the base site and set up a bulletin board.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "time": "1 h", + "construction_blueprint": "fbmc_mansion_+2", + "blueprint_provides": [ + { "id": "fbmc_mansion_+2" }, + { "id": "primitive_camp_recipes_1" }, + { "id": "gathering" }, + { "id": "firewood" }, + { "id": "foraging" }, + { "id": "sorting" }, + { "id": "logging" }, + { "id": "tool_storage" }, + { "id": "bed", "amount": 8 } + ], + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_name": "basic survey", + "check_blueprint_needs": false + }, + { + "type": "recipe", + "result": "faction_base_mansion_+2_radio", + "description": "Let's set up a radio tower to improve our recruitment efforts.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_mansion_+2_radio", + "blueprint_name": "build a radio tower and console", + "blueprint_requires": [ { "id": "fbmc_mansion_+2" } ], + "blueprint_provides": [ { "id": "fbmc_mansion_+2_radio" }, { "id": "recruiting" }, { "id": "radio" } ], + "blueprint_excludes": [ { "id": "fbmc_mansion_+2_radio" } ], + "blueprint_needs": { + "time": "2 d", + "skills": [ [ "fabrication", 3 ] ], + "inline": { + "tools": [ ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SCREW" } ], [ { "id": "WRENCH" } ] ], + "components": [ + [ + [ "wind_turbine", 4 ], + [ "xl_wind_turbine", 1 ], + [ "solar_panel", 4 ], + [ "reinforced_solar_panel", 4 ], + [ "solar_panel_v2", 2 ], + [ "reinforced_solar_panel_v2", 2 ], + [ "solar_panel_v3", 1 ] + ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ], + [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "pipe", 24 ] ], + [ [ "processor", 2 ] ], + [ [ "RAM", 2 ] ], + [ [ "large_lcd_screen", 1 ] ], + [ [ "e_scrap", 8 ] ], + [ [ "frame", 1 ] ], + [ [ "circuit", 4 ] ], + [ [ "power_supply", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "cable", 80 ] ], + [ [ "motor_small", 1 ], [ "motor_tiny", 2 ] ] + ] + } + }, + "check_blueprint_needs": false + } +] diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+3.json b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+3.json new file mode 100644 index 0000000000000..5d0d7bbd9486d --- /dev/null +++ b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+3.json @@ -0,0 +1,75 @@ +[ + { + "type": "recipe", + "result": "faction_base_mansion_+3_0", + "description": "We should survey the base site and set up a bulletin board.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "time": "1 h", + "construction_blueprint": "fbmc_mansion_+3", + "blueprint_provides": [ + { "id": "fbmc_mansion_+3" }, + { "id": "primitive_camp_recipes_1" }, + { "id": "gathering" }, + { "id": "firewood" }, + { "id": "foraging" }, + { "id": "sorting" }, + { "id": "logging" }, + { "id": "tool_storage" }, + { "id": "bed", "amount": 8 } + ], + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_name": "basic survey", + "check_blueprint_needs": false + }, + { + "type": "recipe", + "result": "faction_base_mansion_+3_radio", + "description": "Let's set up a radio tower to improve our recruitment efforts.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_mansion_+3_radio", + "blueprint_name": "build a radio tower and console", + "blueprint_requires": [ { "id": "fbmc_mansion_+3" } ], + "blueprint_provides": [ { "id": "fbmc_mansion_+3_radio" }, { "id": "recruiting" }, { "id": "radio" } ], + "blueprint_excludes": [ { "id": "fbmc_mansion_+3_radio" } ], + "blueprint_needs": { + "time": "2 d", + "skills": [ [ "fabrication", 3 ] ], + "inline": { + "tools": [ ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SCREW" } ], [ { "id": "WRENCH" } ] ], + "components": [ + [ + [ "wind_turbine", 4 ], + [ "xl_wind_turbine", 1 ], + [ "solar_panel", 4 ], + [ "reinforced_solar_panel", 4 ], + [ "solar_panel_v2", 2 ], + [ "reinforced_solar_panel_v2", 2 ], + [ "solar_panel_v3", 1 ] + ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ], + [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "pipe", 24 ] ], + [ [ "processor", 2 ] ], + [ [ "RAM", 2 ] ], + [ [ "large_lcd_screen", 1 ] ], + [ [ "e_scrap", 8 ] ], + [ [ "frame", 1 ] ], + [ [ "circuit", 4 ] ], + [ [ "power_supply", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "cable", 80 ] ], + [ [ "motor_small", 1 ], [ "motor_tiny", 2 ] ] + ] + } + }, + "check_blueprint_needs": false + } +] diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+4.json b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+4.json new file mode 100644 index 0000000000000..815800604884f --- /dev/null +++ b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_+4.json @@ -0,0 +1,92 @@ +[ + { + "type": "recipe", + "result": "faction_base_mansion_+4_0", + "description": "We should survey the base site and set up a bulletin board.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "time": "1 h", + "construction_blueprint": "fbmc_mansion_+4", + "blueprint_provides": [ + { "id": "fbmc_mansion_+4" }, + { "id": "primitive_camp_recipes_1" }, + { "id": "gathering" }, + { "id": "firewood" }, + { "id": "foraging" }, + { "id": "sorting" }, + { "id": "logging" }, + { "id": "tool_storage" }, + { "id": "bed", "amount": 8 } + ], + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_name": "basic survey", + "check_blueprint_needs": false + }, + { + "type": "recipe", + "result": "faction_base_mansion_+4_garden", + "description": "Let's remove plants from garden and plow a few plots.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_mansion_+4_farm", + "blueprint_name": "prepare garden", + "blueprint_requires": [ { "id": "fbmc_mansion_+4" } ], + "blueprint_provides": [ { "id": "fbmc_mansion_+4_farm" }, { "id": "farming" }, { "id": "farm_recipes_1" } ], + "blueprint_excludes": [ { "id": "fbmc_mansion_+1_farm" } ], + "blueprint_needs": { "time": "2 h", "inline": { "tools": [ ], "qualities": [ [ { "id": "DIG", "level": 1 } ] ] } }, + "check_blueprint_needs": false + }, + { + "type": "recipe", + "result": "faction_base_mansion_+4_radio", + "description": "Let's set up a radio tower to improve our recruitment efforts.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_mansion_+4_radio", + "blueprint_name": "build a radio tower and console", + "blueprint_requires": [ { "id": "fbmc_mansion_+4_farm" } ], + "blueprint_provides": [ { "id": "fbmc_mansion_+4_radio" }, { "id": "recruiting" }, { "id": "radio" } ], + "blueprint_excludes": [ { "id": "fbmc_mansion_+4_radio" } ], + "blueprint_needs": { + "time": "2 d", + "skills": [ [ "fabrication", 3 ] ], + "inline": { + "tools": [ ], + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M" } ], [ { "id": "SCREW" } ], [ { "id": "WRENCH" } ] ], + "components": [ + [ + [ "wind_turbine", 4 ], + [ "xl_wind_turbine", 1 ], + [ "solar_panel", 4 ], + [ "reinforced_solar_panel", 4 ], + [ "solar_panel_v2", 2 ], + [ "reinforced_solar_panel_v2", 2 ], + [ "solar_panel_v3", 1 ] + ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 4 ], [ "small_storage_battery", 32 ] ], + [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], + [ [ "pipe", 24 ] ], + [ [ "processor", 2 ] ], + [ [ "RAM", 2 ] ], + [ [ "large_lcd_screen", 1 ] ], + [ [ "e_scrap", 8 ] ], + [ [ "frame", 1 ] ], + [ [ "circuit", 4 ] ], + [ [ "power_supply", 2 ] ], + [ [ "amplifier", 2 ] ], + [ [ "cable", 80 ] ], + [ [ "motor_small", 1 ], [ "motor_tiny", 2 ] ] + ] + } + }, + "check_blueprint_needs": false + } +] diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json new file mode 100644 index 0000000000000..a3c84138c4a64 --- /dev/null +++ b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json @@ -0,0 +1,236 @@ +[ + { + "type": "recipe", + "result": "faction_base_mansion_e1", + "description": "Survey mansion's entrance.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_e1", + "blueprint_name": "entrance survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_e1" }, { "id": "farming" }, { "id": "reseeding" }, { "id": "farm_recipes_1" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_e2", + "description": "Survey mansion's entrance.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_e2", + "blueprint_name": "entrance survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_e2" }, { "id": "farming" }, { "id": "reseeding" }, { "id": "farm_recipes_1" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t1", + "description": "Survey mansion's swimming pool.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t1", + "blueprint_name": "swimming pool survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_t1" }, { "id": "farming" }, { "id": "reseeding" }, { "id": "farm_recipes_1" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t2", + "description": "Survey mansion's bedrooms.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t2", + "blueprint_name": "bedrooms survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_t2" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t3", + "description": "Survey mansion's???.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t3", + "blueprint_name": "??? survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_t3" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t4", + "description": "Survey mansion's kitchen.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t4", + "blueprint_name": "kitchen survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ + { "id": "faction_base_mansion_t4" }, + { "id": "kitchen" }, + { "id": "kitchen_recipes_1" }, + { "id": "kitchen_recipes_2" }, + { "id": "kitchen_recipes_3" }, + { "id": "saltworks_recipes_1" }, + { "id": "saltworks_recipes_2" }, + { "id": "saltworks_recipes_3" } + ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t5", + "description": "Survey mansion's library.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t5", + "blueprint_name": "library survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_t5" }, { "id": "kitchen" }, { "id": "library_recipes_1" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t6", + "description": "Survey mansion's bedroom.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t6", + "blueprint_name": "bedroom survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_t6" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_t7", + "description": "Survey mansion's living rooms.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_t7", + "blueprint_name": "living rooms survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_t7" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_c1", + "description": "Survey mansion's swimming pool.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_c1", + "blueprint_name": "swimming survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_c1" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_c2", + "description": "Survey mansion's bar.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_c2", + "blueprint_name": "bar survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ + { "id": "faction_base_mansion_c2" }, + { "id": "kitchen" }, + { "id": "kitchen_recipes_1" }, + { "id": "kitchen_recipes_2" }, + { "id": "kitchen_recipes_3" } + ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_c3", + "description": "Survey mansion's living rooms.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_c3", + "blueprint_name": "living rooms survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_c3" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_c4", + "description": "Survey mansion's bedroom.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_c4", + "blueprint_name": "bedroom survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "faction_base_mansion_c4" } ] + }, + { + "type": "recipe", + "result": "faction_base_mansion_c5", + "description": "Survey mansion's kitchen.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_mansion_c5", + "blueprint_name": "kitchen survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ + { "id": "faction_base_mansion_c5" }, + { "id": "kitchen" }, + { "id": "kitchen_recipes_1" }, + { "id": "kitchen_recipes_2" }, + { "id": "kitchen_recipes_3" }, + { "id": "saltworks_recipes_1" }, + { "id": "saltworks_recipes_2" }, + { "id": "saltworks_recipes_3" } + ] + } +] diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json index 44399021cf29b..96f2341c7ba66 100644 --- a/data/json/recipes/basecamps/recipe_groups.json +++ b/data/json/recipes/basecamps/recipe_groups.json @@ -24,6 +24,26 @@ "id": "faction_base_shelter_2_0", "description": "Central Stairs Evac Shelter Base", "om_terrains": [ "shelter_2", "shelter_2_vandal" ] + }, + { + "id": "faction_base_mansion_+1_0", + "description": "Mansion Fountain Garden Base", + "om_terrains": [ "mansion_+1" ] + }, + { + "id": "faction_base_mansion_+2_0", + "description": "Mansion Dance Floor Room Base", + "om_terrains": [ "mansion_+2" ] + }, + { + "id": "faction_base_mansion_+3_0", + "description": "Mansion Basketball Room Base", + "om_terrains": [ "mansion_+3" ] + }, + { + "id": "faction_base_mansion_+4_0", + "description": "Mansion Garden With Columns Base", + "om_terrains": [ "mansion_+4" ] } ] }, @@ -38,7 +58,21 @@ { "id": "faction_base_livestock_0", "description": "Livestock Area", "om_terrains": [ "field" ] }, { "id": "faction_base_storehouse_0", "description": "Central Storage Building", "om_terrains": [ "field" ] }, { "id": "faction_base_saltworks_0", "description": "Saltworks Area", "om_terrains": [ "field" ] }, - { "id": "faction_base_workshop_0", "description": "Fabrication Workshop", "om_terrains": [ "field" ] } + { "id": "faction_base_workshop_0", "description": "Fabrication Workshop", "om_terrains": [ "field" ] }, + { "id": "faction_base_mansion_e1", "description": "Mansion's Entrance", "om_terrains": [ "mansion_e1" ] }, + { "id": "faction_base_mansion_e2", "description": "Mansion's Entrance", "om_terrains": [ "mansion_e2" ] }, + { "id": "faction_base_mansion_t1", "description": "Mansion's Swimming Pool", "om_terrains": [ "mansion_t1" ] }, + { "id": "faction_base_mansion_t2", "description": "Mansion's Bedrooms", "om_terrains": [ "mansion_t2" ] }, + { "id": "faction_base_mansion_t3", "description": "Mansion's???", "om_terrains": [ "mansion_t3" ] }, + { "id": "faction_base_mansion_t4", "description": "Mansion's Kitchen", "om_terrains": [ "mansion_t4" ] }, + { "id": "faction_base_mansion_t5", "description": "Mansion's Library", "om_terrains": [ "mansion_t5" ] }, + { "id": "faction_base_mansion_t6", "description": "Mansion's Bedroom", "om_terrains": [ "mansion_t6" ] }, + { "id": "faction_base_mansion_t7", "description": "Mansion's Living Rooms", "om_terrains": [ "mansion_t7" ] }, + { "id": "faction_base_mansion_c1", "description": "Mansion's Swimming Pool", "om_terrains": [ "mansion_c1" ] }, + { "id": "faction_base_mansion_c2", "description": "Mansion's Bar", "om_terrains": [ "mansion_c2" ] }, + { "id": "faction_base_mansion_c3", "description": "Mansion's Living Rooms", "om_terrains": [ "mansion_c3" ] }, + { "id": "faction_base_mansion_c4", "description": "Mansion's Bedroom", "om_terrains": [ "mansion_c4" ] }, + { "id": "faction_base_mansion_c5", "description": "Mansion's Kitchen", "om_terrains": [ "mansion_c5" ] } ] }, { From 344ed6eeeb10813aa240c53f02fcbce672460d7c Mon Sep 17 00:00:00 2001 From: krulunio Date: Thu, 10 Jun 2021 19:11:42 +0200 Subject: [PATCH 2/6] Add power tools Creates and adds fake power tools to various furniture --- .../furniture-tools.json | 33 ++++--- data/json/items/fake.json | 89 +++++++++++++++++++ 2 files changed, 111 insertions(+), 11 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index 76f91b21d0d42..8c108583df019 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -497,7 +497,8 @@ { "item": "element", "count": [ 10, 25 ] }, { "item": "scrap", "count": [ 12, 16 ] } ] - } + }, + "crafting_pseudo_item": "fake_arc_furnace" }, { "type": "furniture", @@ -534,7 +535,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_drill_press" }, { "type": "furniture", @@ -572,7 +574,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_tablesaw" }, { "type": "furniture", @@ -610,7 +613,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_mitresaw" }, { "type": "furniture", @@ -647,7 +651,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_bandsaw" }, { "type": "furniture", @@ -684,7 +689,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_router_table" }, { "type": "furniture", @@ -721,7 +727,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_planer" }, { "type": "furniture", @@ -758,7 +765,8 @@ { "item": "plastic_chunk", "count": [ 4, 14 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_jointer" }, { "type": "furniture", @@ -795,7 +803,8 @@ { "item": "chain", "count": [ 0, 1 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_hydraulic_press" }, { "type": "furniture", @@ -829,7 +838,8 @@ { "item": "pipe", "count": [ 0, 4 ] }, { "item": "motor_small", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_power_lathe" }, { "type": "furniture", @@ -872,7 +882,8 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ] - } + }, + "crafting_pseudo_item": "fake_air_compressor" }, { "type": "furniture", diff --git a/data/json/items/fake.json b/data/json/items/fake.json index b33dba7bbfa12..172a7c77ecf6f 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -172,5 +172,94 @@ "sub": "char_smoker", "max_charges": 2000, "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ] + }, + { + "id": "fake_power_tool", + "type": "TOOL", + "copy-from": "fake_item", + "name": { "str": "fake power tool" }, + "ammo": [ "battery" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "rigid": false, + "max_contains_volume": "50 L", + "max_contains_weight": "400 kg", + "item_restriction": [ + "storage_battery", + "medium_storage_battery", + "large_storage_battery" + ] + } + ], + "//": "For now, it can't be reloaded by examining furniture", + "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ] + }, + { + "id": "fake_arc_furnace", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "electric arc furnace" } + }, + { + "id": "fake_drill_press", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "drill press" } + }, + { + "id": "fake_tablesaw", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "tablesaw" } + }, + { + "id": "fake_mitresaw", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "mitresaw" } + }, + { + "id": "fake_bandsaw", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "bandsaw" } + }, + { + "id": "fake_router_table", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "router table" } + }, + { + "id": "fake_planer", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "planer" } + }, + { + "id": "fake_jointer", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "jointer" } + }, + { + "id": "fake_hydraulic_press", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "hydraulic press" } + }, + { + "id": "fake_power_lathe", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "power lathe" } + }, + { + "id": "fake_air_compressor", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "air compressor" } } ] From 63d5dd3ad215f3dfbf8e916ca7d4970818ed632b Mon Sep 17 00:00:00 2001 From: krulunio Date: Fri, 11 Jun 2021 08:24:07 +0200 Subject: [PATCH 3/6] Allow fake_power_tool to use UPS --- data/json/items/fake.json | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/data/json/items/fake.json b/data/json/items/fake.json index 172a7c77ecf6f..456881d28592d 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -179,22 +179,7 @@ "copy-from": "fake_item", "name": { "str": "fake power tool" }, "ammo": [ "battery" ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "rigid": false, - "max_contains_volume": "50 L", - "max_contains_weight": "400 kg", - "item_restriction": [ - "storage_battery", - "medium_storage_battery", - "large_storage_battery" - ] - } - ], - "//": "For now, it can't be reloaded by examining furniture", - "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ] + "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO", "USE_UPS" ] }, { "id": "fake_arc_furnace", From 99e2af5494caf5b79b3e6dd90507524b8b6645b2 Mon Sep 17 00:00:00 2001 From: krulunio Date: Fri, 11 Jun 2021 08:27:31 +0200 Subject: [PATCH 4/6] Add fake_oven --- data/json/furniture_and_terrain/furniture-appliances.json | 3 ++- data/json/items/fake.json | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 905cfba830472..c8b095eab1815 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -126,7 +126,8 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ] - } + }, + "crafting_pseudo_item": "fake_oven" }, { "type": "furniture", diff --git a/data/json/items/fake.json b/data/json/items/fake.json index 456881d28592d..e8ac260f0e21a 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -246,5 +246,11 @@ "type": "TOOL", "copy-from": "fake_power_tool", "name": { "str": "air compressor" } + }, + { + "id": "fake_oven", + "type": "TOOL", + "copy-from": "fake_power_tool", + "name": { "str": "oven" } } ] From 6ab9cd26d86b2a1b839f5569a781864f6607e5cc Mon Sep 17 00:00:00 2001 From: krulunio Date: Fri, 11 Jun 2021 09:12:51 +0200 Subject: [PATCH 5/6] Fix fake_oven placement --- data/json/furniture_and_terrain/furniture-appliances.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index c8b095eab1815..24f1af317e5e0 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -126,8 +126,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ] - }, - "crafting_pseudo_item": "fake_oven" + } }, { "type": "furniture", @@ -390,7 +389,8 @@ { "item": "cable", "charges": [ 1, 3 ] }, { "item": "pilot_light", "count": 1 } ] - } + }, + "crafting_pseudo_item": "fake_oven" }, { "type": "furniture", From 360e090166de0b3cd8a61071a7ebab9cfbc86a6c Mon Sep 17 00:00:00 2001 From: krulunio Date: Mon, 14 Jun 2021 10:58:23 +0200 Subject: [PATCH 6/6] Add fake_oven to expansions --- .../fbmc_mansion/fbmc_mansion_expansion_surveys.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json index a3c84138c4a64..7da157e55d4f9 100644 --- a/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json +++ b/data/json/recipes/basecamps/fbmc_mansion/fbmc_mansion_expansion_surveys.json @@ -96,7 +96,8 @@ { "id": "saltworks_recipes_1" }, { "id": "saltworks_recipes_2" }, { "id": "saltworks_recipes_3" } - ] + ], + "blueprint_resources": [ "fake_oven" ] }, { "type": "recipe", @@ -231,6 +232,7 @@ { "id": "saltworks_recipes_1" }, { "id": "saltworks_recipes_2" }, { "id": "saltworks_recipes_3" } - ] + ], + "blueprint_resources": [ "fake_oven" ] } ]