diff --git a/data/json/mapgen/abandoned01.json b/data/json/mapgen/abandoned01.json index 5bebfe60cf6c3..a2cb1e68237f4 100644 --- a/data/json/mapgen/abandoned01.json +++ b/data/json/mapgen/abandoned01.json @@ -274,6 +274,7 @@ ".S.ww^...T......Tz.z.S..", "..^...T......z.^..^.z.^." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "set": [ { "point": "bash", "x": 7, "y": 7 }, { "point": "bash", "x": 3, "y": 20 }, diff --git a/data/json/mapgen/apartment_mod_new.json b/data/json/mapgen/apartment_mod_new.json index b79ab52c0e63d..f3899700cdfae 100644 --- a/data/json/mapgen/apartment_mod_new.json +++ b/data/json/mapgen/apartment_mod_new.json @@ -265,8 +265,8 @@ [ "roof_4x4_party", 20 ], [ "roof_3x3_wine", 20 ] ], - "x": [ 24, 40 ], - "y": [ 24, 40 ] + "x": [ 24, 39 ], + "y": [ 24, 38 ] } ], "place_monsters": [ { "monster": "GROUP_ROOF_ZOMBIE", "x": [ 4, 23 ], "y": [ 4, 23 ], "repeat": [ 0, 1 ] } ] diff --git a/data/json/mapgen/bugs/ants.json b/data/json/mapgen/bugs/ants.json index d4dcadcfb99d3..15934343447d4 100644 --- a/data/json/mapgen/bugs/ants.json +++ b/data/json/mapgen/bugs/ants.json @@ -31,6 +31,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "<": "t_slope_down", "+": "t_dirtmound", "-": [ "t_dirtmound", "t_region_groundcover_barren" ] } } }, diff --git a/data/json/mapgen/dock.json b/data/json/mapgen/dock.json index 3d1c22d4d4c19..e4aee8cb79e91 100644 --- a/data/json/mapgen/dock.json +++ b/data/json/mapgen/dock.json @@ -2,8 +2,7 @@ { "type": "palette", "id": "dock_small", - "terrain": { " ": "t_null", "d": "t_dock" }, - "nested": { "d": { "chunks": [ [ "clear_furniture", 1 ] ] } } + "terrain": { "d": "t_dock" } }, { "type": "mapgen", @@ -38,6 +37,7 @@ " dd ", " dd " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "dock_small" ] } }, @@ -74,6 +74,7 @@ " dddddddddddd ", " dddddddddddd " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "dock_small" ], "place_nested": [ { "chunks": [ [ "NPC_lighthouse_man_spawn", 25 ], [ "null", 75 ] ], "x": 12, "y": 21 } ] } @@ -110,18 +111,12 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "dock_small" ], "place_vehicles": [ { "chance": 10, "fuel": 15, "vehicle": "boat_motor_single", "x": 8, "y": 5, "rotation": 270 }, { "chance": 10, "fuel": 15, "vehicle": "boat_motor_single", "x": 13, "y": 5, "rotation": 270 } ] } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "clear_furniture", - "//": "used to be able to clear furniture when using a 'rows' placement mapping, since f_null directly is ignored", - "object": { "mapgensize": [ 1, 1 ], "set": [ { "point": "furniture", "id": "f_null", "x": 0, "y": 0 } ] } } ] diff --git a/data/json/mapgen/farm_tiles.json b/data/json/mapgen/farm_tiles.json index 38615aab2b6c2..1cc7e4d32cb79 100644 --- a/data/json/mapgen/farm_tiles.json +++ b/data/json/mapgen/farm_tiles.json @@ -285,6 +285,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 18 ], "y": [ 0, 22 ] } ], "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] @@ -324,6 +325,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 18 ], "y": [ 0, 22 ] } ], "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] @@ -363,6 +365,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 8, 18 ], "y": [ 0, 22 ] } ], "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] @@ -403,6 +406,7 @@ ".......////////.........", ".......////////........." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 10 ], "y": [ 0, 22 ] } ], "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] @@ -443,6 +447,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 10 ], "y": [ 0, 22 ] } ], "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] @@ -483,6 +488,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 10, 20 ], "y": [ 0, 22 ] } ], "place_vehicles": [ { "vehicle": "farm_vehicles", "x": [ 7, 13 ], "y": [ 0, 18 ], "chance": 10, "status": 1, "rotation": 270 } ] @@ -522,6 +528,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -559,6 +566,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -596,6 +604,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -633,6 +642,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -670,6 +680,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -707,6 +718,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -745,6 +757,7 @@ "........////////........", "........////////........" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ] } }, @@ -1024,7 +1037,9 @@ "ccccccccc|,,,,,,|.......", ".........||||||||......." ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "farm_lots" ], + "remove_all": { "c": { }, "C": { }, "|": { } }, "place_monster": [ { "monster": "mon_chicken", "x": [ 1, 17 ], "y": [ 1, 22 ], "repeat": [ 4, 10 ] } ], "terrain": { "_": [ [ "t_dirt", 15 ], [ "t_grass_long", 5 ], [ "t_underbrush", 1 ], [ "t_grass", 10 ] ] }, "item": { "_": { "item": "birdfood", "chance": 1, "repeat": [ 1, 3 ] } } @@ -1064,6 +1079,7 @@ "%%%%%%%%%%%%%%%%%%......", "........................" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "farm_lots" ], "terrain": { "O": "t_dirtmound", @@ -1118,12 +1134,13 @@ "........................", "........................" ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "farm_lots" ], "place_nested": [ { "chunks": [ [ "null", 25 ], [ "24x24_fence3", 20 ], [ "24x24_fence4", 20 ], [ "24x24_fence5", 15 ] ], "x": 0, "y": 0 } ], + "remove_all": { "♥": { }, "♠": { }, "♦": { }, "♣": { }, "Ʌ": { } }, "terrain": { - "O": "t_dirtmound", "♥": "t_dirtmound", "♠": "t_dirtmound", "♦": "t_dirtmound", diff --git a/data/json/mapgen/isherwood_farms/rural_roads_trails.json b/data/json/mapgen/isherwood_farms/rural_roads_trails.json index 5a68783c2804d..6fe4ff182d5cf 100644 --- a/data/json/mapgen/isherwood_farms/rural_roads_trails.json +++ b/data/json/mapgen/isherwood_farms/rural_roads_trails.json @@ -33,6 +33,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 18 ], "y": [ 0, 22 ] } ] } @@ -71,6 +72,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 4, 18 ], "y": [ 0, 22 ] } ] } @@ -110,6 +112,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ], "place_nested": [ { "chunks": [ [ "2x2_haybale", 5 ], [ "null", 20 ] ], "x": [ 10, 20 ], "y": [ 0, 22 ] } ] } @@ -148,6 +151,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, @@ -185,6 +189,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, @@ -222,6 +227,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, @@ -259,6 +265,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, @@ -296,6 +303,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, @@ -333,6 +341,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, @@ -371,6 +380,7 @@ ".......i///ii///i.......", ".......i///ii///i......." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "rural_road" ] } }, diff --git a/data/json/mapgen/lab/lab_floorplans.json b/data/json/mapgen/lab/lab_floorplans.json index c85af876508bc..1f5017db44a62 100644 --- a/data/json/mapgen/lab/lab_floorplans.json +++ b/data/json/mapgen/lab/lab_floorplans.json @@ -778,7 +778,6 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ "X" ], - "terrain": { "X": "t_thconc_floor" }, "furniture": { "X": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ] }, "mapping": { "X": { diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json index d843524d79367..98a4fb6ff4ccb 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json @@ -193,6 +193,7 @@ "|;;;|", "|||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_loot": [ { "item": "cheese_hard", "x": 2, "y": [ 1, 3 ], "chance": 100 }, @@ -216,6 +217,7 @@ "|;;;|", "|||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_loot": [ { "item": "recipe_elfa", "x": 2, "y": [ 1, 3 ], "chance": 100 }, @@ -239,6 +241,7 @@ "|;;;|", "|||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_loot": [ { "item": "record_patient", "x": 2, "y": [ 1, 3 ], "chance": 100 }, @@ -262,6 +265,7 @@ "|;;;|", "|||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_loot": [ { "group": "toxic_waste", "x": [ 1, 3 ], "y": [ 1, 3 ], "repeat": 3, "chance": 100 }, @@ -283,6 +287,7 @@ "|;;;|", "|||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_monster": [ { "monster": "mon_sewer_rat", "x": [ 1, 3 ], "y": [ 1, 3 ], "repeat": [ 2, 4 ], "chance": 100 } ] } @@ -301,6 +306,7 @@ "|;;;|", "||;||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_monster": [ { "monster": "mon_black_rat", "x": [ 1, 3 ], "y": [ 1, 3 ], "repeat": [ 2, 4 ], "chance": 100 } ] } @@ -319,6 +325,7 @@ "|;;;|", "||;||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "place_monster": [ { "monster": "mon_sewer_snake", "x": [ 1, 3 ], "y": [ 1, 3 ], "repeat": [ 2, 4 ], "chance": 100 } ] } @@ -337,6 +344,7 @@ "|;;;|", "||;||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "terrain": { "Æ": "t_thconc_floor" }, "place_loot": [ @@ -363,6 +371,7 @@ " XXXX ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -380,6 +389,7 @@ " NN ", " h " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -397,6 +407,7 @@ "Y j L", "L L" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -414,6 +425,7 @@ "^ƨƨƨ^", "^^^^^" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -431,6 +443,7 @@ " 0ƨƨ ", "00 " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -448,6 +461,7 @@ " A ", "⁵⁵ " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -465,6 +479,7 @@ ";~~~;", ";ƧƧƧ;" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "terrain": { "~": "t_sewage", "Ƨ": "t_thconc_floor" }, "furniture": { "Ƨ": "f_barricade_road" } @@ -484,6 +499,7 @@ " WWW ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, @@ -502,6 +518,7 @@ "⁵ Ø ⁵", "⁵⁵ ⁵⁵" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette", "lab_maintenance_palette" ] } }, diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_science_common.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_science_common.json index 0d4cf3625c44e..25cffc711f097 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_science_common.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_science_common.json @@ -133,6 +133,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_common_palette" ], "place_signs": [ { "snippet": "lab_safety_snippet", "x": [ 0, 1 ], "y": 0 }, @@ -203,6 +204,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "-": "t_chaingate_c", "X": "t_chainfence_h" } } }, diff --git a/data/json/mapgen/lab/lab_rooms.json b/data/json/mapgen/lab/lab_rooms.json index e311c23202957..c3f1736b8d5c4 100644 --- a/data/json/mapgen/lab/lab_rooms.json +++ b/data/json/mapgen/lab/lab_rooms.json @@ -732,7 +732,6 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ "A" ], - "terrain": { "A": "t_thconc_floor" }, "furniture": { "A": [ "f_machinery_heavy", @@ -1082,7 +1081,6 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ "a" ], - "terrain": { "a": "t_thconc_floor" }, "furniture": { "a": "f_ash" }, "item": { "a": [ { "item": "ash", "amount": 49, "chance": 100 }, { "item": "bone_human", "amount": [ 3, 5 ], "chance": 50 } ] }, "items": { "a": { "item": "science", "chance": 10 } } diff --git a/data/json/mapgen/lab/lab_trains.json b/data/json/mapgen/lab/lab_trains.json index 4e863d34c528f..fdf28c9a3a422 100644 --- a/data/json/mapgen/lab/lab_trains.json +++ b/data/json/mapgen/lab/lab_trains.json @@ -90,6 +90,7 @@ " ........", " ." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "subway_underground" ], "place_vehicles": [ { "vehicle": "trains_draisine", "x": [ 12, 17 ], "y": 7, "chance": 3, "rotation": 180 }, @@ -129,6 +130,7 @@ "....... ", ". " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "subway_underground" ], "place_vehicles": [ { "vehicle": "trains_draisine", "x": [ 1, 7 ], "y": 7, "chance": 3, "rotation": 180 }, @@ -168,6 +170,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "subway_underground" ], "place_vehicles": [ { "vehicle": "trains_draisine", "x": 7, "y": [ 6, 11 ], "chance": 3, "rotation": 90 }, @@ -207,6 +210,7 @@ " ..-x---x-....-x---x-.. ", "...^X^^^X^....^X^^^X^..." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "subway_underground" ], "place_vehicles": [ { "vehicle": "trains_draisine", "x": 16, "y": [ 12, 17 ], "chance": 3, "rotation": 270 }, diff --git a/data/json/mapgen/lab_subway_vent_shaft.json b/data/json/mapgen/lab_subway_vent_shaft.json index 6592e9c8b78f3..137568da2e404 100644 --- a/data/json/mapgen/lab_subway_vent_shaft.json +++ b/data/json/mapgen/lab_subway_vent_shaft.json @@ -91,6 +91,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "lab_subway_vent_shaft" ] } }, diff --git a/data/json/mapgen/map_extras/exodii_crashes.json b/data/json/mapgen/map_extras/exodii_crashes.json index 0db54f3b9c6bc..a5a3f74df804b 100644 --- a/data/json/mapgen/map_extras/exodii_crashes.json +++ b/data/json/mapgen/map_extras/exodii_crashes.json @@ -3,7 +3,6 @@ "type": "palette", "id": "exodii_crash_ground_palette", "terrain": { - " ": "t_null", ".": [ [ "t_glassed_sand", 10 ], "t_sandmound" ], ",": [ [ "t_glassed_sand", 3 ], [ "t_grass_dead", 3 ], "t_sandmound", "t_sand" ], ";": [ "t_rock_floor_no_roof", [ "t_sand", 5 ], "t_sandmound" ], @@ -20,7 +19,6 @@ "type": "palette", "id": "exodii_crash_palette", "terrain": { - " ": "t_null", "|": "t_wall_metal", "M": "t_door_metal_locked", "m": "t_secretdoor_metal_c", @@ -68,6 +66,7 @@ " ................ ", " .......... " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "exodii_crash_ground_palette" ], "place_nested": [ { @@ -115,6 +114,7 @@ " ... .. . . ", " . " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "exodii_crash_ground_palette" ], "place_nested": [ { diff --git a/data/json/mapgen/map_extras/nest_dermatik.json b/data/json/mapgen/map_extras/nest_dermatik.json index 7642a7f4db450..af00852740c40 100644 --- a/data/json/mapgen/map_extras/nest_dermatik.json +++ b/data/json/mapgen/map_extras/nest_dermatik.json @@ -30,6 +30,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "t": [ "t_region_tree", "t_region_groundcover" ], ",": [ "t_region_tree" ], diff --git a/data/json/mapgen/map_extras/nest_wasp.json b/data/json/mapgen/map_extras/nest_wasp.json index 54155a869bc06..19484a3a6d848 100644 --- a/data/json/mapgen/map_extras/nest_wasp.json +++ b/data/json/mapgen/map_extras/nest_wasp.json @@ -30,6 +30,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "t": [ "t_region_tree", "t_region_groundcover_swamp" ], ",": [ "t_region_tree" ], diff --git a/data/json/mapgen/map_extras/portal.json b/data/json/mapgen/map_extras/portal.json index d3b706334548d..b9cd1aee53e6f 100644 --- a/data/json/mapgen/map_extras/portal.json +++ b/data/json/mapgen/map_extras/portal.json @@ -10,6 +10,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { " ": "t_region_groundcover" }, "furniture": { " ": "f_rubble_rock" }, "place_traps": [ { "trap": "tr_portal", "x": 1, "y": 1 } ] diff --git a/data/json/mapgen/map_extras/sewers.json b/data/json/mapgen/map_extras/sewers.json index e1d062d4f6a50..e27bfbf2f3127 100644 --- a/data/json/mapgen/map_extras/sewers.json +++ b/data/json/mapgen/map_extras/sewers.json @@ -699,6 +699,7 @@ " o o ", " o o " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "sewers" ], "place_monsters": [ { "monster": "GROUP_SEWER", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 } ] } diff --git a/data/json/mapgen/map_extras/wilderness.json b/data/json/mapgen/map_extras/wilderness.json index 7140b04b7eecd..8dc536dfbce65 100644 --- a/data/json/mapgen/map_extras/wilderness.json +++ b/data/json/mapgen/map_extras/wilderness.json @@ -63,6 +63,7 @@ " ................ ", " .......... " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "long_grass_meadow_palette" ] } }, @@ -86,6 +87,7 @@ ".,,,,.", " .... " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "long_grass_meadow_palette" ] } }, @@ -105,6 +107,7 @@ "..,,,,..", " ...... " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "long_grass_meadow_palette" ] } }, @@ -139,6 +142,7 @@ " ................ ", " .......... " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "copse_trees_palette" ] } }, @@ -162,6 +166,7 @@ ".,,,,.", " .... " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "copse_trees_palette" ] } }, @@ -181,6 +186,7 @@ "..,,,,..", " ...... " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "copse_trees_palette" ] } }, @@ -219,6 +225,7 @@ "-_________|", "--||||||-||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "desolatebarn_palette" ], "terrain": { "_": "t_dirt" }, "furniture": { "_": [ [ "f_null", 30 ], "f_rubble", "f_rubble_rock" ] }, @@ -244,6 +251,7 @@ "-__RRR_w", "--w||-||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "desolatebarn_palette" ], "terrain": { "_": "t_dirt" }, "furniture": { "_": [ [ "f_null", 30 ], "f_rubble", "f_rubble_rock" ] }, @@ -260,7 +268,7 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], - "terrain": { " ": "t_null" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "furniture": { " ": [ [ "f_region_water_plant", 10 ], "f_boulder_small", "f_boulder_medium", "f_boulder_large", "f_rubble_rock" ] } } }, @@ -271,7 +279,7 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], - "terrain": { " ": "t_null" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "furniture": { " ": [ "f_boulder_small", "f_boulder_medium", "f_boulder_large", "f_rubble_rock" ] } } }, @@ -306,15 +314,14 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "nested": { "*": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] }, "[": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] }, "]": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] }, "~": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] } }, - "furniture": { "~": "f_clear", "*": "f_clear", "[": "f_clear", "]": "f_clear" }, "terrain": { - " ": [ [ "t_dirt", 3 ], [ "t_grass", 3 ], "t_shrub", [ "t_tree_young", 2 ], [ "t_tree", 2 ] ], "*": "t_water_sh", "?": [ [ "t_water_sh", 3 ], @@ -367,6 +374,7 @@ " ", " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "nested": { "*": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] }, "[": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] }, @@ -375,7 +383,6 @@ }, "furniture": { "~": "f_clear", "*": "f_clear", "[": "f_clear", "]": "f_clear" }, "terrain": { - " ": [ [ "t_dirt", 3 ], [ "t_grass", 3 ], "t_shrub", [ "t_tree_young", 2 ], "t_tree" ], "*": "t_water_sh", "?": [ [ "t_water_sh", 3 ], @@ -401,43 +408,73 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_dirt", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_dirt" } } + "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "terrain": { " ": "t_dirt" } } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_grass", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_grass" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ " " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "terrain": { " ": "t_grass" } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_shrub", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_shrub" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { " ": "t_shrub" } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_underbrush", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_underbrush" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { " ": "t_underbrush" } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_tree", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_tree" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { " ": "t_tree" } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_tree_young", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_tree_young" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { " ": "t_tree_young" } + } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "pond_tree_willow", - "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], "terrain": { " ": "t_tree_willow" } } + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { " ": "t_tree_willow" } + } }, { "type": "mapgen", @@ -446,6 +483,7 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { " ": "t_swater_sh" }, "furniture": { " ": [ "f_region_water_plant", [ "f_null", 10 ] ] } } @@ -457,6 +495,7 @@ "object": { "mapgensize": [ 1, 1 ], "rows": [ " " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { " ": "t_swater_dp" }, "furniture": { " ": [ "f_region_water_plant", [ "f_null", 10 ] ] } } diff --git a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_chunks.json b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_chunks.json index f3b6c1354a2bb..01450fb81fec6 100644 --- a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_chunks.json +++ b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_chunks.json @@ -2,6 +2,19 @@ { "type": "palette", "id": "microlab_distorted_chunk", + "remove_all": { + "!": { }, + "2": { }, + ":": { }, + "X": { }, + "3": { }, + "4": { }, + "ó": { }, + "R": { }, + ">": { }, + "<": { }, + "&": { } + }, "terrain": { " ": "t_null", ".": "t_strconc_floor", @@ -44,6 +57,7 @@ "| || .|", "|.. ..|" ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -67,6 +81,7 @@ "| ||,, ,.,.|", "|.|. ||| .|" ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -90,6 +105,7 @@ "| || ,,|", "|.. ..|" ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -113,6 +129,7 @@ " .. |22|", " ||| . | " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -136,6 +153,7 @@ " ", " || " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -159,6 +177,7 @@ ".. .", "|.|. " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -182,6 +201,7 @@ ",. ", "| " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, @@ -205,6 +225,7 @@ " |.||..", "| .." ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "microlab_distorted_chunk" ] } }, diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index 4aef07eb61dd5..f8566a48e8496 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -2576,17 +2576,8 @@ " ", "ccc %" ], - "terrain": { - " ": "t_carpet_green", - "!": "t_carpet_green", - "@": "t_carpet_green", - "V": "t_carpet_green", - "B": "t_carpet_green", - "c": "t_carpet_green", - "O": "t_carpet_green", - "%": "t_carpet_green", - "=": "t_carpet_green" - }, + "remove_all": { " ": { }, "B": { }, "c": { }, "%": { }, "=": { } }, + "terrain": { " ": "t_carpet_green", "B": "t_carpet_green", "c": "t_carpet_green", "%": "t_carpet_green", "=": "t_carpet_green" }, "furniture": { "%": "f_floor_canvas", "c": "f_bench", "B": "f_bigmirror" }, "traps": { "=": "tr_rollmat" } } @@ -2604,15 +2595,12 @@ " = ", "B B " ], + "remove_all": { "B": { }, "c": { }, "%": { }, "=": { } }, "terrain": { " ": "t_carpet_yellow", - "!": "t_carpet_yellow", - "@": "t_carpet_yellow", - "V": "t_carpet_yellow", "B": "t_carpet_yellow", "c": "t_carpet_yellow", "%": "t_carpet_yellow", - "O": "t_carpet_yellow", "=": "t_carpet_yellow" }, "furniture": { "%": "f_floor_canvas", "c": "f_bench", "B": "f_bigmirror" }, @@ -2632,17 +2620,8 @@ " ", "cc %" ], - "terrain": { - " ": "t_carpet_red", - "!": "t_carpet_red", - "@": "t_carpet_red", - "V": "t_carpet_red", - "B": "t_carpet_red", - "c": "t_carpet_red", - "O": "t_carpet_red", - "%": "t_carpet_red", - "=": "t_carpet_red" - }, + "remove_all": { "B": { }, "c": { }, "%": { }, "=": { } }, + "terrain": { " ": "t_carpet_red", "B": "t_carpet_red", "c": "t_carpet_red", "%": "t_carpet_red", "=": "t_carpet_red" }, "furniture": { "%": "f_floor_canvas", "c": "f_bench", "B": "f_bigmirror" }, "traps": { "=": "tr_rollmat" } } @@ -2750,6 +2729,8 @@ " = ", " B " ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "remove_all": { "!": { }, "@": { }, "V": { }, "B": { }, "c": { }, "=": { } }, "terrain": { " ": "t_carpet_purple", "!": "t_carpet_purple", @@ -2757,7 +2738,6 @@ "V": "t_carpet_purple", "B": "t_carpet_purple", "c": "t_carpet_purple", - "O": "t_carpet_purple", "=": "t_carpet_purple" }, "furniture": { diff --git a/data/json/mapgen/nested/house_nested.json b/data/json/mapgen/nested/house_nested.json index a101cd70441ef..f5148263f1fb5 100644 --- a/data/json/mapgen/nested/house_nested.json +++ b/data/json/mapgen/nested/house_nested.json @@ -1526,6 +1526,7 @@ "D2R3Dc", "BBCBB " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "house_w_nest_garden_palette" ], "terrain": { "s": "t_concrete" }, "place_items": [ @@ -1551,6 +1552,7 @@ "D9R8Dc", "BBCBB " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "house_w_nest_garden_palette" ], "terrain": { "s": "t_concrete" }, "place_items": [ @@ -1576,6 +1578,7 @@ "|SzzQ|", "||||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "house_w_nest_palette" ], "terrain": { "|": "t_wall_metal_corrugated", @@ -1610,6 +1613,7 @@ "|GEEB|", "||oo||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "|": "t_wall_wood", "+": "t_door_locked", @@ -1654,6 +1658,7 @@ "+ S|", "||||||" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "|": "t_scrap_wall", "+": "t_door_metal_pickable", @@ -1682,6 +1687,7 @@ " Kcc ", " cZ " ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "house_w_nest_garden_palette" ] } }, @@ -1810,6 +1816,7 @@ "PPP", "PPP" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "house_w_nest_garden_palette" ], "sealed_item": { "P": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_seedling" } }, "place_items": [ @@ -1831,6 +1838,7 @@ " ", "111" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "house_w_nest_garden_palette" ], "place_items": [ { "item": "farming_tools", "x": [ 0, 2 ], "y": [ 0, 2 ], "chance": 5, "repeat": [ 1, 3 ] }, @@ -1851,6 +1859,7 @@ "1Z1", "111" ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], "palettes": [ "house_w_nest_garden_palette" ] } }, diff --git a/data/json/mapgen/nested/nested_chunks_roof.json b/data/json/mapgen/nested/nested_chunks_roof.json index e48f7c3fa435f..2e6f0e45c5e2c 100644 --- a/data/json/mapgen/nested/nested_chunks_roof.json +++ b/data/json/mapgen/nested/nested_chunks_roof.json @@ -7,11 +7,10 @@ "mapgensize": [ 4, 4 ], "rows": [ "xxxx", - "xct_", - "x___", - "____" + "xct ", + "x ", + " " ], - "terrain": { "_": "t_flat_roof" }, "furniture": { "c": "f_camp_chair", "x": "f_sandbag_wall", "t": "f_table" }, "place_loot": [ { "group": "roof_trash", "x": [ 0, 3 ], "y": 3, "chance": 30, "repeat": [ 1, 2 ] }, @@ -28,12 +27,11 @@ "object": { "mapgensize": [ 4, 4 ], "rows": [ - "_ct_", - "____", - "_b_c", - "c___" + " ct ", + " ", + " b c", + "c " ], - "terrain": { "_": "t_flat_roof", "c": "t_flat_roof", "b": "t_flat_roof", "t": "t_flat_roof" }, "furniture": { "c": "f_camp_chair", "b": "f_brazier", "t": "f_table" }, "place_items": [ { "item": "roof_trash", "x": [ 0, 3 ], "y": [ 0, 3 ], "chance": 35, "repeat": [ 1, 2 ] }, @@ -123,6 +121,7 @@ "xtttx", "xxxxx" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "_": "t_floor_primitive", "+": "t_chickenwire_gate_c", "x": "t_chickenwire_fence", "t": "t_dirtfloor" }, "furniture": { "t": "f_table" }, "place_loot": [ @@ -148,6 +147,7 @@ "_xxx", "__ox" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "_": "t_concrete", "x": "t_sewage_pipe" }, "furniture": { "o": "f_water_heater", "a": "f_air_conditioner" }, "liquids": { "o": { "liquid": "water_clean", "amount": [ 0, 100 ] } } @@ -163,10 +163,11 @@ "rows": [ "UUUU", "UAaU", - "c_oU", + "c oU", "UUUU" ], - "terrain": { "_": "t_null", "c": "t_chaingate_l", "U": "t_chainfence" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "c": "t_chaingate_l", "U": "t_chainfence" }, "furniture": { "o": "f_water_heater", "a": "f_water_purifier", "A": "f_standing_tank" }, "liquids": { "o": { "liquid": "water_clean", "amount": [ 0, 100 ] } } } @@ -179,14 +180,15 @@ "mapgensize": [ 6, 6 ], "rotation": [ 0, 3 ], "rows": [ - "_xxxxx", - "_xA__x", - "_xx__x", - "_____x", - "xooa_x", + " xxxxx", + " xA x", + " xx x", + " x", + "xooa x", "xxxxxx" ], - "terrain": { "_": "t_null", "x": "t_sewage_pipe" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "x": "t_sewage_pipe" }, "furniture": { "o": "f_water_heater", "a": "f_water_purifier", "A": "f_standing_tank" }, "liquids": { "o": { "liquid": "water_clean", "amount": [ 0, 100 ] } } } @@ -315,7 +317,6 @@ { "point": "trap", "id": "tr_cot", "x": 5, "y": 5 }, { "point": "trap", "id": "tr_cot", "x": 3, "y": 5 } ], - "terrain": { ".": "t_null" }, "furniture": { "o": "f_camp_chair", "a": "f_brazier", "A": "f_tourist_table" }, "place_loot": [ { "group": "cannedfood", "x": [ 2, 3 ], "y": 0, "repeat": [ 2, 3 ] }, @@ -338,14 +339,13 @@ "rotation": [ 0, 3 ], "rows": [ "%#++#%", - "%1__1%", - "#1__1#", - "#1__1#", - "%1__1%", + "%1 1%", + "#1 1#", + "#1 1#", + "%1 1%", "%#++#%" ], "terrain": { - "_": "t_null", "#": "t_reinforced_glass_shutter_open", "+": "t_reinforced_door_glass_c", "%": "t_reinforced_glass_shutter", @@ -364,15 +364,13 @@ "rotation": [ 0, 3 ], "rows": [ "%#++#%", - "%1__1%", - "#S__b#", - "#S__b#", - "%1__1%", + "%1 1%", + "#S b#", + "#S b#", + "%1 1%", "%#++#%" ], "terrain": { - "_": "t_null", - "p": "t_null", "#": "t_reinforced_glass_shutter_open", "+": "t_reinforced_door_glass_c", "%": "t_reinforced_glass_shutter", @@ -391,14 +389,13 @@ "rotation": [ 0, 2 ], "rows": [ "%#++#%", - "%1__1%", - "#1a_1#", - "#1__1#", - "%1_a1%", + "%1 1%", + "#1a 1#", + "#1 1#", + "%1 a1%", "%#++#%" ], "terrain": { - "_": "t_null", "#": "t_reinforced_glass_shutter_open", "+": "t_reinforced_door_glass_c", "%": "t_reinforced_glass_shutter", @@ -420,14 +417,15 @@ "mapgensize": [ 6, 6 ], "rotation": [ 0, 3 ], "rows": [ - "______", - "______", - "b111b_", - "b1B1b_", - "b111b_", - "______" + " ", + " ", + "b111b ", + "b1B1b ", + "b111b ", + " " ], - "terrain": { "_": "t_null", "B": "t_railroad_rubble" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "B": "t_railroad_rubble" }, "furniture": { "b": "f_bench", "B": [ "f_birdbath", "f_statue" ] }, "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_seedling" } } } @@ -447,6 +445,7 @@ "1_bb_1", "1____1" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "_": "t_railroad_rubble", "b": "t_railroad_rubble", "B": "t_railroad_rubble" }, "furniture": { "B": [ "f_birdbath", "f_statue" ], "b": "f_bench" }, "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_seedling" } } @@ -461,14 +460,15 @@ "mapgensize": [ 6, 6 ], "rotation": [ 0, 3 ], "rows": [ - "______", - "44433_", - "BBBBB_", - "22233_", - "BBBBB_", - "11112_" + " ", + "44433 ", + "BBBBB ", + "22233 ", + "BBBBB ", + "11112 " ], - "terrain": { "_": "t_null", "B": "t_railroad_rubble" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "B": "t_railroad_rubble" }, "sealed_item": { "1": { "item": { "item": "seed_chamomile" }, "furniture": "f_planter_harvest" }, "2": { "item": { "item": "seed_thyme" }, "furniture": "f_planter_harvest" }, @@ -493,6 +493,7 @@ "b2222b", "bb__bb" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "_": "t_railroad_rubble", "b": "t_railroad_rubble", "2": "t_sandbox", "G": "t_sandbox" }, "furniture": { "G": [ "f_boulder_medium", "f_boulder_large" ], "b": "f_bench" } } diff --git a/data/json/mapgen/nested/rural_outdoors_nested.json b/data/json/mapgen/nested/rural_outdoors_nested.json index 21bdbb1bb34bb..535db0da82fd9 100644 --- a/data/json/mapgen/nested/rural_outdoors_nested.json +++ b/data/json/mapgen/nested/rural_outdoors_nested.json @@ -463,6 +463,7 @@ "..#t##d.", "....#..." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "desolatebarn_palette" ], "items": { "r": { "item": "hardware", "chance": 10 } } } @@ -485,6 +486,7 @@ ".dd.dd#.", "...d...." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "desolatebarn_palette" ], "place_vehicles": [ { "chance": 40, "fuel": 0, "rotation": 90, "status": 1, "vehicle": "oldtractor", "x": 1, "y": 1 } ] } @@ -507,6 +509,7 @@ "........", "...d...." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "desolatebarn_palette" ], "items": { ".": { "item": "hardware", "chance": 10 } } } @@ -529,6 +532,7 @@ "......dd", "...d...." ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "desolatebarn_palette" ], "items": { "r": { "item": "hardware", "chance": 10 } } } @@ -551,7 +555,8 @@ " k ", " " ], - "terrain": { " ": "t_null", "k": "t_trunk" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "k": "t_trunk" }, "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door", "b": "f_firering" }, "place_items": [ { "item": "cannedfood", "x": 3, "y": 1, "chance": 75 }, @@ -574,7 +579,6 @@ " ", "hrh" ], - "terrain": { " ": "t_null" }, "furniture": { "h": "f_camp_chair", "b": "f_firering", "r": "f_tourist_table" }, "place_items": [ { "item": "cannedfood", "x": 1, "y": 2, "chance": 75 }, diff --git a/data/json/mapgen/store/s_gunstore.json b/data/json/mapgen/store/s_gunstore.json index 358c4abc052a3..fb5d6878a2a83 100644 --- a/data/json/mapgen/store/s_gunstore.json +++ b/data/json/mapgen/store/s_gunstore.json @@ -32,7 +32,7 @@ ",###############_______," ], "palettes": [ "gun_store_palette" ], - "terrain": { "w": "t_pavement", ";": "t_region_groundcover_urban" } + "terrain": { "w": "t_pavement" } } }, { @@ -173,7 +173,7 @@ ",###############_______," ], "palettes": [ "gun_store_palette" ], - "terrain": { "w": "t_pavement", ";": "t_region_groundcover_urban" }, + "terrain": { "w": "t_pavement" }, "nested": { "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, "m": { "chunks": [ [ "destroyed_furniture", 40 ], [ "null", 80 ] ] }, diff --git a/data/json/mapgen_palettes/farm_lots.json b/data/json/mapgen_palettes/farm_lots.json index b4fcf104f49a9..3fcfb26ec7b69 100644 --- a/data/json/mapgen_palettes/farm_lots.json +++ b/data/json/mapgen_palettes/farm_lots.json @@ -60,6 +60,7 @@ { "type": "palette", "id": "farm_house", + "remove_all": { "P": { }, "H": { }, "%": { } }, "terrain": { " ": "t_floor", "#": "t_railing", diff --git a/data/json/mapgen_palettes/house_w_palette.json b/data/json/mapgen_palettes/house_w_palette.json index 6c27925800d72..3a98d07438ece 100644 --- a/data/json/mapgen_palettes/house_w_palette.json +++ b/data/json/mapgen_palettes/house_w_palette.json @@ -209,6 +209,7 @@ { "type": "palette", "id": "house_w_nest_garden_palette", + "remove_all": { "Z": { } }, "terrain": { ".": "t_region_groundcover_urban", "A": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], diff --git a/src/map_extras.cpp b/src/map_extras.cpp index 0634ff051fa29..0cfbc485e6990 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -1526,7 +1526,15 @@ static void place_fumarole( map &m, const point &p1, const point &p2, std::set

xy(), 4 ); furn_set( center->xy(), f_null ); - trap_set( *center, tr_portal ); - create_anomaly( *center, random_entry( valid_props ), false ); + if( !is_open_air( *center ) ) { + trap_set( *center, tr_portal ); + create_anomaly( *center, random_entry( valid_props ), false ); + } break; } // radioactive accident.