diff --git a/data/json/mapgen/fema/FEMA_blc_01.json b/data/json/mapgen/fema/FEMA_blc_01.json index c0cad98a43a54..6b84860050c19 100644 --- a/data/json/mapgen/fema/FEMA_blc_01.json +++ b/data/json/mapgen/fema/FEMA_blc_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_blc_01_roof", + "//": "bottom left corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_blc", @@ -35,7 +71,8 @@ ], "rotation": 3, "palettes": [ "FEMA_camp" ], - "items": { "x": { "item": "dresser", "chance": 30 } } + "items": { "x": { "item": "dresser", "chance": 30 } }, + "place_nested": [ { "chunks": [ "fema_blc_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_blc_03.json b/data/json/mapgen/fema/FEMA_blc_03.json index 0bdffc1eb5ff3..f06d5d014d35f 100644 --- a/data/json/mapgen/fema/FEMA_blc_03.json +++ b/data/json/mapgen/fema/FEMA_blc_03.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_blc_03_roof", + "//": "bottom left corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_blc", @@ -35,7 +71,8 @@ ], "rotation": 3, "palettes": [ "FEMA_camp" ], - "items": { "X": { "item": "mil_surplus", "chance": 40 } } + "items": { "X": { "item": "mil_surplus", "chance": 40 } }, + "place_nested": [ { "chunks": [ "fema_blc_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_brc_01.json b/data/json/mapgen/fema/FEMA_brc_01.json index 8fd5feaa446a5..eb9210e19f240 100644 --- a/data/json/mapgen/fema/FEMA_brc_01.json +++ b/data/json/mapgen/fema/FEMA_brc_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_brc_01_roof", + "//": "bottom right corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_brc", @@ -35,7 +71,8 @@ ], "rotation": 2, "palettes": [ "FEMA_camp" ], - "items": { "x": { "item": "dresser", "chance": 30 } } + "items": { "x": { "item": "dresser", "chance": 30 } }, + "place_nested": [ { "chunks": [ "fema_brc_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_brc_03.json b/data/json/mapgen/fema/FEMA_brc_03.json index 65799f0289090..3b84aa16a7243 100644 --- a/data/json/mapgen/fema/FEMA_brc_03.json +++ b/data/json/mapgen/fema/FEMA_brc_03.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_brc_03_roof", + "//": "bottom right corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " RRRR RRRR RRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_brc", @@ -35,7 +71,8 @@ ], "rotation": 2, "palettes": [ "FEMA_camp" ], - "items": { ",": { "item": "dresser", "chance": 6 } } + "items": { ",": { "item": "dresser", "chance": 6 } }, + "place_nested": [ { "chunks": [ "fema_brc_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_entrance_01.json b/data/json/mapgen/fema/FEMA_entrance_01.json index 31f5be1a0bd4d..0cdae4ab5b172 100644 --- a/data/json/mapgen/fema/FEMA_entrance_01.json +++ b/data/json/mapgen/fema/FEMA_entrance_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_entrance_01_roof", + "//": "entrance. bottom edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " -------------- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -------------- ", + " ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, { "type": "mapgen", "om_terrain": "FEMA_entrance", @@ -36,7 +72,8 @@ "rotation": 2, "palettes": [ "FEMA_camp" ], "terrain": { "z": "t_dirt" }, - "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } + "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }, + "place_nested": [ { "chunks": [ "fema_entrance_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_entrance_02.json b/data/json/mapgen/fema/FEMA_entrance_02.json index 6e979558adda7..9667fcfc0fe42 100644 --- a/data/json/mapgen/fema/FEMA_entrance_02.json +++ b/data/json/mapgen/fema/FEMA_entrance_02.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_entrance_02_roof", + "//": "entrance. bottom edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ------------- ", + " -...........- ", + " -...........- ", + " -...........- ", + " -...........- ", + " -...........- ", + " ------------- ", + " ", + " ", + " ", + " ", + " ------------ ", + " -..........- ", + " -..........- ", + " -..........- ", + " -..........- ", + " -..........- ", + " ------------ ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, { "type": "mapgen", "om_terrain": "FEMA_entrance", @@ -36,7 +72,8 @@ "rotation": 2, "palettes": [ "FEMA_camp" ], "items": { "X": { "item": "mil_surplus", "chance": 60 } }, - "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } + "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }, + "place_nested": [ { "chunks": [ "fema_entrance_02_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_entrance_03.json b/data/json/mapgen/fema/FEMA_entrance_03.json index 6450bd4ffeb7b..3cbe66acb9b4f 100644 --- a/data/json/mapgen/fema/FEMA_entrance_03.json +++ b/data/json/mapgen/fema/FEMA_entrance_03.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_entrance_03_roof", + "//": "entrance. bottom edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " -------------- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -............- ", + " -------------- ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, { "type": "mapgen", "om_terrain": "FEMA_entrance", @@ -37,7 +73,8 @@ "palettes": [ "FEMA_camp" ], "terrain": { "z": "t_dirt" }, "items": { "X": { "item": "mil_surplus", "chance": 60 } }, - "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } + "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }, + "place_nested": [ { "chunks": [ "fema_entrance_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_le_01.json b/data/json/mapgen/fema/FEMA_le_01.json index 78ab6f035c67b..d3f0b20c26fc9 100644 --- a/data/json/mapgen/fema/FEMA_le_01.json +++ b/data/json/mapgen/fema/FEMA_le_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_le_01_roof", + "//": "left edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_le", @@ -35,7 +71,8 @@ ], "rotation": 3, "palettes": [ "FEMA_camp" ], - "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } } + "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } }, + "place_nested": [ { "chunks": [ "fema_le_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_le_03.json b/data/json/mapgen/fema/FEMA_le_03.json index d2bd3450f3658..174ad176e9270 100644 --- a/data/json/mapgen/fema/FEMA_le_03.json +++ b/data/json/mapgen/fema/FEMA_le_03.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_le_03_roof", + "//": "left edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " -------------------- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -------------------- ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, { "type": "mapgen", "om_terrain": "FEMA_le", @@ -47,7 +83,8 @@ { "item": "id_science_visitor_1", "x": 14, "y": [ 14, 17 ], "chance": 30 } ], "item": { "B": { "item": "cotton_patchwork", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } }, - "monster": { "Z": { "monster": "mon_zombie_brute" }, "z": { "monster": "mon_zombie_scientist" } } + "monster": { "Z": { "monster": "mon_zombie_brute" }, "z": { "monster": "mon_zombie_scientist" } }, + "place_nested": [ { "chunks": [ "fema_le_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_mid_02.json b/data/json/mapgen/fema/FEMA_mid_02.json index cf18f12d741a3..c80ab79efba2f 100644 --- a/data/json/mapgen/fema/FEMA_mid_02.json +++ b/data/json/mapgen/fema/FEMA_mid_02.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_mid_02_roof", + "//": "middle area", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " -------------------- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -------------------- ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, { "type": "mapgen", "om_terrain": "FEMA_mid", @@ -36,7 +72,8 @@ "rotation": [ 0, 3 ], "palettes": [ "FEMA_camp" ], "terrain": { "n": "t_dirt", "P": "t_water_pump", "T": "t_dirt" }, - "items": { "L": { "item": "home_hw", "chance": 30 } } + "items": { "L": { "item": "home_hw", "chance": 30 } }, + "place_nested": [ { "chunks": [ "fema_mid_02_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_mid_03.json b/data/json/mapgen/fema/FEMA_mid_03.json index cb3abad9c9c4d..d1c9c64b8d6ee 100644 --- a/data/json/mapgen/fema/FEMA_mid_03.json +++ b/data/json/mapgen/fema/FEMA_mid_03.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_mid_03_roof", + "//": "middle area", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " -------------------- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -------------------- ", + " ", + " " + ], + "palettes": [ "roof_palette" ] + } + }, { "type": "mapgen", "om_terrain": "FEMA_mid", @@ -40,7 +76,8 @@ "r": { "item": "drugs_emergency", "chance": 30 }, "X": { "item": "hospital_lab", "chance": 80 } }, - "item": { "B": { "item": "cotton_patchwork", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } } + "item": { "B": { "item": "cotton_patchwork", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } }, + "place_nested": [ { "chunks": [ "fema_mid_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_re_01.json b/data/json/mapgen/fema/FEMA_re_01.json index e448d0072191d..5958a163d2e28 100644 --- a/data/json/mapgen/fema/FEMA_re_01.json +++ b/data/json/mapgen/fema/FEMA_re_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_re_01_roof", + "//": "right edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_re", @@ -35,7 +71,8 @@ ], "rotation": 1, "palettes": [ "FEMA_camp" ], - "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } } + "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } }, + "place_nested": [ { "chunks": [ "fema_re_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_re_03.json b/data/json/mapgen/fema/FEMA_re_03.json index e342620901899..c035dd2917fe7 100644 --- a/data/json/mapgen/fema/FEMA_re_03.json +++ b/data/json/mapgen/fema/FEMA_re_03.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_re_03_roof", + "//": "right edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " RRRRRRRRR ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_re", @@ -35,7 +71,8 @@ ], "rotation": 1, "palettes": [ "FEMA_camp" ], - "monster": { "Z": { "monster": "mon_zombie_fat" } } + "monster": { "Z": { "monster": "mon_zombie_fat" } }, + "place_nested": [ { "chunks": [ "fema_re_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_te_01.json b/data/json/mapgen/fema/FEMA_te_01.json index 5f478b2cffff6..ae97abdab1816 100644 --- a/data/json/mapgen/fema/FEMA_te_01.json +++ b/data/json/mapgen/fema/FEMA_te_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_te_01_roof", + "//": "top edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_te", @@ -34,7 +70,8 @@ "........................" ], "rotation": 0, - "palettes": [ "FEMA_camp" ] + "palettes": [ "FEMA_camp" ], + "place_nested": [ { "chunks": [ "fema_te_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_te_03.json b/data/json/mapgen/fema/FEMA_te_03.json index 09cedb69b722d..b0f783a2337fb 100644 --- a/data/json/mapgen/fema/FEMA_te_03.json +++ b/data/json/mapgen/fema/FEMA_te_03.json @@ -1,4 +1,41 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_te_03_roof", + "//": "top edge", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " -------------------- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -------------------- ", + " ", + " ", + " RRRR RRRR RRRR RRRR ", + " RRRR RRRR RRRR RRRR ", + " RRRR RRRR RRRR RRRR ", + " RRRR RRRR RRRR RRRR ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_te", @@ -45,7 +82,8 @@ "*": "t_dirt" }, "items": { "x": { "item": "mil_surplus", "chance": 30 }, "X": { "item": "ammo_rifle_milspec", "chance": 80 } }, - "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } + "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }, + "place_nested": [ { "chunks": [ "fema_te_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_tlc_01.json b/data/json/mapgen/fema/FEMA_tlc_01.json index 3619e2acf5d33..487a0d96c0560 100644 --- a/data/json/mapgen/fema/FEMA_tlc_01.json +++ b/data/json/mapgen/fema/FEMA_tlc_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_tlc_01_roof", + "//": "top left corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_tlc", @@ -35,7 +71,8 @@ ], "rotation": 0, "palettes": [ "FEMA_camp" ], - "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } } + "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } }, + "place_nested": [ { "chunks": [ "fema_tlc_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_trc_01.json b/data/json/mapgen/fema/FEMA_trc_01.json index a7af6474640c6..973464f34abb6 100644 --- a/data/json/mapgen/fema/FEMA_trc_01.json +++ b/data/json/mapgen/fema/FEMA_trc_01.json @@ -1,4 +1,40 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_trc_01_roof", + "//": "top right corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_trc", @@ -35,7 +71,8 @@ ], "rotation": 1, "palettes": [ "FEMA_camp" ], - "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } } + "items": { "x": { "item": "dresser", "chance": 30 }, "X": { "item": "dresser", "chance": 50 } }, + "place_nested": [ { "chunks": [ "fema_trc_01_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/fema/FEMA_trc_03.json b/data/json/mapgen/fema/FEMA_trc_03.json index aaff02b79b940..620f4c7f3bfc5 100644 --- a/data/json/mapgen/fema/FEMA_trc_03.json +++ b/data/json/mapgen/fema/FEMA_trc_03.json @@ -1,4 +1,41 @@ [ + { + "type": "mapgen", + "nested_mapgen_id": "fema_trc_03_roof", + "//": "top right corner.", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " --------RRRRRRRRRR ", + " -......-RRRRRRRRRR ", + " -......-RRRRRRRRRR ", + " -......-RRRRRRRRRR ", + " -......-RRRRRRRRRR ", + " -......-RRRRRRRRRR ", + " -......-RRRRRRRRRR ", + " --------RRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " RRRRRRRRRRRRRRRRRR ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "om_terrain": "FEMA_trc", @@ -36,7 +73,8 @@ "rotation": 1, "palettes": [ "FEMA_camp" ], "terrain": { "C": "t_floor", "o": "t_floor", "R": "t_floor", "s": "t_floor", "U": "t_floor" }, - "items": { "C": { "item": "kitchen", "chance": 30 }, "X": { "item": "mil_food", "chance": 70 } } + "items": { "C": { "item": "kitchen", "chance": 30 }, "X": { "item": "mil_food", "chance": 70 } }, + "place_nested": [ { "chunks": [ "fema_trc_03_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ]