diff --git a/data/changelog.txt b/data/changelog.txt index 0f0bfdf7c066d..8a7b40241b511 100644 --- a/data/changelog.txt +++ b/data/changelog.txt @@ -32,6 +32,7 @@ Asynchronous animations including sprinting and smashing Added enable and disable mutation EOCs 3D vision for isometric tilesets Unhardcode dragging, grab fixes +Make vehicle doors lockable and pickable ## Content: @@ -59,6 +60,7 @@ Living lore document Gastropod Foot Limb: Mutant limbs can be added in json Added a small office building fortified by bandits New location: speedway +You can now choose a new leader for your faction without dying ## Interface: @@ -101,6 +103,7 @@ Alchemy Perks for Xedra Evolved Bombastic Perks adds Playstyle Perks [Magiclysm] Ways to boost your caster level Disable the Bionic Professions mod by default +Add the Mind Over Matter mod to the CDDA repository ## Balance: @@ -169,6 +172,7 @@ Charge integrated magazines when plugged in Don't allow to scan books that are owned by other characters Fix NPC putting items in open air when fetching items during an activity when 3D FOV is on Trees and other FLAMMABLE_ASH terrain leaves behind ash when burned down +Do not report monsters breaking free of unknown grabbers if the player cannot see them ## Performance: diff --git a/data/json/construction.json b/data/json/construction.json index e5d56a88ce838..715ac2c612029 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -5587,7 +5587,7 @@ }, { "type": "construction", - "id": "constr_dock", + "id": "constr_dock_moving", "group": "build_river_dock_shallow_bridge", "//": "Set up dock", "category": "CONSTRUCT", @@ -5600,7 +5600,20 @@ }, { "type": "construction", - "id": "constr_dock_deep_pile", + "id": "constr_dock", + "group": "build_river_dock_shallow_bridge", + "//": "Set up dock", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 4 ] ], + "time": "40 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ], + "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ], + "pre_terrain": "t_water_sh", + "post_terrain": "t_dock" + }, + { + "type": "construction", + "id": "constr_dock_deep_pile_moving", "group": "build_deep_river_dock", "//": "Step 1: securing a pile down on the riverbed; not easy work without machinery", "category": "CONSTRUCT", @@ -5611,6 +5624,19 @@ "pre_terrain": "t_water_moving_dp", "post_terrain": "t_dock_deep_pile" }, + { + "type": "construction", + "id": "constr_dock_deep_pile", + "group": "build_deep_river_dock", + "//": "Step 1: securing a pile down on the lakebed; not easy work without machinery", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 6 ] ], + "time": "720 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ], + "components": [ [ [ "wood_beam", 1 ] ], [ [ "spike", 4 ] ] ], + "pre_terrain": "t_water_dp", + "post_terrain": "t_dock_deep_pile" + }, { "type": "construction", "id": "constr_dock_deep_frame", diff --git a/data/json/faults/fixes_gun.json b/data/json/faults/fixes_gun.json index c8f9480ab45b7..3da92cd342e49 100644 --- a/data/json/faults/fixes_gun.json +++ b/data/json/faults/fixes_gun.json @@ -21,7 +21,7 @@ "faults_removed": [ "fault_gun_blackpowder" ], "faults_added": [ "fault_gun_unlubricated" ], "skills": { "mechanics": 1 }, - "set_variables": { "dirt": "0" }, + "set_variables": { "dirt": "0", "rust_timer": "0" }, "requirements": [ [ "gun_cleaning_bp", 1 ] ], "time_save_profs": { "prof_gun_cleaning": 0.5 }, "time_save_flags": { "EASY_CLEAN": 0.5 } @@ -46,7 +46,7 @@ "time": "60 m", "faults_removed": [ "fault_gun_blackpowder", "fault_gun_unlubricated" ], "skills": { "mechanics": 1 }, - "set_variables": { "dirt": "0" }, + "set_variables": { "dirt": "0", "rust_timer": "0" }, "requirements": [ [ "gun_cleaning_bp", 1 ], [ "gun_lubrication", 1 ] ], "time_save_profs": { "prof_gun_cleaning": 0.5 }, "time_save_flags": { "EASY_CLEAN": 0.5 } diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 7265a397c9abc..d49c7e0efb3ae 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -129,24 +129,12 @@ { "id": "boots_xlsurvivor", "type": "ARMOR", - "category": "armor", + "copy-from": "boots_survivor", + "looks_like": "boots_survivor", + "proportional": { "weight": 1.4, "volume": 1.4 }, "name": { "str": "pair of XL survivor boots", "str_pl": "pairs of XL survivor boots" }, "description": "A pair of huge, custom-made boots constructed of thick Kevlar and a chemical resistant layer, featuring steel toes for extra protection. Keeps your feet safe from the myriad dangers of the apocalypse.", - "weight": "2460 g", - "volume": "5 L", - "price": 24000, - "price_postapoc": 4000, - "to_hit": -1, - "material": [ "kevlar", "leather" ], - "symbol": "[", - "looks_like": "boots_combat", - "color": "brown", - "warmth": 15, - "material_thickness": 4, - "environmental_protection": 3, - "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ], - "armor": [ { "encumbrance": 38, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ], - "melee_damage": { "bash": 1 } + "extend": { "flags": [ "OVERSIZE" ] } }, { "id": "boots_xssurvivor", diff --git a/data/json/items/armor/bespoke_armor/custom_storage.json b/data/json/items/armor/bespoke_armor/custom_storage.json index b4a2152182665..4a692fad9bd3a 100644 --- a/data/json/items/armor/bespoke_armor/custom_storage.json +++ b/data/json/items/armor/bespoke_armor/custom_storage.json @@ -85,6 +85,7 @@ "max_contains_volume": "65 L", "max_contains_weight": "90 kg", "max_item_length": "65 cm", + "watertight": true, "magazine_well": "5 L", "moves": 450 }, diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index 97aa249f30399..f904e8a8e0ab8 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -1035,6 +1035,7 @@ "max_contains_volume": "60 L", "max_contains_weight": "90 kg", "max_item_length": "65 cm", + "watertight": true, "magazine_well": "5 L", "moves": 450 }, diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json index 3444cff4a114d..7fba7f1585ac6 100644 --- a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json +++ b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json @@ -4,17 +4,7 @@ "id": "fbmc_shelter_1_palette", "terrain": { ".": "t_dirt" }, "//": "Dummy terrain entry to satisfy need for non empty terrain section", - "furniture": { - "h": "f_chair", - "t": "f_table", - "x": "f_coffee_table", - "b": "f_bed", - "m": "f_straw_bed", - "n": "f_makeshift_bed", - "L": "f_locker", - "s": "f_sofa", - "*": "f_clear" - } + "furniture": { "h": "f_chair", "t": "f_table", "x": "f_coffee_table", "L": "f_locker", "s": "f_sofa", "*": "f_clear" } }, { "type": "mapgen", @@ -72,56 +62,48 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_straw_nw_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "mL", - "m*" - ], "palettes": [ "fbmc_shelter_1_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_NW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_nw_wall" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_nw_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "nL", - "n*" - ], "palettes": [ "fbmc_shelter_1_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_NW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_nw_wall" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_standard_bed_nw_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "nested_mapgen_id": "fbmc_shelter_1_bed_nw_wall", + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "bL", "b*" - ], "palettes": [ "fbmc_shelter_1_palette" ] } + ], + "palettes": [ "fbmc_shelter_1_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_standard_NW", + "update_mapgen_id": "fbmc_shelter_1_bed_NW", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_standard_bed_nw_wall" ], "x": 8, "y": 8 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_nw_wall" ], "x": 8, "y": 8 } ] } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "fbmc_shelter_1_bed_w1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "bb", "L*" - ], "palettes": [ "fbmc_shelter_1_palette" ] } + ], + "palettes": [ "fbmc_shelter_1_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", @@ -144,62 +126,15 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_straw_west_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "mm", - "L*" - ], "palettes": [ "fbmc_shelter_1_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_W1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_west_wall" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_W2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_west_wall" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_W3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_west_wall" ], "x": 5, "y": 16 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_west_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "nn", - "L*" - ], "palettes": [ "fbmc_shelter_1_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_W1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_west_wall" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_W2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_west_wall" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_W3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_west_wall" ], "x": 5, "y": 16 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_standard_southwest_wall", + "nested_mapgen_id": "fbmc_shelter_1_bed_southwest_wall", "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, "mapgensize": [ 4, 4 ], "rows": [ "L* ", @@ -207,122 +142,54 @@ "b* ", "bt " ], - "palettes": [ "fbmc_shelter_1_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_standard_SW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_southwest_wall" ], "x": 5, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_straw_southwest_wall", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "L* ", - " * ", - "m* ", - "mt " - ], - "palettes": [ "fbmc_shelter_1_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_SW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_southwest_wall" ], "x": 5, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_southwest_wall", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "L* ", - " * ", - "n* ", - "nt " - ], - "palettes": [ "fbmc_shelter_1_palette" ] + "palettes": [ "fbmc_shelter_1_palette", { "param": "fbmc_bed_palette" } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_SW", + "update_mapgen_id": "fbmc_shelter_1_bed_SW", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_southwest_wall" ], "x": 5, "y": 19 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_southwest_wall" ], "x": 5, "y": 19 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_standard_south1_wall", + "nested_mapgen_id": "fbmc_shelter_1_bed_south1_wall", "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, "mapgensize": [ 3, 3 ], "rows": [ "L*L", "b*b", "btb" ], - "palettes": [ "fbmc_shelter_1_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_standard_S1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_south1_wall" ], "x": 8, "y": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_straw_south1_wall", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "L*L", - "m*m", - "mtm" - ], - "palettes": [ "fbmc_shelter_1_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_S1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_south1_wall" ], "x": 8, "y": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_south1_wall", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "L*L", - "n*n", - "ntn" - ], - "palettes": [ "fbmc_shelter_1_palette" ] + "palettes": [ "fbmc_shelter_1_palette", { "param": "fbmc_bed_palette" } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_S1", + "update_mapgen_id": "fbmc_shelter_1_bed_S1", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_south1_wall" ], "x": 8, "y": 20 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_south1_wall" ], "x": 8, "y": 20 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_standard_south2_wall", + "nested_mapgen_id": "fbmc_shelter_1_bed_south2_wall", "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, "mapgensize": [ 4, 4 ], "rows": [ " L", @@ -330,56 +197,14 @@ " L", " bb" ], - "palettes": [ "fbmc_shelter_1_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_standard_S2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_standard_south2_wall" ], "x": 11, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_straw_south2_wall", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " L", - " mm", - " L", - " mm" - ], - "palettes": [ "fbmc_shelter_1_palette" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_straw_S2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_straw_south2_wall" ], "x": 11, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bed_makeshift_south2_wall", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " L", - " nn", - " L", - " nn" - ], - "palettes": [ "fbmc_shelter_1_palette" ] + "palettes": [ "fbmc_shelter_1_palette", { "param": "fbmc_bed_palette" } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bed_makeshift_S2", + "update_mapgen_id": "fbmc_shelter_1_bed_S2", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_makeshift_south2_wall" ], "x": 11, "y": 19 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bed_south2_wall" ], "x": 11, "y": 19 } ] } }, { "type": "mapgen", diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_construction.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_construction.json new file mode 100644 index 0000000000000..877626c5be98e --- /dev/null +++ b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_construction.json @@ -0,0 +1,283 @@ +[ + { + "type": "palette", + "id": "fbmc_shelter_1_palette_log", + "terrain": { "w": "t_wall_log", "d": "t_door_c", "X": "t_floor" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_1_palette_rock", + "terrain": { "w": "t_rock_wall", "d": "t_door_c", "X": "t_floor" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_1_palette_standard", + "terrain": { "w": "t_wall", "d": "t_door_c", "X": "t_floor" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_1_palette_wad", + "terrain": { "w": "t_wall_wattle", "d": "t_door_makeshift_c", "X": "t_floor" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_1_palette_wood", + "terrain": { "w": "t_wall_wood", "d": "t_door_c", "X": "t_floor" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + " w", + " w", + "wdw" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_1_bedroom_NW", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW" ], "x": 8, "y": 8 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + " w", + " d", + "www" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_1_bedroom_W1", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1" ], "x": 5, "y": 10 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + " w", + " d", + "www" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_1_bedroom_W2", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2" ], "x": 5, "y": 13 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + " w", + " Xw", + " d" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + " ww", + " w ", + " w ", + " w " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_1_bedroom_SW", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "fbmc_shelter_1_bedroom_SW" ], "x": 5, "y": 19 }, + { "chunks": [ "fbmc_shelter_1_bedroom_W3" ], "x": 5, "y": 16 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + " dww", + " w", + " w", + " w" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_1_palette_log", + "fbmc_shelter_1_palette_rock", + "fbmc_shelter_1_palette_standard", + "fbmc_shelter_1_palette_wad", + "fbmc_shelter_1_palette_wood" + ] + } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ + "dw", + " " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_1_bedroom_S", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "fbmc_shelter_1_bedroom_S1" ], "x": 8, "y": 19 }, + { "chunks": [ "fbmc_shelter_1_bedroom_S2" ], "x": 12, "y": 19 } + ] + } + } +] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json deleted file mode 100644 index 6d9b6739515a9..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json +++ /dev/null @@ -1,143 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_1_palette_log", - "terrain": { "w": "t_wall_log", "d": "t_door_c", "X": "t_floor" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " w", - "wdw" - ], - "palettes": [ "fbmc_shelter_1_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_log" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_log" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W2_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_log" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " Xw", - " d" - ], - "palettes": [ "fbmc_shelter_1_palette_log" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " ww", - " w ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_1_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_log", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_SW_log" ], "x": 5, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_W3_log" ], "x": 5, "y": 16 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " dww", - " w", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_1_palette_log" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_log", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "dw", - " " - ], "palettes": [ "fbmc_shelter_1_palette_log" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_S_log", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_S1_log" ], "x": 8, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_S2_log" ], "x": 12, "y": 19 } - ] - } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json deleted file mode 100644 index 838940fad0625..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json +++ /dev/null @@ -1,143 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_1_palette_rock", - "terrain": { "w": "t_rock_wall", "d": "t_door_c", "X": "t_floor" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " w", - "wdw" - ], - "palettes": [ "fbmc_shelter_1_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_rock" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_rock" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W2_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_rock" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " Xw", - " d" - ], - "palettes": [ "fbmc_shelter_1_palette_rock" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " ww", - " w ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_1_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_rock", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_SW_rock" ], "x": 5, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_W3_rock" ], "x": 5, "y": 16 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " dww", - " w", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_1_palette_rock" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_rock", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "dw", - " " - ], "palettes": [ "fbmc_shelter_1_palette_rock" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_S_rock", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_S1_rock" ], "x": 8, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_S2_rock" ], "x": 12, "y": 19 } - ] - } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json deleted file mode 100644 index 2a811b0c3af6c..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json +++ /dev/null @@ -1,147 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_1_palette_standard", - "terrain": { "w": "t_wall", "d": "t_door_c", "X": "t_floor" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " w", - "wdw" - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_NW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " Xw", - " d" - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " ww", - " w ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_standard_bedroom_SW", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_SW" ], "x": 5, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_W3" ], "x": 5, "y": 16 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " dww", - " w", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2", - "object": { - "mapgensize": [ 2, 2 ], - "rows": [ - "dw", - " " - ], - "palettes": [ "fbmc_shelter_1_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_S", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_S1" ], "x": 8, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_S2" ], "x": 12, "y": 19 } - ] - } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json deleted file mode 100644 index 7b978b319cbe0..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json +++ /dev/null @@ -1,143 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_1_palette_wad", - "terrain": { "w": "t_wall_wattle", "d": "t_door_makeshift_c", "X": "t_floor" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " w", - "wdw" - ], - "palettes": [ "fbmc_shelter_1_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_wad" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_wad" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W2_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_wad" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " Xw", - " d" - ], - "palettes": [ "fbmc_shelter_1_palette_wad" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " ww", - " w ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_1_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_wad", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_SW_wad" ], "x": 5, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_W3_wad" ], "x": 5, "y": 16 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " dww", - " w", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_1_palette_wad" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_wad", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "dw", - " " - ], "palettes": [ "fbmc_shelter_1_palette_wad" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_S_wad", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_S1_wad" ], "x": 8, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_S2_wad" ], "x": 12, "y": 19 } - ] - } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json b/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json deleted file mode 100644 index 0feb5dc0a3a08..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json +++ /dev/null @@ -1,143 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_1_palette_wood", - "terrain": { "w": "t_wall_wood", "d": "t_door_c", "X": "t_floor" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_NW_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " w", - "wdw" - ], - "palettes": [ "fbmc_shelter_1_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_NW_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_NW_wood" ], "x": 8, "y": 8 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W1_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W1_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W1_wood" ], "x": 5, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W2_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_1_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_W2_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_1_bedroom_W2_wood" ], "x": 5, "y": 13 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_W3_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " Xw", - " d" - ], - "palettes": [ "fbmc_shelter_1_palette_wood" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_SW_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " ww", - " w ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_1_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_SW_wood", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_SW_wood" ], "x": 5, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_W3_wood" ], "x": 5, "y": 16 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S1_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " dww", - " w", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_1_palette_wood" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_1_bedroom_S2_wood", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "dw", - " " - ], "palettes": [ "fbmc_shelter_1_palette_wood" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_1_bedroom_S_wood", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_1_bedroom_S1_wood" ], "x": 8, "y": 19 }, - { "chunks": [ "fbmc_shelter_1_bedroom_S2_wood" ], "x": 12, "y": 19 } - ] - } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json index 5956748aecfd8..a01dcb51d6cc8 100644 --- a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json +++ b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json @@ -8,9 +8,6 @@ "h": "f_chair", "t": "f_table", "x": "f_coffee_table", - "b": "f_bed", - "m": "f_straw_bed", - "n": "f_makeshift_bed", "L": "f_locker", "s": "f_sofa", "C": "f_armchair", @@ -58,7 +55,7 @@ { "point": "furniture", "id": "f_woodstove", "x": 8, "y": 8 }, { "point": "furniture", "id": "f_table", "x": 9, "y": 8 } ], - "place_loot": [ { "item": "pot", "x": 8, "y": 9, "chance": 100 } ] + "place_loot": [ { "item": "pot", "x": 9, "y": 8, "chance": 100 } ] } }, { @@ -70,56 +67,48 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_nw_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "mm", - "L*" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_NW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_nw_wall" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_nw_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "nn", - "L*" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_NW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_nw_wall" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_standard_bed_nw_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "nested_mapgen_id": "fbmc_shelter_2_bed_nw_wall", + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "bb", "L*" - ], "palettes": [ "fbmc_shelter_2_palette" ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_NW", + "update_mapgen_id": "fbmc_shelter_2_bed_NW", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_standard_bed_nw_wall" ], "x": 3, "y": 11 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_nw_wall" ], "x": 3, "y": 11 } ] } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "fbmc_shelter_2_bed_w1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "bb", "L*" - ], "palettes": [ "fbmc_shelter_2_palette" ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", @@ -137,10 +126,21 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "fbmc_shelter_2_bed_w2_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "*L", "bb" - ], "palettes": [ "fbmc_shelter_2_palette" ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", @@ -151,308 +151,124 @@ { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_west_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "mm", - "L*" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_W1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_west_wall" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_W2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_west_wall" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_west2_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "*L", - "mm" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_W3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_west2_wall" ], "x": 8, "y": 15 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_west_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "nn", - "L*" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_W1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_west_wall" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_W2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_west_wall" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_west2_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "*L", - "nn" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_W3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_west2_wall" ], "x": 8, "y": 15 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_standard_southwest_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "nested_mapgen_id": "fbmc_shelter_2_bed_southwest_wall", + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "*b", "Lb" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_SW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_southwest_wall" ], "x": 7, "y": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_southwest_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "*m", - "Lm" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_SW", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_southwest_wall" ], "x": 7, "y": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_southwest_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "*n", - "Ln" - ], "palettes": [ "fbmc_shelter_2_palette" ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_SW", + "update_mapgen_id": "fbmc_shelter_2_bed_SW", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_southwest_wall" ], "x": 7, "y": 20 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_southwest_wall" ], "x": 7, "y": 20 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_standard_south1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "nested_mapgen_id": "fbmc_shelter_2_bed_south1_wall", + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "b*", "bL" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_S1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_south1_wall" ], "x": 10, "y": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_south1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "m*", - "mL" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_S1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_south1_wall" ], "x": 10, "y": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_south1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "n*", - "nL" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_S1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_south1_wall" ], "x": 10, "y": 20 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_S2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_south1_wall" ], "x": 13, "y": 21 } ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_S2", + "update_mapgen_id": "fbmc_shelter_2_bed_S1", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_south1_wall" ], "x": 13, "y": 21 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_south1_wall" ], "x": 10, "y": 20 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_S2", + "update_mapgen_id": "fbmc_shelter_2_bed_S2", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_south1_wall" ], "x": 13, "y": 21 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_south1_wall" ], "x": 13, "y": 21 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_standard_east1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "nested_mapgen_id": "fbmc_shelter_2_bed_east1_wall", + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "Lb", "*b" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_E1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_east1_wall" ], "x": 14, "y": 15 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_east1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "Lm", - "*m" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_E1", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_east1_wall" ], "x": 14, "y": 15 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_east1_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "Ln", - "*n" - ], "palettes": [ "fbmc_shelter_2_palette" ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_E1", + "update_mapgen_id": "fbmc_shelter_2_bed_E1", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_east1_wall" ], "x": 14, "y": 15 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_east1_wall" ], "x": 14, "y": 15 } ] } }, { "type": "mapgen", "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_standard_east2_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ + "nested_mapgen_id": "fbmc_shelter_2_bed_east2_wall", + "object": { + "parameters": { + "fbmc_bed_palette": { + "type": "palette_id", + "scope": "omt", + "default": { "distribution": [ "fbmc_straw_bed_palette", "fbmc_makeshift_bed_palette", "fbmc_bed_palette" ] } + } + }, + "mapgensize": [ 2, 2 ], + "rows": [ "bb", "*L" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_E2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_east2_wall" ], "x": 19, "y": 11 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_E3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_east2_wall" ], "x": 19, "y": 14 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_standard_E4", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_standard_east2_wall" ], "x": 19, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_straw_east2_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "mm", - "*L" - ], "palettes": [ "fbmc_shelter_2_palette" ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_E2", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_east2_wall" ], "x": 19, "y": 11 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_E3", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_east2_wall" ], "x": 19, "y": 14 } ] } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_straw_E4", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_straw_east2_wall" ], "x": 19, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bed_makeshift_east2_wall", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "nn", - "*L" - ], "palettes": [ "fbmc_shelter_2_palette" ] } + ], + "palettes": [ "fbmc_shelter_2_palette", { "param": "fbmc_bed_palette" } ] + } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_E2", + "update_mapgen_id": "fbmc_shelter_2_bed_E2", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_east2_wall" ], "x": 19, "y": 11 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_east2_wall" ], "x": 19, "y": 11 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_E3", + "update_mapgen_id": "fbmc_shelter_2_bed_E3", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_east2_wall" ], "x": 19, "y": 14 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_east2_wall" ], "x": 19, "y": 14 } ] } }, { "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bed_makeshift_E4", + "update_mapgen_id": "fbmc_shelter_2_bed_E4", "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_makeshift_east2_wall" ], "x": 19, "y": 17 } ] } + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bed_east2_wall" ], "x": 19, "y": 17 } ] } }, { "type": "mapgen", diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_construction.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_construction.json new file mode 100644 index 0000000000000..30779ad6a1df5 --- /dev/null +++ b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_construction.json @@ -0,0 +1,439 @@ +[ + { + "type": "palette", + "id": "fbmc_shelter_2_palette_log", + "terrain": { "w": "t_wall_log", "d": "t_door_c" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_2_palette_rock", + "terrain": { "w": "t_rock_wall", "d": "t_door_c" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_2_palette_standard", + "terrain": { "w": "t_wall_w", "d": "t_door_c" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_2_palette_wad", + "terrain": { "w": "t_wall_wattle", "d": "t_door_makeshift_c" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "palette", + "id": "fbmc_shelter_2_palette_wood", + "terrain": { "w": "t_wall_wood", "d": "t_door_c" }, + "furniture": { "w": "f_clear", "d": "f_clear" } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_NW", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + " w", + " d", + "www" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_NW", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_NW" ], "x": 3, "y": 11 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_W1", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + " w", + " d", + "www" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_W1", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W1" ], "x": 3, "y": 14 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_W2", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + " w ", + " d ", + " w ", + " w " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_W2", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W2" ], "x": 3, "y": 17 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_W3", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + "www ", + "d w", + "w w", + "www " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_W3", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W3" ], "x": 7, "y": 14 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_SW", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + "wdww", + " w", + " w", + " " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_SW", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_SW" ], "x": 6, "y": 19 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_S1", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + "wdw", + " w", + " w" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_S2", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + "www", + " d", + " w" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_S", + "method": "json", + "object": { + "place_nested": [ + { "chunks": [ "fbmc_shelter_2_bedroom_S1" ], "x": 10, "y": 19 }, + { "chunks": [ "fbmc_shelter_2_bedroom_S2" ], "x": 13, "y": 20 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_east1", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + " www", + "w w", + "w w", + " dww" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_E1", + "method": "json", + "object": { + "set": [ + { "point": "terrain", "id": "t_door_c", "x": 12, "y": 14 }, + { "point": "terrain", "id": "t_door_c", "x": 12, "y": 17 } + ], + "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east1" ], "x": 13, "y": 14 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_east2", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + "w ", + "w ", + "d ", + "www " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_E2", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east2" ], "x": 18, "y": 10 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_east3", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 3, 3 ], + "rows": [ + "w ", + "d ", + "www" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_E3", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east3" ], "x": 18, "y": 14 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "fbmc_shelter_2_bedroom_east4", + "object": { + "parameters": { + "fbmc_construction_palette": { + "type": "palette_id", + "scope": "omt", + "default": { + "distribution": [ + "fbmc_shelter_2_palette_log", + "fbmc_shelter_2_palette_rock", + "fbmc_shelter_2_palette_standard", + "fbmc_shelter_2_palette_wad", + "fbmc_shelter_2_palette_wood" + ] + } + } + }, + "mapgensize": [ 4, 4 ], + "rows": [ + "w ", + "d ", + "w ", + "w " + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ { "param": "fbmc_construction_palette" } ] + } + }, + { + "type": "mapgen", + "update_mapgen_id": "fbmc_shelter_2_bedroom_E4", + "method": "json", + "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east4" ], "x": 18, "y": 17 } ] } + } +] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json deleted file mode 100644 index 8e0291ae8f9df..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json +++ /dev/null @@ -1,239 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_2_palette_log", - "terrain": { "w": "t_wall_log", "d": "t_door_c" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_NW_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_NW_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_NW_log" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W1_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W1_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W1_log" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W2_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " w ", - " d ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W2_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W2_log" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W3_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "www ", - "d w", - "w w", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W3_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W3_log" ], "x": 7, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_SW_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "wdww", - " w", - " w", - " " - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_SW_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_SW_log" ], "x": 6, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S1_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "wdw", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S2_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "www", - " d", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_S_log", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_2_bedroom_S1_log" ], "x": 10, "y": 19 }, - { "chunks": [ "fbmc_shelter_2_bedroom_S2_log" ], "x": 13, "y": 20 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east1_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " www", - "w w", - "w w", - " dww" - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E1_log", - "method": "json", - "object": { - "set": [ - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 14 }, - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 17 } - ], - "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east1_log" ], "x": 13, "y": 14 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east2_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "w ", - "d ", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E2_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east2_log" ], "x": 18, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east3_log", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "w ", - "d ", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E3_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east3_log" ], "x": 18, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east4_log", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "d ", - "w ", - "w " - ], - "palettes": [ "fbmc_shelter_2_palette_log" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E4_log", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east4_log" ], "x": 18, "y": 17 } ] } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json deleted file mode 100644 index 04af9fe530895..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json +++ /dev/null @@ -1,239 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_2_palette_rock", - "terrain": { "w": "t_rock_wall", "d": "t_door_c" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_NW_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_NW_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_NW_rock" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W1_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W1_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W1_rock" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W2_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " w ", - " d ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W2_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W2_rock" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W3_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "www ", - "d w", - "w w", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W3_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W3_rock" ], "x": 7, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_SW_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "wdww", - " w", - " w", - " " - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_SW_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_SW_rock" ], "x": 6, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S1_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "wdw", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S2_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "www", - " d", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_S_rock", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_2_bedroom_S1_rock" ], "x": 10, "y": 19 }, - { "chunks": [ "fbmc_shelter_2_bedroom_S2_rock" ], "x": 13, "y": 20 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east1_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " www", - "w w", - "w w", - " dww" - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E1_rock", - "method": "json", - "object": { - "set": [ - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 14 }, - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 17 } - ], - "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east1_rock" ], "x": 13, "y": 14 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east2_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "w ", - "d ", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E2_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east2_rock" ], "x": 18, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east3_rock", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "w ", - "d ", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E3_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east3_rock" ], "x": 18, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east4_rock", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "d ", - "w ", - "w " - ], - "palettes": [ "fbmc_shelter_2_palette_rock" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E4_rock", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east4_rock" ], "x": 18, "y": 17 } ] } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json deleted file mode 100644 index 5d4921f2ad2a9..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json +++ /dev/null @@ -1,239 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_2_palette_standard", - "terrain": { "w": "t_wall_w", "d": "t_door_c" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_NW_standard", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_NW_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_NW_standard" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W1_standard", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W1_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W1_standard" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W2_standard", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " w ", - " d ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W2_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W2_standard" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W3_standard", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "www ", - "d w", - "w w", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W3_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W3_standard" ], "x": 7, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_SW_standard", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "wdww", - " w", - " w", - " " - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_SW_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_SW_standard" ], "x": 6, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S1_standard", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "wdw", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S2_standard", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "www", - " d", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_S_standard", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_2_bedroom_S1_standard" ], "x": 10, "y": 19 }, - { "chunks": [ "fbmc_shelter_2_bedroom_S2_standard" ], "x": 13, "y": 20 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east1_standard", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " www", - "w w", - "w w", - " dww" - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E1_standard", - "method": "json", - "object": { - "set": [ - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 14 }, - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 17 } - ], - "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east1_standard" ], "x": 13, "y": 14 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east2_standard", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "w ", - "d ", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E2_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east2_standard" ], "x": 18, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east3_standard", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "w ", - "d ", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E3_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east3_standard" ], "x": 18, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east4_standard", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "d ", - "w ", - "w " - ], - "palettes": [ "fbmc_shelter_2_palette_standard" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E4_standard", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east4_standard" ], "x": 18, "y": 17 } ] } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json deleted file mode 100644 index 2755dfc951a44..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json +++ /dev/null @@ -1,239 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_2_palette_wad", - "terrain": { "w": "t_wall_wattle", "d": "t_door_makeshift_c" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_NW_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_NW_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_NW_wad" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W1_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W1_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W1_wad" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W2_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " w ", - " d ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W2_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W2_wad" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W3_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "www ", - "d w", - "w w", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W3_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W3_wad" ], "x": 7, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_SW_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "wdww", - " w", - " w", - " " - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_SW_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_SW_wad" ], "x": 6, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S1_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "wdw", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S2_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "www", - " d", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_S_wad", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_2_bedroom_S1_wad" ], "x": 10, "y": 19 }, - { "chunks": [ "fbmc_shelter_2_bedroom_S2_wad" ], "x": 13, "y": 20 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east1_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " www", - "w w", - "w w", - " dww" - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E1_wad", - "method": "json", - "object": { - "set": [ - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 14 }, - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 17 } - ], - "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east1_wad" ], "x": 13, "y": 14 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east2_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "w ", - "d ", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E2_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east2_wad" ], "x": 18, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east3_wad", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "w ", - "d ", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E3_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east3_wad" ], "x": 18, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east4_wad", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "d ", - "w ", - "w " - ], - "palettes": [ "fbmc_shelter_2_palette_wad" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E4_wad", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east4_wad" ], "x": 18, "y": 17 } ] } - } -] diff --git a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json b/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json deleted file mode 100644 index c40d2bbfb859e..0000000000000 --- a/data/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json +++ /dev/null @@ -1,239 +0,0 @@ -[ - { - "type": "palette", - "id": "fbmc_shelter_2_palette_wood", - "terrain": { "w": "t_wall_wood", "d": "t_door_c" }, - "furniture": { "w": "f_clear", "d": "f_clear" } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_NW_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_NW_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_NW_wood" ], "x": 3, "y": 11 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W1_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - " w", - " d", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W1_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W1_wood" ], "x": 3, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W2_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " w ", - " d ", - " w ", - " w " - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W2_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W2_wood" ], "x": 3, "y": 17 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_W3_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "www ", - "d w", - "w w", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_W3_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_W3_wood" ], "x": 7, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_SW_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "wdww", - " w", - " w", - " " - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_SW_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_SW_wood" ], "x": 6, "y": 19 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S1_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "wdw", - " w", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_S2_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "www", - " d", - " w" - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_S_wood", - "method": "json", - "object": { - "place_nested": [ - { "chunks": [ "fbmc_shelter_2_bedroom_S1_wood" ], "x": 10, "y": 19 }, - { "chunks": [ "fbmc_shelter_2_bedroom_S2_wood" ], "x": 13, "y": 20 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east1_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - " www", - "w w", - "w w", - " dww" - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E1_wood", - "method": "json", - "object": { - "set": [ - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 14 }, - { "point": "terrain", "id": "t_door_c", "x": 12, "y": 17 } - ], - "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east1_wood" ], "x": 13, "y": 14 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east2_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "w ", - "d ", - "www " - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E2_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east2_wood" ], "x": 18, "y": 10 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east3_wood", - "object": { - "mapgensize": [ 3, 3 ], - "rows": [ - "w ", - "d ", - "www" - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E3_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east3_wood" ], "x": 18, "y": 14 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "fbmc_shelter_2_bedroom_east4_wood", - "object": { - "mapgensize": [ 4, 4 ], - "rows": [ - "w ", - "d ", - "w ", - "w " - ], - "palettes": [ "fbmc_shelter_2_palette_wood" ] - } - }, - { - "type": "mapgen", - "update_mapgen_id": "fbmc_shelter_2_bedroom_E4_wood", - "method": "json", - "object": { "place_nested": [ { "chunks": [ "fbmc_shelter_2_bedroom_east4_wood" ], "x": 18, "y": 17 } ] } - } -] diff --git a/data/json/mapgen/map_extras/airdrop.json b/data/json/mapgen/map_extras/airdrop.json index f5a920803dc4c..235f9b3f79c09 100644 --- a/data/json/mapgen/map_extras/airdrop.json +++ b/data/json/mapgen/map_extras/airdrop.json @@ -7,7 +7,7 @@ "object": { "place_nested": [ { - "chunks": [ [ "mx_airdrop_humanitarian_full", 10 ], [ "mx_airdrop_humanitarian_looted", 80 ], [ "mx_airdrop_mil", 2 ] ], + "chunks": [ [ "mx_airdrop_humanitarian_full", 5 ], [ "mx_airdrop_humanitarian_looted", 93 ], [ "mx_airdrop_mil", 2 ] ], "x": 0, "y": 0 } diff --git a/data/json/mapgen/office_tower.json b/data/json/mapgen/office_tower.json index 2e0f1cd6c17a7..ebb2bc903592f 100644 --- a/data/json/mapgen/office_tower.json +++ b/data/json/mapgen/office_tower.json @@ -484,7 +484,7 @@ "~~~#___,,___#~~~~~~~#''''''#HEE#'''#___,,___#~~~", "~~~#___,,___#~~~~~~~#''''''-EEE#'''#__,,,,__#~~~", "~~~#__,,,,__#~~~~~~~#''''''-EEE#'R'#___,,___#~~~", - "~~~#___,,___#~~~~~~~#''''''#EEE#R'#........- ", + " -...........................#####........- ", " -........................................- ", " -........................................- ", " -........................................- ", @@ -547,14 +554,7 @@ " -........................................- ", " -........................................- ", " -........................................- ", - " -........................................- ", - " -........................................- ", - " -........................................- ", - " -........................................- ", - " -........................................- ", - " -........................................- ", - " -........................................- ", - " -........................................- ", + " -...Z.............................Z......- ", " -........................................- ", " -........................................- ", " -........................................- ", @@ -568,7 +568,20 @@ " " ], "palettes": [ "roof_palette" ], - "item": { ".": { "item": "feces_bird", "chance": 2 } } + "terrain": { "#": "t_concrete_wall", "R": "t_glass_railing", "'": "t_thconc_floor" }, + "item": { ".": { "item": "feces_bird", "chance": 2 } }, + "nested": { + "Z": { + "chunks": [ + [ "null", 20 ], + [ "roof_4x4_utility_1", 20 ], + [ "roof_4x4_utility", 20 ], + [ "roof_2x2_utilities", 20 ], + [ "roof_2x2_utilities_c", 20 ], + [ "roof_2x2_utilities_b", 20 ] + ] + } + } } } ] diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index da8e64e01cbda..dfbf5d9d61053 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -299,6 +299,7 @@ "name": { "str": "Fake Spell" }, "description": "A spell that doesn't do anything.", "valid_targets": [ "hostile", "ally", "ground" ], + "message": "", "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], "shape": "blast", "min_damage": 1, diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index b47eb11ac527a..4560db0ea2017 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -2040,6 +2040,7 @@ "material": [ "flesh" ], "symbol": "H", "color": "brown", + "starting_ammo": { "milk_raw": 4 }, "morale": 20, "aggro_character": false, "melee_skill": 6, @@ -2059,7 +2060,7 @@ "special_attacks": [ [ "EAT_CROP", 60 ] ], "zombify_into": "mon_zombie_horse", "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], "armor": { "bash": 2, "electric": 1 } }, { diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json index c4df884ef60f9..1d3cf0dfca502 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json @@ -114,14 +114,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bed_standard_NW", - "description": "Let's furnish the southeast bedroom with a regular bed.", + "result": "faction_base_modular_shelter_1_bed_NW", + "description": "Let's furnish the southeast bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_standard_NW", + "construction_blueprint": "fbmc_shelter_1_bed_NW", "blueprint_name": "furnish the NW bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_nw" }, { "id": "bed", "amount": 1 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_nw" } ] @@ -129,14 +132,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_standard_W1", - "description": "Let's furnish the west bedroom with regular beds.", + "result": "faction_base_modular_shelter_1_beds_W1", + "description": "Let's furnish the west bedroom with beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bed_W1", "blueprint_name": "furnish the W bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" }, { "id": "fbmc_shelter_1_bed_nw" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w1" }, { "id": "bed", "amount": 2 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w1" } ] @@ -144,14 +150,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_standard_W2", - "description": "Let's furnish the west bedroom with regular beds.", + "result": "faction_base_modular_shelter_1_beds_W2", + "description": "Let's furnish the west bedroom with beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bed_W2", "blueprint_name": "furnish the W bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" }, { "id": "fbmc_shelter_1_bed_w1" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w2" }, { "id": "bed", "amount": 3 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w2" } ] @@ -159,14 +168,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_standard_W3", - "description": "Let's furnish the west bedroom with regular beds.", + "result": "faction_base_modular_shelter_1_beds_W3", + "description": "Let's furnish the west bedroom with beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bed_W3", "blueprint_name": "furnish the W bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" }, { "id": "fbmc_shelter_1_bed_w2" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w3" }, { "id": "bed", "amount": 4 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w3" } ] @@ -174,149 +186,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bed_straw_NW", - "description": "Let's furnish the southeast bedroom with a straw bed.", + "result": "faction_base_modular_shelter_1_bed_SW", + "description": "Let's furnish the southwest bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_NW", - "blueprint_name": "furnish the NW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_nw" }, { "id": "bed", "amount": 1 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_nw" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_straw_W1", - "description": "Let's furnish the west bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_W1", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" }, { "id": "fbmc_shelter_1_bed_nw" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w1" }, { "id": "bed", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_straw_W2", - "description": "Let's furnish the west bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_W2", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" }, { "id": "fbmc_shelter_1_bed_w1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w2" }, { "id": "bed", "amount": 3 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_straw_W3", - "description": "Let's furnish the west bedroom with straw beds.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_W3", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" }, { "id": "fbmc_shelter_1_bed_w2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w3" }, { "id": "bed", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w3" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bed_makeshift_NW", - "description": "Let's furnish the southeast bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_NW", - "blueprint_name": "furnish the NW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_nw" }, { "id": "bed", "amount": 1 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_nw" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_makeshift_W1", - "description": "Let's furnish the west bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_W1", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" }, { "id": "fbmc_shelter_1_bed_nw" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w1" }, { "id": "bed", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_makeshift_W2", - "description": "Let's furnish the west bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_W2", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" }, { "id": "fbmc_shelter_1_bed_w1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w2" }, { "id": "bed", "amount": 3 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_makeshift_W3", - "description": "Let's furnish the west bedroom with makeshift beds.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_W3", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" }, { "id": "fbmc_shelter_1_bed_w2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_w3" }, { "id": "bed", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_w3" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bed_standard_SW", - "description": "Let's furnish the southwest bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_standard_SW", - "blueprint_name": "furnish the SW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_w3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_sw" }, { "id": "bed", "amount": 5 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_sw" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bed_straw_SW", - "description": "Let's furnish the southwest bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_SW", + "construction_blueprint": "fbmc_shelter_1_bed_SW", "blueprint_name": "furnish the SW bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_w3" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_sw" }, { "id": "bed", "amount": 5 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_sw" } ] @@ -324,44 +204,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bed_makeshift_SW", - "description": "Let's furnish the southwest bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_SW", - "blueprint_name": "furnish the SW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_w3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_sw" }, { "id": "bed", "amount": 5 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_sw" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_standard_S1", - "description": "Let's furnish the southern bedroom with regular beds.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_standard_S1", - "blueprint_name": "furnish the S bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom6" }, { "id": "fbmc_shelter_1_bed_sw" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s1" }, { "id": "bed", "amount": 7 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_straw_S1", - "description": "Let's furnish the southern bedroom with straw beds.", + "result": "faction_base_modular_shelter_1_beds_S1", + "description": "Let's furnish the southern bedroom with beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_S1", + "construction_blueprint": "fbmc_shelter_1_bed_S1", "blueprint_name": "furnish the S bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom6" }, { "id": "fbmc_shelter_1_bed_sw" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s1" }, { "id": "bed", "amount": 7 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s1" } ] @@ -369,59 +222,17 @@ { "type": "recipe", "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_makeshift_S1", - "description": "Let's furnish the southern bedroom with makeshift beds.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_S1", - "blueprint_name": "furnish the S bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom6" }, { "id": "fbmc_shelter_1_bed_sw" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s1" }, { "id": "bed", "amount": 7 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_standard_S2", - "description": "Let's furnish the southwestern bedroom with regular beds.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_standard_S2", - "blueprint_name": "furnish the SW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_s1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_straw_S2", - "description": "Let's furnish the southwestern bedroom with straw beds.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_straw_S2", - "blueprint_name": "furnish the SW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_s1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_beds_makeshift_S2", - "description": "Let's furnish the southwestern bedroom with makeshift beds.", + "result": "faction_base_modular_shelter_1_beds_S2", + "description": "Let's furnish the southwestern bedroom with beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bed_makeshift_S2", + "construction_blueprint": "fbmc_shelter_1_bed_S2", "blueprint_name": "furnish the SW bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bed_s1" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bed_s2" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bed_s2" } ] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_construction.json similarity index 58% rename from data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json rename to data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_construction.json index fc6138e3a47b7..a959d31975edf 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_construction.json @@ -9,7 +9,16 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bedroom_NW", - "blueprint_name": "build NW standard bedroom walls", + "blueprint_name": "build NW bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_1_palette_log": "Log walls", + "fbmc_shelter_1_palette_rock": "Rock walls", + "fbmc_shelter_1_palette_standard": "Standard walls", + "fbmc_shelter_1_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_1_palette_wood": "Wooden walls" + } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ] @@ -24,7 +33,16 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bedroom_W1", - "blueprint_name": "build W standard bedroom walls", + "blueprint_name": "build W bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_1_palette_log": "Log walls", + "fbmc_shelter_1_palette_rock": "Rock walls", + "fbmc_shelter_1_palette_standard": "Standard walls", + "fbmc_shelter_1_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_1_palette_wood": "Wooden walls" + } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ] @@ -39,7 +57,16 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bedroom_W2", - "blueprint_name": "build W standard bedroom walls", + "blueprint_name": "build W bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_1_palette_log": "Log walls", + "fbmc_shelter_1_palette_rock": "Rock walls", + "fbmc_shelter_1_palette_standard": "Standard walls", + "fbmc_shelter_1_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_1_palette_wood": "Wooden walls" + } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ] @@ -53,8 +80,17 @@ "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_standard_bedroom_SW", - "blueprint_name": "build SW standard bedroom walls", + "construction_blueprint": "fbmc_shelter_1_bedroom_SW", + "blueprint_name": "build SW bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_1_palette_log": "Log walls", + "fbmc_shelter_1_palette_rock": "Rock walls", + "fbmc_shelter_1_palette_standard": "Standard walls", + "fbmc_shelter_1_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_1_palette_wood": "Wooden walls" + } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ] @@ -69,7 +105,16 @@ "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_1_bedroom_S", - "blueprint_name": "build S standard bedroom walls", + "blueprint_name": "build S bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_1_palette_log": "Log walls", + "fbmc_shelter_1_palette_rock": "Rock walls", + "fbmc_shelter_1_palette_standard": "Standard walls", + "fbmc_shelter_1_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_1_palette_wood": "Wooden walls" + } + }, "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ], "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json deleted file mode 100644 index 33fd40c228684..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom1_log", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_NW_log", - "blueprint_name": "build NW log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom2_log", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W1_log", - "blueprint_name": "build W log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom3_log", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W2_log", - "blueprint_name": "build W log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom5_log", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_SW_log", - "blueprint_name": "build SW log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom6_log", - "description": "Let's build some living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_S_log", - "blueprint_name": "build S log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json deleted file mode 100644 index 7ac3de8ff113d..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom1_rock", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_NW_rock", - "blueprint_name": "build NW rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom2_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W1_rock", - "blueprint_name": "build W rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom3_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W2_rock", - "blueprint_name": "build W rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom5_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_SW_rock", - "blueprint_name": "build SW rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom6_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_S_rock", - "blueprint_name": "build S rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json deleted file mode 100644 index 5fb4ab8cbd613..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom1_wad", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_NW_wad", - "blueprint_name": "build NW wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom2_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W1_wad", - "blueprint_name": "build W wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom3_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W2_wad", - "blueprint_name": "build W wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom5_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_SW_wad", - "blueprint_name": "build SW wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom6_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_S_wad", - "blueprint_name": "build S wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json deleted file mode 100644 index 5fc753b7cfdb4..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom1_wood", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_NW_wood", - "blueprint_name": "build NW wood bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom1" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom2_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W1_wood", - "blueprint_name": "build W wood bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom2" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom3_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_W2_wood", - "blueprint_name": "build W wood bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom3" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom5_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_SW_wood", - "blueprint_name": "build SW wood bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom5" } ] - }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "faction_base_modular_shelter_1_bedroom6_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_1_bedroom_S_wood", - "blueprint_name": "build S wood bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_1_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_1_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_1_bedroom6" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json index 53f047e4a2c98..87ae9f88cd240 100644 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json @@ -108,462 +108,187 @@ }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_bed_standard_NW", - "description": "Let's furnish the northwest bedroom with a regular bed.", + "result": "faction_base_modular_shelter_2_bed_NW", + "description": "Let's furnish the northwest bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_NW", + "construction_blueprint": "fbmc_shelter_2_bed_NW", "blueprint_name": "furnish the NW bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_nw" }, { "id": "bed", "amount": 1 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_nw" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_W1", - "description": "Let's furnish the west bedroom with a regular bed.", + "result": "faction_base_modular_shelter_2_beds_W1", + "description": "Let's furnish the west bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_2_bed_W1", "blueprint_name": "furnish the W bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" }, { "id": "fbmc_shelter_2_bed_nw" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w1" }, { "id": "bed", "amount": 2 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w1" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_W2", - "description": "Let's furnish the west bedroom with a regular bed.", + "result": "faction_base_modular_shelter_2_beds_W2", + "description": "Let's furnish the west bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_2_bed_W2", "blueprint_name": "furnish the W bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" }, { "id": "fbmc_shelter_2_bedroom_w1" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w2" }, { "id": "bed", "amount": 3 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w2" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_W3", - "description": "Let's furnish the west bedroom with a regular bed.", + "result": "faction_base_modular_shelter_2_beds_W3", + "description": "Let's furnish the west bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, "construction_blueprint": "fbmc_shelter_2_bed_W3", "blueprint_name": "furnish the W bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w4" }, { "id": "bed", "amount": 4 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w4" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_bed_straw_NW", - "description": "Let's furnish the southeast bedroom with a straw bed.", + "result": "faction_base_modular_shelter_2_bed_SW", + "description": "Let's furnish the southwest bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_NW", - "blueprint_name": "furnish the NW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_nw" }, { "id": "bed", "amount": 1 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_nw" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_W1", - "description": "Let's furnish the west bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_W1", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" }, { "id": "fbmc_shelter_2_bed_nw" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w1" }, { "id": "bed", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_W2", - "description": "Let's furnish the west bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_W2", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" }, { "id": "fbmc_shelter_2_bedroom_w1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w2" }, { "id": "bed", "amount": 3 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_W3", - "description": "Let's furnish the west bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_W3", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w4" }, { "id": "bed", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bed_makeshift_NW", - "description": "Let's furnish the southeast bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_NW", - "blueprint_name": "furnish the NW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_nw" }, { "id": "bed", "amount": 1 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_nw" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_makeshift_W1", - "description": "Let's furnish the west bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_W1", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" }, { "id": "fbmc_shelter_2_bed_nw" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w1" }, { "id": "bed", "amount": 2 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_makeshift_W2", - "description": "Let's furnish the west bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_W2", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" }, { "id": "fbmc_shelter_2_bedroom_w1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w2" }, { "id": "bed", "amount": 3 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_makeshift_W3", - "description": "Let's furnish the west bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_W3", - "blueprint_name": "furnish the W bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom_w4" }, { "id": "bed", "amount": 4 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom_w4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bed_standard_SW", - "description": "Let's furnish the southwest bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_SW", - "blueprint_name": "furnish the SW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_sw" }, { "id": "bed", "amount": 5 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_sw" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bed_straw_SW", - "description": "Let's furnish the southwest bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_SW", - "blueprint_name": "furnish the SW bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_sw" }, { "id": "bed", "amount": 5 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_sw" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bed_makeshift_SW", - "description": "Let's furnish the southwest bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_SW", + "construction_blueprint": "fbmc_shelter_2_bed_SW", "blueprint_name": "furnish the SW bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_sw" }, { "id": "bed", "amount": 5 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_sw" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_S1", - "description": "Let's furnish the southern bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_S1", - "blueprint_name": "furnish the S bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_s1" }, { "id": "bed", "amount": 6 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_s1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_S1", - "description": "Let's furnish the southern bedroom with a straw bed.", + "result": "faction_base_modular_shelter_2_beds_S1", + "description": "Let's furnish the southern bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_S1", + "construction_blueprint": "fbmc_shelter_2_bed_S1", "blueprint_name": "furnish the S bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_s1" }, { "id": "bed", "amount": 6 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_s1" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_makeshift_S1", - "description": "Let's furnish the southern bedroom with a makeshift bed.", + "result": "faction_base_modular_shelter_2_beds_S2", + "description": "Let's furnish the southern bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_S1", - "blueprint_name": "furnish the S bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_s1" }, { "id": "bed", "amount": 6 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_s1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_S2", - "description": "Let's furnish the southern bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_S2", + "construction_blueprint": "fbmc_shelter_2_bed_S2", "blueprint_name": "furnish the S bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_s2" }, { "id": "bed", "amount": 7 } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_s2" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_S2", - "description": "Let's furnish the southern bedroom with a straw bed.", + "result": "faction_base_modular_shelter_2_beds_E1", + "description": "Let's furnish the eastern bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_S2", - "blueprint_name": "furnish the S bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_s2" }, { "id": "bed", "amount": 7 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_s2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_makeshift_S2", - "description": "Let's furnish the southern bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_S2", - "blueprint_name": "furnish the S bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_s2" }, { "id": "bed", "amount": 7 } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_s2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_E1", - "description": "Let's furnish the eastern bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_E1", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_E1", - "description": "Let's furnish the eastern bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_E1", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_1_bed_makeshift_E1", - "description": "Let's furnish the eastern bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_E1", + "construction_blueprint": "fbmc_shelter_2_bed_E1", "blueprint_name": "furnish the E bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e1" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e1" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_E2", - "description": "Let's furnish the eastern bedroom with a regular bed.", + "result": "faction_base_modular_shelter_2_beds_E2", + "description": "Let's furnish the eastern bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_E2", + "construction_blueprint": "fbmc_shelter_2_bed_E2", "blueprint_name": "furnish the E bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e2" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e2" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_E2", - "description": "Let's furnish the eastern bedroom with a straw bed.", + "result": "faction_base_modular_shelter_2_beds_E3", + "description": "Let's furnish the eastern bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_E2", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_1_bed_makeshift_E2", - "description": "Let's furnish the eastern bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_E2", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_E3", - "description": "Let's furnish the eastern bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_E3", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_E3", - "description": "Let's furnish the eastern bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_E3", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_1_bed_makeshift_E3", - "description": "Let's furnish the eastern bedroom with a makeshift bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_E3", + "construction_blueprint": "fbmc_shelter_2_bed_E3", "blueprint_name": "furnish the E bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e3" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e3" } ] }, { "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_standard_E4", - "description": "Let's furnish the eastern bedroom with a regular bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_standard_E4", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_beds_straw_E4", - "description": "Let's furnish the eastern bedroom with a straw bed.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_straw_E4", - "blueprint_name": "furnish the E bedroom", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_1_bed_makeshift_E4", - "description": "Let's furnish the eastern bedroom with a makeshift bed.", + "result": "faction_base_modular_shelter_2_beds_E4", + "description": "Let's furnish the eastern bedroom with a set of beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bed_makeshift_E4", + "construction_blueprint": "fbmc_shelter_2_bed_E4", "blueprint_name": "furnish the E bedroom", + "blueprint_parameter_names": { + "fbmc_bed_palette": { "fbmc_straw_bed_palette": "Straw bed", "fbmc_makeshift_bed_palette": "Makeshift bed", "fbmc_bed_palette": "Bed" } + }, "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom10" } ], "blueprint_provides": [ { "id": "fbmc_shelter_2_bed_e4" } ], "blueprint_excludes": [ { "id": "fbmc_shelter_2_bed_e4" } ] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_construction.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_construction.json new file mode 100644 index 0000000000000..9686400f15c11 --- /dev/null +++ b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_construction.json @@ -0,0 +1,232 @@ +[ + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom1", + "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_NW", + "blueprint_name": "build NW bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_fire" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom1" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom1" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom2", + "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_W1", + "blueprint_name": "build W bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom2" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom2" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom3", + "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_W2", + "blueprint_name": "build W bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom3" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom3" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom4", + "description": "Let's build some living quarters so we can expand. We will enclose the west side of the stairs.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_W3", + "blueprint_name": "build W bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom4" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom4" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom5", + "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_SW", + "blueprint_name": "build SW bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom5" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom5" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom6", + "description": "Let's build two living quarters so we can expand. We will continue along the south wall.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_S", + "blueprint_name": "build S bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom6" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom6" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom7", + "description": "Let's build another bedroom so we can expand. We will continue to enclose the stairwell and add new doors.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_E1", + "blueprint_name": "build central E bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom7" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom7" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom8", + "description": "Let's build another bedroom on the east wall.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_E2", + "blueprint_name": "build E bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom8" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom8" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom9", + "description": "Let's build another bedroom on the east wall.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_E3", + "blueprint_name": "build E bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom9" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom9" } ] + }, + { + "type": "recipe", + "result": "faction_base_modular_shelter_2_bedroom10", + "description": "Let's build another bedroom on the east wall.", + "category": "CC_BUILDING", + "subcategory": "CSC_BUILDING_BASES", + "autolearn": false, + "never_learn": true, + "construction_blueprint": "fbmc_shelter_2_bedroom_E4", + "blueprint_name": "build E bedroom walls", + "blueprint_parameter_names": { + "fbmc_construction_palette": { + "fbmc_shelter_2_palette_log": "Log walls", + "fbmc_shelter_2_palette_rock": "Rock walls", + "fbmc_shelter_2_palette_standard": "Standard walls", + "fbmc_shelter_2_palette_wad": "Wattle-and-daub walls", + "fbmc_shelter_2_palette_wood": "Wooden walls" + } + }, + "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], + "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom10" } ], + "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom10" } ] + } +] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json deleted file mode 100644 index c55019a227d60..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom1_log", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_NW_log", - "blueprint_name": "build NW log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom2_log", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W1_log", - "blueprint_name": "build W log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom3_log", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W2_log", - "blueprint_name": "build W log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom4_log", - "description": "Let's build some living quarters so we can expand. We will enclose the west side of the stairs.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W3_log", - "blueprint_name": "build W log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom5_log", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_SW_log", - "blueprint_name": "build SW log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom5" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom6_log", - "description": "Let's build two living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_S_log", - "blueprint_name": "build S log bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom6" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom7_log", - "description": "Let's build another bedroom so we can expand. We will continue to enclose the stairwell and add new doors.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E1_log", - "blueprint_name": "build central E bedroom log walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom7" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom8_log", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E2_log", - "blueprint_name": "build E bedroom log walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom8" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom9_log", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E3_log", - "blueprint_name": "build E bedroom log walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom9" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom10_log", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E4_log", - "blueprint_name": "build E bedroom log walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom10" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json deleted file mode 100644 index 1ee6721351b1c..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom1_rock", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_NW_rock", - "blueprint_name": "build NW rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom2_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W1_rock", - "blueprint_name": "build W rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom3_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W2_rock", - "blueprint_name": "build W rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom4_rock", - "description": "Let's build some living quarters so we can expand. We will enclose the west side of the stairs.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W3_rock", - "blueprint_name": "build W rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom5_rock", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_SW_rock", - "blueprint_name": "build SW rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom5" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom6_rock", - "description": "Let's build two living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_S_rock", - "blueprint_name": "build S rock bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom6" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom7_rock", - "description": "Let's build another bedroom so we can expand. We will continue to enclose the stairwell and add new doors.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E1_rock", - "blueprint_name": "build central E bedroom rock walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom7" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom8_rock", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E2_rock", - "blueprint_name": "build E bedroom rock walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom8" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom9_rock", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E3_rock", - "blueprint_name": "build E bedroom rock walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom9" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom10_rock", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E4_rock", - "blueprint_name": "build E bedroom rock walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom10" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json deleted file mode 100644 index bef37997f451e..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom1_standard", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_NW_standard", - "blueprint_name": "build NW standard bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom2_standard", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W1_standard", - "blueprint_name": "build W standard bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom3_standard", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W2_standard", - "blueprint_name": "build W standard bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom4_standard", - "description": "Let's build some living quarters so we can expand. We will enclose the west side of the stairs.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W3_standard", - "blueprint_name": "build W standard bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom5_standard", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_SW_standard", - "blueprint_name": "build SW standard bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom5" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom6_standard", - "description": "Let's build two living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_S_standard", - "blueprint_name": "build S standard bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom6" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom7_standard", - "description": "Let's build another bedroom so we can expand. We will continue to enclose the stairwell and add new doors.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E1_standard", - "blueprint_name": "build central E bedroom standard walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom7" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom8_standard", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E2_standard", - "blueprint_name": "build E bedroom standard walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom8" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom9_standard", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E3_standard", - "blueprint_name": "build E bedroom standard walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom9" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom10_standard", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E4_standard", - "blueprint_name": "build E bedroom standard walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom10" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json deleted file mode 100644 index b146fc2e516b0..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom1_wad", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_NW_wad", - "blueprint_name": "build NW wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom2_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W1_wad", - "blueprint_name": "build W wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom3_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W2_wad", - "blueprint_name": "build W wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom4_wad", - "description": "Let's build some living quarters so we can expand. We will enclose the west side of the stairs.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W3_wad", - "blueprint_name": "build W wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom5_wad", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_SW_wad", - "blueprint_name": "build SW wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom5" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom6_wad", - "description": "Let's build two living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_S_wad", - "blueprint_name": "build S wattle and daub bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom6" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom7_wad", - "description": "Let's build another bedroom so we can expand. We will continue to enclose the stairwell and add new doors.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E1_wad", - "blueprint_name": "build central E bedroom wattle and daub", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom7" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom8_wad", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E2_wad", - "blueprint_name": "build E bedroom wattle and daub", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom8" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom9_wad", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E3_wad", - "blueprint_name": "build E bedroom wattle and daub", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom9" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom10_wad", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E4_wad", - "blueprint_name": "build E bedroom wattle and daub", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom10" } ] - } -] diff --git a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json b/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json deleted file mode 100644 index e824eb8c32659..0000000000000 --- a/data/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom1_wood", - "description": "Let's build some living quarters so we can expand. We will start in the northwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_NW_wood", - "blueprint_name": "build NW wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_fire" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom1" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom2_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the west wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W1_wood", - "blueprint_name": "build W wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom1" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom2" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom3_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the same wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W2_wood", - "blueprint_name": "build W wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom2" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom3" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom4_wood", - "description": "Let's build some living quarters so we can expand. We will enclose the west side of the stairs.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_W3_wood", - "blueprint_name": "build W wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom3" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom4" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom5_wood", - "description": "Let's build some living quarters so we can expand. We will continue along the southwest corner.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_SW_wood", - "blueprint_name": "build SW wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom4" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom5" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom6_wood", - "description": "Let's build two living quarters so we can expand. We will continue along the south wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_S_wood", - "blueprint_name": "build S wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom5" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom6" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom7_wood", - "description": "Let's build another bedroom so we can expand. We will continue to enclose the stairwell and add new doors.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E1_wood", - "blueprint_name": "build central E bedroom wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom6" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom7" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom8_wood", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E2_wood", - "blueprint_name": "build E bedroom wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom7" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom8" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom9_wood", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E3_wood", - "blueprint_name": "build E bedroom wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom8" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom9" } ] - }, - { - "type": "recipe", - "result": "faction_base_modular_shelter_2_bedroom10_wood", - "description": "Let's build another bedroom on the east wall.", - "category": "CC_BUILDING", - "subcategory": "CSC_BUILDING_BASES", - "autolearn": false, - "never_learn": true, - "construction_blueprint": "fbmc_shelter_2_bedroom_E4_wood", - "blueprint_name": "build E bedroom wood panel bedroom walls", - "blueprint_requires": [ { "id": "fbmc_shelter_2_bedroom9" } ], - "blueprint_provides": [ { "id": "fbmc_shelter_2_bedroom10" } ], - "blueprint_excludes": [ { "id": "fbmc_shelter_2_bedroom10" } ] - } -] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index af776943425b7..222f05967a679 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -670,6 +670,7 @@ "result": "mutant_lard", "copy-from": "lard", "byproducts": [ [ "mutant_cracklins" ] ], + "tools": [ [ [ "surface_heat", 60, "LIST" ] ] ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_knife_skills" } ], "components": [ [ [ "mutant_fat", 2 ] ] ] diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 69877cb8f55c6..ac32abb9be37c 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -644,7 +644,6 @@ "mx_science": 20, "mx_toxic_waste": 10, "mx_crater": 10, - "mx_supplydrop": 8, "mx_military": 8, "mx_drugdeal": 8, "mx_mass_grave": 5, @@ -684,7 +683,6 @@ "mx_grass": 10, "mx_military": 8, "mx_mass_grave": 5, - "mx_supplydrop": 5, "mx_portal": 3, "mx_portal_in": 3, "mx_jabberwock": 1, @@ -707,7 +705,6 @@ "mx_point_dead_vegetation": 60, "mx_science": 50, "mx_military": 25, - "mx_supplydrop": 25, "mx_crater": 20, "mx_drugdeal": 20, "mx_fallen_shed": 10, @@ -742,7 +739,7 @@ "mx_nest_wasp": 50, "mx_mass_grave": 50, "mx_grave": 50, - "mx_supplydrop": 40, + "mx_supplydrop": 4, "mx_Trapdoor_spider_den": 40, "mx_collegekids": 30, "mx_drugdeal": 30, @@ -767,7 +764,7 @@ "mx_roadblock_mil": 170, "mx_bandits_block": 800, "mx_drugdeal": 300, - "mx_supplydrop": 100, + "mx_supplydrop": 5, "mx_portal": 50, "mx_crater": 100, "mx_portal_in": 40, @@ -844,7 +841,7 @@ "mx_nest_wasp": 50, "mx_mass_grave": 50, "mx_grave": 50, - "mx_supplydrop": 40, + "mx_supplydrop": 2, "mx_Trapdoor_spider_den": 40, "mx_collegekids": 30, "mx_drugdeal": 30, diff --git a/data/json/snippets/epilogue_factions.json b/data/json/snippets/epilogue_factions.json index efd2ab2a76617..6be6892c6c1f2 100644 --- a/data/json/snippets/epilogue_factions.json +++ b/data/json/snippets/epilogue_factions.json @@ -109,11 +109,11 @@ }, { "id": "epilogue_faction_gods_community_0", - "text": " The New England Community Church struggled following , constantly low on food and basic supplies. The relative worthlessness of icons to outsiders and their general unfriendliness stifled commerce with remaining survivor groups. They became more fanatical as time went on, becoming estranged, destitute, and forgotten by the outside world…" + "text": " The New England Community Church struggled following the Cataclysm, constantly low on food and basic supplies. The relative worthlessness of icons to outsiders and their general unfriendliness stifled commerce with remaining survivor groups. They became more fanatical as time went on, becoming estranged, destitute, and forgotten by the outside world…" }, { "id": "epilogue_faction_gods_community_150", - "text": " The New England Church Community grew into a flourishing refuge in the years following . A change in leadership to moderate and inclusive stances vastly improved outside relations, helping to reinforce the value of the icon and spreading Christianity across the wasteland…" + "text": " The New England Church Community grew into a flourishing refuge in the years following the Cataclysm. A change in leadership to moderate and inclusive stances vastly improved outside relations, helping to reinforce the value of the icon and spreading Christianity across the wasteland…" } ] } diff --git a/data/mods/DinoMod/overmap/overmap_specials.json b/data/mods/DinoMod/overmap/overmap_specials.json index 3aa394465a101..31c3b8c827e0b 100644 --- a/data/mods/DinoMod/overmap/overmap_specials.json +++ b/data/mods/DinoMod/overmap/overmap_specials.json @@ -11,7 +11,7 @@ "city_distance": [ 10, -1 ], "city_sizes": [ 0, 20 ], "occurrences": [ 0, 2 ], - "flags": [ "WILDERNESS" ], + "flags": [ "WILDERNESS", "MAN_MADE" ], "rotate": false }, { diff --git a/data/mods/No_Hope/scenario_blacklist.json b/data/mods/No_Hope/scenario_blacklist.json new file mode 100644 index 0000000000000..9a93dc4f0747c --- /dev/null +++ b/data/mods/No_Hope/scenario_blacklist.json @@ -0,0 +1,7 @@ +[ + { + "type": "SCENARIO_BLACKLIST", + "subtype": "blacklist", + "scenarios": [ "overrun" ] + } +] diff --git a/data/mods/Tamable_Wildlife/insect_spider.json b/data/mods/Tamable_Wildlife/insect_spider.json index d626e2fad20d2..4c5cafadff72b 100644 --- a/data/mods/Tamable_Wildlife/insect_spider.json +++ b/data/mods/Tamable_Wildlife/insect_spider.json @@ -376,5 +376,252 @@ "copy-from": "mon_water_scorpion", "name": { "str": "giant water scorpion" }, "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_jumping_small", + "type": "MONSTER", + "copy-from": "mon_spider_jumping_small", + "name": { "str": "jumping spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_jumping_giant", + "type": "MONSTER", + "copy-from": "mon_spider_jumping_giant", + "name": { "str": "giant jumping spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_jumping_mega", + "type": "MONSTER", + "copy-from": "mon_spider_jumping_mega", + "name": { "str": "missile spider" }, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } + }, + { + "id": "mon_spider_jumping_giant_s", + "type": "MONSTER", + "copy-from": "mon_spider_jumping_giant_s", + "name": { "str": "jumping spiderling" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.", + "pet": "The %s looks at you with its large eyes and skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_cellar_small", + "type": "MONSTER", + "copy-from": "mon_spider_cellar_small", + "name": { "str": "cellar spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_cellar_giant_s", + "type": "MONSTER", + "copy-from": "mon_spider_cellar_giant_s", + "name": { "str": "cellar spiderling" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.", + "pet": "The %s skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_cellar_giant", + "type": "MONSTER", + "copy-from": "mon_spider_cellar_giant", + "name": { "str": "giant cellar spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_cellar_mom", + "type": "MONSTER", + "copy-from": "mon_spider_cellar_mom", + "name": { "str": "mommy long-legs", "str_pl": "mommy long legs" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_cellar_mega", + "type": "MONSTER", + "copy-from": "mon_spider_cellar_mega", + "name": { "str": "warehouse spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_trapdoor_small", + "type": "MONSTER", + "copy-from": "mon_spider_trapdoor_small", + "name": { "str": "trapdoor spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_trapdoor_giant", + "type": "MONSTER", + "copy-from": "mon_spider_trapdoor_giant", + "name": { "str": "giant trapdoor spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_trapdoor_s", + "type": "MONSTER", + "copy-from": "mon_spider_trapdoor_s", + "name": { "str": "trapdoor spiderling" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.", + "pet": "The %s looks at you with its large eyes and skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_trapdoor_mega", + "type": "MONSTER", + "copy-from": "mon_spider_trapdoor_mega", + "name": { "str": "deathtrap spider" }, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } + }, + { + "id": "mon_spider_web_small", + "type": "MONSTER", + "copy-from": "mon_spider_web_small", + "name": { "str": "web spinning spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_web", + "type": "MONSTER", + "copy-from": "mon_spider_web", + "name": { "str": "giant web spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_web_s", + "type": "MONSTER", + "copy-from": "mon_spider_web_s", + "name": { "str": "web spiderling" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.", + "pet": "The %s skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_web_mega", + "type": "MONSTER", + "copy-from": "mon_spider_web_mega", + "name": { "str": "wyrd spider" }, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } + }, + { + "id": "mon_spider_widow_small", + "type": "MONSTER", + "copy-from": "mon_spider_widow_small", + "name": { "str": "black widow spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_widow_giant", + "type": "MONSTER", + "copy-from": "mon_spider_widow_giant", + "name": { "str": "giant black widow" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_widow_giant_s", + "type": "MONSTER", + "copy-from": "mon_spider_widow_giant_s", + "name": { "str": "black widow spiderling" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.", + "pet": "The %s skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_widow_mega", + "type": "MONSTER", + "copy-from": "mon_spider_widow_mega", + "name": { "str": "black death widow" }, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } + }, + { + "id": "mon_spider_wolf_small", + "type": "MONSTER", + "copy-from": "mon_spider_wolf_small", + "name": { "str": "wolf spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_wolf_giant", + "type": "MONSTER", + "copy-from": "mon_spider_wolf_giant", + "name": { "str": "giant wolf spider" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_wolf_giant_s", + "type": "MONSTER", + "copy-from": "mon_spider_wolf_giant_s", + "name": { "str": "wolf spiderling" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.", + "pet": "The %s skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_spider_wolf_mega", + "type": "MONSTER", + "copy-from": "mon_spider_wolf_mega", + "name": { "str": "necrowolf spider" }, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } + }, + { + "id": "mon_centipede_small", + "type": "MONSTER", + "copy-from": "mon_centipede_small", + "name": { "str": "centipede" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_centipede_giant", + "type": "MONSTER", + "copy-from": "mon_centipede_giant", + "name": { "str": "giant centipede" }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_centipede_larva_friendly", + "type": "MONSTER", + "copy-from": "mon_centipede_larva", + "name": { "str": "centipede larva", "str_pl": "centipede larvae" }, + "petfood": { + "food": [ "BUGFOOD" ], + "feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.", + "pet": "The %s skitters around your feet." + }, + "extend": { "flags": [ "CANPLAY" ] }, + "delete": { "anger_triggers": [ "PLAYER_CLOSE" ] } + }, + { + "id": "mon_centipede_mom", + "type": "MONSTER", + "copy-from": "mon_centipede_mom", + "name": { "str": "centipede matriarch" }, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } + }, + { + "id": "mon_centipede_mega", + "type": "MONSTER", + "copy-from": "mon_centipede_mega", + "name": { "str": "armored centipede" }, + "mountable_weight_ratio": 0.4, + "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } } ] diff --git a/data/mods/Tamable_Wildlife/items/comestibles/eggs.json b/data/mods/Tamable_Wildlife/items/comestibles/eggs.json index 4fded9d851942..0d0f2186c999c 100644 --- a/data/mods/Tamable_Wildlife/items/comestibles/eggs.json +++ b/data/mods/Tamable_Wildlife/items/comestibles/eggs.json @@ -46,5 +46,13 @@ "copy-from": "egg_water_bug", "description": "The egg of a water scorpion. This one has been carefully tended for. The water scorpion inside seems more timid and calmer upon touch.", "rot_spawn": "GROUP_EGG_WATER_BUG_TAME" + }, + { + "type": "COMESTIBLE", + "id": "egg_centipede_tame", + "name": { "str": "tame centipede egg" }, + "copy-from": "egg_centipede", + "description": "The egg of a centipede. This one has been carefully tended for. The centipede larva inside seems more timid and calmer upon touch.", + "rot_spawn": "GROUP_EGG_CENTIPEDE_TAME" } ] diff --git a/data/mods/Tamable_Wildlife/monstergroups/eggs.json b/data/mods/Tamable_Wildlife/monstergroups/eggs.json index 7f0b9cc7b6d5b..0aa3efe2ce271 100644 --- a/data/mods/Tamable_Wildlife/monstergroups/eggs.json +++ b/data/mods/Tamable_Wildlife/monstergroups/eggs.json @@ -28,5 +28,10 @@ "name": "GROUP_EGG_WATER_BUG_TAME", "type": "monstergroup", "monsters": [ { "monster": "mon_water_scorpion_larva_friendly" } ] + }, + { + "name": "GROUP_EGG_CENTIPEDE_TAME", + "type": "monstergroup", + "monsters": [ { "monster": "mon_centipede_larva_friendly" } ] } ] diff --git a/data/mods/Tamable_Wildlife/recipes/nested.json b/data/mods/Tamable_Wildlife/recipes/nested.json index 01dbc17dd1218..88608653f753b 100644 --- a/data/mods/Tamable_Wildlife/recipes/nested.json +++ b/data/mods/Tamable_Wildlife/recipes/nested.json @@ -14,7 +14,8 @@ "egg_antlion_tame", "egg_cicada_tame", "egg_water_beetle_tame", - "egg_water_bug_tame" + "egg_water_bug_tame", + "egg_centipede_tame" ], "difficulty": 5 } diff --git a/data/mods/Tamable_Wildlife/recipes/recipe_egg.json b/data/mods/Tamable_Wildlife/recipes/recipe_egg.json index 92b4811c09cf9..79ee8cd393f80 100644 --- a/data/mods/Tamable_Wildlife/recipes/recipe_egg.json +++ b/data/mods/Tamable_Wildlife/recipes/recipe_egg.json @@ -70,5 +70,17 @@ "time": "15 m", "autolearn": true, "components": [ [ [ "egg_water_bug", 1 ] ], [ [ "sweet_goop", 10 ] ] ] + }, + { + "result": "egg_centipede_tame", + "type": "recipe", + "activity_level": "NO_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "survival", + "difficulty": 5, + "time": "15 m", + "autolearn": true, + "components": [ [ [ "egg_centipede", 1 ] ], [ [ "sweet_goop", 10 ] ] ] } ] diff --git a/data/mods/Xedra_Evolved/field_type.json b/data/mods/Xedra_Evolved/field_type.json index f2ee8e1fcb310..70077f99a146c 100644 --- a/data/mods/Xedra_Evolved/field_type.json +++ b/data/mods/Xedra_Evolved/field_type.json @@ -15,7 +15,7 @@ { "name": "nauseating tension", "color": "cyan", - "monster_spawn_chance": 200, + "monster_spawn_chance": 34000, "monster_spawn_count": 1, "monster_spawn_radius": 1, "monster_spawn_group": "GROUP_CHANGELING_MIRRORED_FIELD" @@ -24,7 +24,7 @@ "name": "broken reflections", "color": "magenta_yellow", "transparent": false, - "monster_spawn_chance": 100, + "monster_spawn_chance": 46000, "monster_spawn_count": 3, "monster_spawn_radius": 6, "monster_spawn_group": "GROUP_CHANGELING_MIRRORED_FIELD" diff --git a/data/mods/Xedra_Evolved/npc/rubik.json b/data/mods/Xedra_Evolved/npc/rubik.json index 2ac5fb8dcdc20..5b6929224902f 100644 --- a/data/mods/Xedra_Evolved/npc/rubik.json +++ b/data/mods/Xedra_Evolved/npc/rubik.json @@ -30,6 +30,7 @@ "text": "[DEDUCTION 4 or INT 14 ] Would you have any specialized weapons to use against them?", "//": "Change to some variable that ties to having encountered vampires previously.", "condition": { "or": [ { "math": [ "u_skill('deduction')", ">=", "4" ] }, { "u_has_intelligence": 14 } ] }, + "effect": { "u_add_var": "rubik_vampire_weapons", "value": "banger_and_smash" }, "topic": "TALK_EXODII_MERCHANT_VAMPIRE_GEAR" } ] @@ -44,8 +45,8 @@ { "id": "TALK_EXODII_MERCHANT_VAMPIRE_GEAR", "type": "talk_topic", - "dynamic_line": "The Good Folk of Aberystwyth? Us 'ave no truck with them, the milk is spoilt, the flesh is hoofshod, the henge holds no peel. Ye'd ken best not their seductions. A trifle better than the enemy.", - "//": "The faeries announced themselves in Rubik's world near what we know as Wales. Exodii mostly avoid them referencing several myths about bad luck and that for because they've traded their flesh for metal the fae aren't really interested in them anyway. Not quite as bad as the undead but more tricksome.", + "dynamic_line": "If this green and brown, has the claret drinkers us un'll be truckin with ole Great Grey and bringin out the good and plenty. Only one way to throw a smash and banger for the tick dead.", + "//": "Vampires have infested your world? We're gonna talk to the supercomputer and bring out some of our anti-vampire designs and will get back to you soon.", "responses": [ { "text": "I'll keep your warnings in mind.", "topic": "TALK_EXODII_MERCHANT_Talk" } ] } ] diff --git a/doc/DEVELOPER_TOOLING.md b/doc/DEVELOPER_TOOLING.md index 32d3d0c9fbc51..f7cb7b490287d 100644 --- a/doc/DEVELOPER_TOOLING.md +++ b/doc/DEVELOPER_TOOLING.md @@ -364,8 +364,8 @@ diff <(ls src/*.h | sed 's!.*/!!') <(for i in src/*.cpp; do echo $i; sed -n '/^# types, which leads to other requirements for `IWYU pragma: keep`. * IWYU seems to have particular trouble with types used in maps and - `cata::optional`. Have not looked into this in detail, but again worked - around it with pragmas. + `cata::optional` (NOTE: cata::optional replaced with std::optional around the C++17 migration). + Have not looked into this in detail, but again worked around it with pragmas. ## Python and pyvips on Windows diff --git a/src/action.h b/src/action.h index 03c7004c07937..32a20fab60d73 100644 --- a/src/action.h +++ b/src/action.h @@ -10,11 +10,6 @@ #include #include -namespace cata -{ -template -class optional; -} // namespace cata struct input_event; struct point; struct tripoint; diff --git a/src/assign.h b/src/assign.h index 9ec8077ec1998..8b493c4eb3e10 100644 --- a/src/assign.h +++ b/src/assign.h @@ -17,11 +17,6 @@ #include "json.h" #include "units.h" -namespace cata -{ -template -class optional; -} // namespace cata namespace detail { template @@ -129,7 +124,7 @@ bool assign( const JsonObject &jo, const std::string_view name, std::pair return true; } -// Note: is_optional excludes any types based on cata::optional, which is +// Note: is_optional excludes any types based on std::optional, which is // handled below in a separate function. template < typename T, typename std::enable_if < std::is_class::value &&!is_optional::value, int >::type = 0 > diff --git a/src/calendar.h b/src/calendar.h index 6a36343839f4a..fe712d174f40e 100644 --- a/src/calendar.h +++ b/src/calendar.h @@ -19,12 +19,6 @@ class time_duration; class time_point; template struct enum_traits; -namespace cata -{ -template -class optional; -} // namespace cata - /** Real world seasons */ enum season_type { SPRING = 0, diff --git a/src/cata_tiles.h b/src/cata_tiles.h index 453f70190b713..01d21e4a451a7 100644 --- a/src/cata_tiles.h +++ b/src/cata_tiles.h @@ -235,7 +235,7 @@ class tileset * @param id : "raw" tile id (without season suffix) * @param season : season suffix encoded as season_type enum * @return std::nullopt if no tile is found, - * cata::optional with found id (e.g. "t_tree_apple_season_spring" or "t_tree_apple) and found tile. + * std::optional with found id (e.g. "t_tree_apple_season_spring" or "t_tree_apple) and found tile. * * Note: this method is guaranteed to return pointers to the keys and values stored inside the * `tileset::tile_ids` collection. I.e. result of this method call is invalidated when diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp index 9b34e6f6e8af7..a937f14a09e4e 100644 --- a/src/debug_menu.cpp +++ b/src/debug_menu.cpp @@ -2487,8 +2487,8 @@ static void debug_menu_spawn_vehicle() tripoint dest = player_character.pos(); uilist veh_cond_menu; veh_cond_menu.text = _( "Vehicle condition" ); - veh_cond_menu.addentry( 0, true, MENU_AUTOASSIGN, _( "Light damage" ) ); veh_cond_menu.addentry( 1, true, MENU_AUTOASSIGN, _( "Undamaged" ) ); + veh_cond_menu.addentry( 0, true, MENU_AUTOASSIGN, _( "Light damage" ) ); veh_cond_menu.addentry( 2, true, MENU_AUTOASSIGN, _( "Disabled (tires or engine)" ) ); veh_cond_menu.query(); diff --git a/src/debug_menu.h b/src/debug_menu.h index 31877ebe139c5..e0a83d2ff8a6d 100644 --- a/src/debug_menu.h +++ b/src/debug_menu.h @@ -11,12 +11,6 @@ struct tripoint; template struct enum_traits; -namespace cata -{ -template -class optional; -} // namespace cata - class Character; namespace debug_menu diff --git a/src/game_inventory.h b/src/game_inventory.h index c3992431bd58c..e40e2fd12605a 100644 --- a/src/game_inventory.h +++ b/src/game_inventory.h @@ -14,11 +14,6 @@ class Character; struct tripoint; -namespace cata -{ -template -class optional; -} // namespace cata class avatar; class item; class repair_item_actor; diff --git a/src/input.h b/src/input.h index 5ef0d1d73a478..230e49d158584 100644 --- a/src/input.h +++ b/src/input.h @@ -21,11 +21,6 @@ enum action_id : int; class cata_path; class hotkey_queue; -namespace cata -{ -template -class optional; -} // namespace cata namespace catacurses { class window; diff --git a/src/item_factory.cpp b/src/item_factory.cpp index a8866e1de94de..ac44378bbb035 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -2865,7 +2865,7 @@ static void apply_optional( T &value, const std::optional &applied ) } } -// Gets around the issue that cata::optional doesn't support +// Gets around the issue that std::optional doesn't support // the *= and += operators required for "proportional" and "relative". template static void get_optional( const JsonObject &jo, bool was_loaded, const std::string &member, diff --git a/src/json.h b/src/json.h index e513b16e7477a..1788cedb32f09 100644 --- a/src/json.h +++ b/src/json.h @@ -43,12 +43,6 @@ class TextJsonObject; class TextJsonValue; class item; -namespace cata -{ -template -class optional; -} // namespace cata - // Traits class to distinguish sequences which are string like from others template< class, class = void > struct is_string_like : std::false_type { }; diff --git a/src/vpart_position.h b/src/vpart_position.h index 74d76da7a38de..eedf01423f7ec 100644 --- a/src/vpart_position.h +++ b/src/vpart_position.h @@ -113,7 +113,7 @@ class vpart_position }; /** - * Simple wrapper to forward functions that may return a @ref cata::optional + * Simple wrapper to forward functions that may return a @ref std::optional * to @ref vpart_position. They generally return an empty `optional`, or * forward to the same function in `vpart_position`. */