From 6d3cde047f488c094c053e883b0d45cb03c00db1 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 14 Sep 2019 14:50:55 -0400 Subject: [PATCH 1/6] add faction camp expansion livestock --- .../basecamps/modular_livestock_wood.json | 233 ++++++++++++++++++ data/json/mapgen/faction_buildings.json | 37 +++ .../overmap_terrain_faction_base.json | 9 + .../json/recipes/basecamps/recipe_groups.json | 3 +- .../recipe_modular_livestock_wood.json | 152 ++++++++++++ 5 files changed, 433 insertions(+), 1 deletion(-) create mode 100644 data/json/mapgen/basecamps/modular_livestock_wood.json create mode 100644 data/json/recipes/basecamps/recipe_modular_livestock_wood.json diff --git a/data/json/mapgen/basecamps/modular_livestock_wood.json b/data/json/mapgen/basecamps/modular_livestock_wood.json new file mode 100644 index 0000000000000..b9722945baab4 --- /dev/null +++ b/data/json/mapgen/basecamps/modular_livestock_wood.json @@ -0,0 +1,233 @@ +[ + { + "type": "palette", + "id": "fbml_wood_palette", + "terrain": { + ".": "t_dirtfloor", + "b": "t_dirtfloor", + "r": "t_dirtfloor", + "t": "t_dirtfloor", + "d": "t_chickenwire_gate_c", + "f": "t_chickenwire_fence", + "o": "t_window_no_curtains", + "F": "t_splitrail_fence", + "D": "t_splitrail_fencegate_c", + "w": "t_wall_wood", + "+": "t_door_c" + }, + "furniture": { "b": "f_bench", "r": "f_rack", "t": "f_table" } + }, + { + "type": "mapgen", + "update_mapgen_id": "faction_base_livestock_0", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "faction_base_livestock_0" ], "x": 15, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_coop_wood", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w....w", + "w....w", + "w....w", + "w....w", + "wwdfww" + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_coop_wood_northeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_coop_wood" ], "x": 15, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_coop_yard_chickenwire", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "f f", + "f f", + "f f", + "f f", + "f f", + "fdffff" + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_coop_yard_chickenwire_east", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_coop_yard_chickenwire" ], "x": 15, "y": 9 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_shack_wood", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " woww", + " wwrrw", + " +..to", + " orrrw", + " wwoww" + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_shack_wood_southeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_shack_wood" ], "x": 15, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable0_wood", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..D..", + "w..F..", + "w..F..", + "w..Fbb", + "wwwwww" + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable0_wood_southwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable0_wood" ], "x": 3, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable1_wood", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable1_wood_west", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable1_wood" ], "x": 3, "y": 9 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable2_wood", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable2_wood_northwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable2_wood" ], "x": 3, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_pasture0_splitrail", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "FFDFFF", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_pasture0_splitrail_north", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_pasture0_splitrail" ], "x": 9, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_pasture1_splitrail", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " FF" + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_pasture1_splitrail_center", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_pasture1_splitrail" ], "x": 9, "y": 9 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_pasture2_splitrail", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " F ", + " F ", + " D ", + " F ", + " F ", + "FFDFF " + ], + "palettes": [ "fbml_wood_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_pasture2_splitrail_south", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_pasture2_splitrail" ], "x": 9, "y": 15 } ] } + } +] diff --git a/data/json/mapgen/faction_buildings.json b/data/json/mapgen/faction_buildings.json index 95ff737c294d6..5fb24deb1a796 100644 --- a/data/json/mapgen/faction_buildings.json +++ b/data/json/mapgen/faction_buildings.json @@ -2366,5 +2366,42 @@ ], "palettes": [ "acidia_camp_palette" ] } + }, + { + "type": "mapgen", + "om_terrain": "faction_base_livestock_0", + "method": "json", + "faction_owner": { "id": "your_followers", "area": [ { "x": 0, "y": 0, "x2": 23, "y2": 23 } ] }, + "weight": 250, + "object": { + "fill_ter": "t_grass", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,," + ], + "palettes": [ "acidia_camp_palette" ] + } } ] 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 c38526404f575..cd023392c451e 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json @@ -574,5 +574,14 @@ "color": "i_dark_gray", "see_cost": 5, "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "faction_base_livestock_0", + "name": "livestock survey", + "sym": "+", + "color": "pink", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] } ] diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json index 326956169e9ac..9bdd05ca880b5 100644 --- a/data/json/recipes/basecamps/recipe_groups.json +++ b/data/json/recipes/basecamps/recipe_groups.json @@ -16,7 +16,8 @@ { "id": "faction_base_farm_0", "description": "Farm", "om_terrains": [ "field" ] }, { "id": "faction_base_garage_0", "description": "Garage", "om_terrains": [ "field" ] }, { "id": "faction_base_kitchen_0", "description": "Kitchen", "om_terrains": [ "field" ] }, - { "id": "faction_base_blacksmith_0", "description": "Blacksmith Shop", "om_terrains": [ "field" ] } + { "id": "faction_base_blacksmith_0", "description": "Blacksmith Shop", "om_terrains": [ "field" ] }, + { "id": "faction_base_livestock_0", "description": "Livestock Area", "om_terrains": [ "field" ] } ] }, { diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_wood.json b/data/json/recipes/basecamps/recipe_modular_livestock_wood.json new file mode 100644 index 0000000000000..ee2a9f00941e2 --- /dev/null +++ b/data/json/recipes/basecamps/recipe_modular_livestock_wood.json @@ -0,0 +1,152 @@ +[ + { + "type": "recipe", + "result": "faction_base_livestock_0", + "description": "Survey land for a livestock area.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "skill_used": "fabrication", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "faction_base_livestock_0", + "blueprint_name": "Livestock survey", + "time": "180 m", + "blueprint_requires": [ { "id": "not_an_upgrade" } ], + "blueprint_provides": [ { "id": "fbml_0" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_coop_wood_northeast", + "description": "We could use a coop to contain our chickens and other birds, so build a wood panel shack with a roof on the northeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_coop_wood_northeast", + "blueprint_name": "northeast coop", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_northeast" } ], + "blueprint_excludes": [ { "id": "fbml_northeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_coop_yard_chickenwire_east", + "description": "We could use a fence to contain our chickens and other birds, so build a chickenwire fence on the east side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_coop_yard_chickenwire_east", + "blueprint_name": "east coop yard", + "blueprint_requires": [ { "id": "fbml_northeast" } ], + "blueprint_provides": [ { "id": "fbml_east" } ], + "blueprint_excludes": [ { "id": "fbml_east" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_shack_wood_southeast", + "description": "We could use a storage room for feed, animal gear and tools, so build a wood panel shack with a roof on the southeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_shack_wood_southeast", + "blueprint_name": "southeast storage room", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_southeast" } ], + "blueprint_excludes": [ { "id": "fbml_southeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable0_wood_southwest", + "description": "We could use a stable for larger livestock, so build a wood panel shack with a roof on the southwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable0_wood_southwest", + "blueprint_name": "southwest stable", + "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_provides": [ { "id": "fbml_southwest" } ], + "blueprint_excludes": [ { "id": "fbml_southwest" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable1_wood_west", + "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable1_wood_west", + "blueprint_name": "west stable", + "blueprint_requires": [ { "id": "fbml_southwest" } ], + "blueprint_provides": [ { "id": "fbml_west" } ], + "blueprint_excludes": [ { "id": "fbml_west" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable2_wood_northwest", + "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable2_wood_northwest", + "blueprint_name": "northwest stable", + "blueprint_requires": [ { "id": "fbml_west" } ], + "blueprint_provides": [ { "id": "fbml_northwest" } ], + "blueprint_excludes": [ { "id": "fbml_northwest" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_pasture0_splitrail", + "description": "We could use paddock for the stable, so build a split-rail fence on the north side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_pasture0_splitrail_north", + "blueprint_name": "north paddock", + "blueprint_requires": [ { "id": "fbml_northwest" } ], + "blueprint_provides": [ { "id": "fbml_north" } ], + "blueprint_excludes": [ { "id": "fbml_north" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_pasture1_splitrail", + "description": "We could use paddock for the stable, so build a split-rail fence in the center of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_pasture1_splitrail_center", + "blueprint_name": "center paddock", + "blueprint_requires": [ { "id": "fbml_north" } ], + "blueprint_provides": [ { "id": "fbml_center" } ], + "blueprint_excludes": [ { "id": "fbml_center" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_pasture2_splitrail", + "description": "We could use paddock for the stable, so build a split-rail fence to close off the south end of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_pasture2_splitrail_south", + "blueprint_name": "center paddock", + "blueprint_requires": [ { "id": "fbml_center" } ], + "blueprint_provides": [ { "id": "fbml_south" } ], + "blueprint_excludes": [ { "id": "fbml_south" } ], + "blueprint_autocalc": true + } +] From 03d9a02e5a80acf7af3de6683ede0180b5a2a9f4 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 14 Sep 2019 15:20:24 -0400 Subject: [PATCH 2/6] add more blueprint_provides for future features --- .../json/recipes/basecamps/recipe_modular_livestock_wood.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_wood.json b/data/json/recipes/basecamps/recipe_modular_livestock_wood.json index ee2a9f00941e2..c666b4bb4173c 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock_wood.json @@ -25,7 +25,7 @@ "construction_blueprint": "fbml_coop_wood_northeast", "blueprint_name": "northeast coop", "blueprint_requires": [ { "id": "fbml_0" } ], - "blueprint_provides": [ { "id": "fbml_northeast" } ], + "blueprint_provides": [ { "id": "fbml_northeast" }, { "id": "chicken_coop" } ], "blueprint_excludes": [ { "id": "fbml_northeast" } ], "blueprint_autocalc": true }, @@ -70,7 +70,7 @@ "construction_blueprint": "fbml_stable0_wood_southwest", "blueprint_name": "southwest stable", "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], - "blueprint_provides": [ { "id": "fbml_southwest" } ], + "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], "blueprint_excludes": [ { "id": "fbml_southwest" } ], "blueprint_autocalc": true }, From 1508c38c894b597cfe95f4092ad4895df489f280 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 14 Sep 2019 15:39:16 -0400 Subject: [PATCH 3/6] quick bugfix fixes the non-crashing error bug that comes up after surveying the expansion area. --- .../basecamps/modular_livestock_wood.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/basecamps/modular_livestock_wood.json b/data/json/mapgen/basecamps/modular_livestock_wood.json index b9722945baab4..a262a8552f69f 100644 --- a/data/json/mapgen/basecamps/modular_livestock_wood.json +++ b/data/json/mapgen/basecamps/modular_livestock_wood.json @@ -21,7 +21,24 @@ "type": "mapgen", "update_mapgen_id": "faction_base_livestock_0", "method": "json", - "object": { "place_nested": [ { "chunks": [ "faction_base_livestock_0" ], "x": 15, "y": 3 } ] } + "object": { "place_nested": [ { "chunks": [ "fbml_0" ], "x": 15, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_0", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "fbml_wood_palette" ] + } }, { "type": "mapgen", From 9b2f993bc5db284d050ce43fc990f5fa17efc3c9 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 14 Sep 2019 17:26:37 -0400 Subject: [PATCH 4/6] add more modular wall options --- .../basecamps/modular_livestock_log.json | 135 ++++++++++++++++++ .../basecamps/modular_livestock_metal.json | 135 ++++++++++++++++++ .../basecamps/modular_livestock_rock.json | 135 ++++++++++++++++++ .../recipe_modular_livestock_log.json | 77 ++++++++++ .../recipe_modular_livestock_metal.json | 77 ++++++++++ .../recipe_modular_livestock_rock.json | 77 ++++++++++ 6 files changed, 636 insertions(+) create mode 100644 data/json/mapgen/basecamps/modular_livestock_log.json create mode 100644 data/json/mapgen/basecamps/modular_livestock_metal.json create mode 100644 data/json/mapgen/basecamps/modular_livestock_rock.json create mode 100644 data/json/recipes/basecamps/recipe_modular_livestock_log.json create mode 100644 data/json/recipes/basecamps/recipe_modular_livestock_metal.json create mode 100644 data/json/recipes/basecamps/recipe_modular_livestock_rock.json diff --git a/data/json/mapgen/basecamps/modular_livestock_log.json b/data/json/mapgen/basecamps/modular_livestock_log.json new file mode 100644 index 0000000000000..ea0b81a2868ae --- /dev/null +++ b/data/json/mapgen/basecamps/modular_livestock_log.json @@ -0,0 +1,135 @@ +[ + { + "type": "palette", + "id": "fbml_log_palette", + "terrain": { + ".": "t_dirtfloor", + "b": "t_dirtfloor", + "r": "t_dirtfloor", + "t": "t_dirtfloor", + "d": "t_chickenwire_gate_c", + "f": "t_chickenwire_fence", + "o": "t_window_no_curtains", + "F": "t_splitrail_fence", + "D": "t_splitrail_fencegate_c", + "w": "t_wall_log", + "+": "t_door_c" + }, + "furniture": { "b": "f_bench", "r": "f_rack", "t": "f_table" } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_coop_log", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w....w", + "w....w", + "w....w", + "w....w", + "wwdfww" + ], + "palettes": [ "fbml_log_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_coop_log_northeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_coop_log" ], "x": 15, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_shack_log", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " woww", + " wwrrw", + " +..to", + " orrrw", + " wwoww" + ], + "palettes": [ "fbml_log_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_shack_log_southeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_shack_log" ], "x": 15, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable0_log", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..D..", + "w..F..", + "w..F..", + "w..Fbb", + "wwwwww" + ], + "palettes": [ "fbml_log_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable0_log_southwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable0_log" ], "x": 3, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable1_log", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_log_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable1_log_west", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable1_log" ], "x": 3, "y": 9 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable2_log", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_log_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable2_log_northwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable2_log" ], "x": 3, "y": 3 } ] } + } +] diff --git a/data/json/mapgen/basecamps/modular_livestock_metal.json b/data/json/mapgen/basecamps/modular_livestock_metal.json new file mode 100644 index 0000000000000..93138eaa33a78 --- /dev/null +++ b/data/json/mapgen/basecamps/modular_livestock_metal.json @@ -0,0 +1,135 @@ +[ + { + "type": "palette", + "id": "fbml_metal_palette", + "terrain": { + ".": "t_dirtfloor", + "b": "t_dirtfloor", + "r": "t_dirtfloor", + "t": "t_dirtfloor", + "d": "t_chickenwire_gate_c", + "f": "t_chickenwire_fence", + "o": "t_window_no_curtains", + "F": "t_splitrail_fence", + "D": "t_splitrail_fencegate_c", + "w": "t_scrap_wall", + "+": "t_door_c" + }, + "furniture": { "b": "f_bench", "r": "f_rack", "t": "f_table" } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_coop_metal", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w....w", + "w....w", + "w....w", + "w....w", + "wwdfww" + ], + "palettes": [ "fbml_metal_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_coop_metal_northeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_coop_metal" ], "x": 15, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_shack_metal", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " woww", + " wwrrw", + " +..to", + " orrrw", + " wwoww" + ], + "palettes": [ "fbml_metal_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_shack_metal_southeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_shack_metal" ], "x": 15, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable0_metal", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..D..", + "w..F..", + "w..F..", + "w..Fbb", + "wwwwww" + ], + "palettes": [ "fbml_metal_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable0_metal_southwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable0_metal" ], "x": 3, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable1_metal", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_metal_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable1_metal_west", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable1_metal" ], "x": 3, "y": 9 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable2_metal", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_metal_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable2_metal_northwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable2_metal" ], "x": 3, "y": 3 } ] } + } +] diff --git a/data/json/mapgen/basecamps/modular_livestock_rock.json b/data/json/mapgen/basecamps/modular_livestock_rock.json new file mode 100644 index 0000000000000..7a65438c61fc3 --- /dev/null +++ b/data/json/mapgen/basecamps/modular_livestock_rock.json @@ -0,0 +1,135 @@ +[ + { + "type": "palette", + "id": "fbml_rock_palette", + "terrain": { + ".": "t_dirtfloor", + "b": "t_dirtfloor", + "r": "t_dirtfloor", + "t": "t_dirtfloor", + "d": "t_chickenwire_gate_c", + "f": "t_chickenwire_fence", + "o": "t_window_no_curtains", + "F": "t_splitrail_fence", + "D": "t_splitrail_fencegate_c", + "w": "t_rock_wall", + "+": "t_door_c" + }, + "furniture": { "b": "f_bench", "r": "f_rack", "t": "f_table" } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_coop_rock", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w....w", + "w....w", + "w....w", + "w....w", + "wwdfww" + ], + "palettes": [ "fbml_rock_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_coop_rock_northeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_coop_rock" ], "x": 15, "y": 3 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_shack_rock", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " ", + " woww", + " wwrrw", + " +..to", + " orrrw", + " wwoww" + ], + "palettes": [ "fbml_rock_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_shack_rock_southeast", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_shack_rock" ], "x": 15, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable0_rock", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..D..", + "w..F..", + "w..F..", + "w..Fbb", + "wwwwww" + ], + "palettes": [ "fbml_rock_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable0_rock_southwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable0_rock" ], "x": 3, "y": 15 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable1_rock", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwww.w", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_rock_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable1_rock_west", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable1_rock" ], "x": 3, "y": 9 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbml_stable2_rock", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + "wwwwww", + "w..F..", + "w..D..", + "wwwwb.", + "w..Fb.", + "w..D.." + ], + "palettes": [ "fbml_rock_palette" ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbml_stable2_rock_northwest", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbml_stable2_rock" ], "x": 3, "y": 3 } ] } + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_log.json b/data/json/recipes/basecamps/recipe_modular_livestock_log.json new file mode 100644 index 0000000000000..921bf732e2b26 --- /dev/null +++ b/data/json/recipes/basecamps/recipe_modular_livestock_log.json @@ -0,0 +1,77 @@ +[ + { + "type": "recipe", + "result": "faction_base_modular_livestock_coop_log_northeast", + "description": "We could use a coop to contain our chickens and other birds, so build a log shack with a roof on the northeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_coop_log_northeast", + "blueprint_name": "northeast coop", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_northeast" }, { "id": "chicken_coop" } ], + "blueprint_excludes": [ { "id": "fbml_northeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_shack_log_southeast", + "description": "We could use a storage room for feed, animal gear and tools, so build a log shack with a roof on the southeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_shack_log_southeast", + "blueprint_name": "southeast storage room", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_southeast" } ], + "blueprint_excludes": [ { "id": "fbml_southeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable0_log_southwest", + "description": "We could use a stable for larger livestock, so build a log shack with a roof on the southwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable0_log_southwest", + "blueprint_name": "southwest stable", + "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], + "blueprint_excludes": [ { "id": "fbml_southwest" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable1_log_west", + "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable1_log_west", + "blueprint_name": "west stable", + "blueprint_requires": [ { "id": "fbml_southwest" } ], + "blueprint_provides": [ { "id": "fbml_west" } ], + "blueprint_excludes": [ { "id": "fbml_west" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable2_log_northwest", + "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable2_log_northwest", + "blueprint_name": "northwest stable", + "blueprint_requires": [ { "id": "fbml_west" } ], + "blueprint_provides": [ { "id": "fbml_northwest" } ], + "blueprint_excludes": [ { "id": "fbml_northwest" } ], + "blueprint_autocalc": true + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_metal.json b/data/json/recipes/basecamps/recipe_modular_livestock_metal.json new file mode 100644 index 0000000000000..8d6dfd50f18b5 --- /dev/null +++ b/data/json/recipes/basecamps/recipe_modular_livestock_metal.json @@ -0,0 +1,77 @@ +[ + { + "type": "recipe", + "result": "faction_base_modular_livestock_coop_metal_northeast", + "description": "We could use a coop to contain our chickens and other birds, so build a metal sheet shack with a roof on the northeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_coop_metal_northeast", + "blueprint_name": "northeast coop", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_northeast" }, { "id": "chicken_coop" } ], + "blueprint_excludes": [ { "id": "fbml_northeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_shack_metal_southeast", + "description": "We could use a storage room for feed, animal gear and tools, so build a metal sheet shack with a roof on the southeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_shack_metal_southeast", + "blueprint_name": "southeast storage room", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_southeast" } ], + "blueprint_excludes": [ { "id": "fbml_southeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable0_metal_southwest", + "description": "We could use a stable for larger livestock, so build a metal sheet shack with a roof on the southwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable0_metal_southwest", + "blueprint_name": "southwest stable", + "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], + "blueprint_excludes": [ { "id": "fbml_southwest" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable1_metal_west", + "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable1_metal_west", + "blueprint_name": "west stable", + "blueprint_requires": [ { "id": "fbml_southwest" } ], + "blueprint_provides": [ { "id": "fbml_west" } ], + "blueprint_excludes": [ { "id": "fbml_west" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable2_metal_northwest", + "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable2_metal_northwest", + "blueprint_name": "northwest stable", + "blueprint_requires": [ { "id": "fbml_west" } ], + "blueprint_provides": [ { "id": "fbml_northwest" } ], + "blueprint_excludes": [ { "id": "fbml_northwest" } ], + "blueprint_autocalc": true + } +] diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_rock.json b/data/json/recipes/basecamps/recipe_modular_livestock_rock.json new file mode 100644 index 0000000000000..c8e48ae20d833 --- /dev/null +++ b/data/json/recipes/basecamps/recipe_modular_livestock_rock.json @@ -0,0 +1,77 @@ +[ + { + "type": "recipe", + "result": "faction_base_modular_livestock_coop_rock_northeast", + "description": "We could use a coop to contain our chickens and other birds, so build a stone shack with a roof on the northeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_coop_rock_northeast", + "blueprint_name": "northeast coop", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_northeast" }, { "id": "chicken_coop" } ], + "blueprint_excludes": [ { "id": "fbml_northeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_shack_rock_southeast", + "description": "We could use a storage room for feed, animal gear and tools, so build a stone shack with a roof on the southeast side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_shack_rock_southeast", + "blueprint_name": "southeast storage room", + "blueprint_requires": [ { "id": "fbml_0" } ], + "blueprint_provides": [ { "id": "fbml_southeast" } ], + "blueprint_excludes": [ { "id": "fbml_southeast" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable0_rock_southwest", + "description": "We could use a stable for larger livestock, so build a stone shack with a roof on the southwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable0_rock_southwest", + "blueprint_name": "southwest stable", + "blueprint_requires": [ { "id": "faction_base_livestock_0" } ], + "blueprint_provides": [ { "id": "fbml_southwest" }, { "id": "stables" } ], + "blueprint_excludes": [ { "id": "fbml_southwest" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable1_rock_west", + "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable1_rock_west", + "blueprint_name": "west stable", + "blueprint_requires": [ { "id": "fbml_southwest" } ], + "blueprint_provides": [ { "id": "fbml_west" } ], + "blueprint_excludes": [ { "id": "fbml_west" } ], + "blueprint_autocalc": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable2_rock_northwest", + "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbml_stable2_rock_northwest", + "blueprint_name": "northwest stable", + "blueprint_requires": [ { "id": "fbml_west" } ], + "blueprint_provides": [ { "id": "fbml_northwest" } ], + "blueprint_excludes": [ { "id": "fbml_northwest" } ], + "blueprint_autocalc": true + } +] From 7c5cb5aa0dcf546302aac8717299c47d73773a2b Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sun, 15 Sep 2019 07:41:22 -0400 Subject: [PATCH 5/6] Update data/json/recipes/basecamps/recipe_modular_livestock_log.json thanks! Co-Authored-By: Mark Langsdorf --- data/json/recipes/basecamps/recipe_modular_livestock_log.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_log.json b/data/json/recipes/basecamps/recipe_modular_livestock_log.json index 921bf732e2b26..e461f7c4430c0 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock_log.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock_log.json @@ -62,7 +62,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable2_log_northwest", - "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the northwest side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, From bff88ac8a530b023ecd6edca96b8326c409daaea Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sun, 15 Sep 2019 08:38:17 -0400 Subject: [PATCH 6/6] more stable to stalls --- data/json/recipes/basecamps/recipe_modular_livestock_log.json | 2 +- .../recipes/basecamps/recipe_modular_livestock_metal.json | 4 ++-- .../json/recipes/basecamps/recipe_modular_livestock_rock.json | 4 ++-- .../json/recipes/basecamps/recipe_modular_livestock_wood.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_log.json b/data/json/recipes/basecamps/recipe_modular_livestock_log.json index e461f7c4430c0..425cc156df093 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock_log.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock_log.json @@ -47,7 +47,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable1_log_west", - "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the west side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_metal.json b/data/json/recipes/basecamps/recipe_modular_livestock_metal.json index 8d6dfd50f18b5..63c5e5190f193 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock_metal.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock_metal.json @@ -47,7 +47,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable1_metal_west", - "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the west side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, @@ -62,7 +62,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable2_metal_northwest", - "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the northwest side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_rock.json b/data/json/recipes/basecamps/recipe_modular_livestock_rock.json index c8e48ae20d833..ff9d0bbabb037 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock_rock.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock_rock.json @@ -47,7 +47,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable1_rock_west", - "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the west side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, @@ -62,7 +62,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable2_rock_northwest", - "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the northwest side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, diff --git a/data/json/recipes/basecamps/recipe_modular_livestock_wood.json b/data/json/recipes/basecamps/recipe_modular_livestock_wood.json index c666b4bb4173c..96c17484c5e17 100644 --- a/data/json/recipes/basecamps/recipe_modular_livestock_wood.json +++ b/data/json/recipes/basecamps/recipe_modular_livestock_wood.json @@ -77,7 +77,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable1_wood_west", - "description": "We could use an expansion for the stable, so build 2 more stables on the west side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the west side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, @@ -92,7 +92,7 @@ { "type": "recipe", "result": "faction_base_modular_livestock_stable2_wood_northwest", - "description": "We could use an expansion for the stable, so build 2 more stables on the northwest side of the livestock field.", + "description": "We could use an expansion for the stable, so build 2 more stalls on the northwest side of the livestock field.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false,