diff --git a/data/json/mapgen/abandoned_barn.json b/data/json/mapgen/abandoned_barn.json index d07ad501fed07..d5c355ae8a29f 100644 --- a/data/json/mapgen/abandoned_barn.json +++ b/data/json/mapgen/abandoned_barn.json @@ -1,4 +1,39 @@ [ + { + "nested_mapgen_id": "desolatebarn_1_roof", + "type": "mapgen", + "method": "json", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } + } + }, { "om_terrain": "desolatebarn", "type": "mapgen", @@ -45,10 +80,46 @@ "place_nested": [ { "chunks": [ [ "ruins_4x4_front", 60 ], [ "ruins_4x4_junk", 40 ] ], "x": 6, "y": 11 }, { "chunks": [ [ "null", 60 ], [ "ruins_4x4_junk", 30 ], [ "ruins_4x4_camp", 10 ] ], "x": 10, "y": 16 }, - { "chunks": [ [ "null", 70 ], [ "ruins_8x8_yard", 30 ] ], "x": 16, "y": 10 } + { "chunks": [ [ "null", 70 ], [ "ruins_8x8_yard", 30 ] ], "x": 16, "y": 10 }, + { "chunks": [ "desolatebarn_1_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_2_roof", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " .......... ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } + } + }, { "method": "json", "om_terrain": "desolatebarn", @@ -85,7 +156,45 @@ "palettes": [ "desolatebarn_palette" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "place_rubble": [ { "x": 10, "y": 5 }, { "x": 11, "y": 5 }, { "x": 11, "y": 8 } ], - "place_nested": [ { "chunks": [ [ "null", 80 ], [ "ruins_8x8_yard", 20 ] ], "x": [ 0, 15 ], "y": 16 } ] + "place_nested": [ + { "chunks": [ [ "null", 80 ], [ "ruins_8x8_yard", 20 ] ], "x": [ 0, 15 ], "y": 16 }, + { "chunks": [ "desolatebarn_2_roof" ], "x": 0, "y": 0, "z": 1 } + ] + } + }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_3_roof", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " .......... ", + " ...... .......... ", + " ..... ......... ", + " ..... ......... ", + " ...... .......... ", + " ... .. .......... ", + " .... . ........ ", + " . .. ...... .. ", + " .......... ", + " ........ ", + " ... .. ... ", + " ..... ... ", + " . ..... . ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } } }, { @@ -142,7 +251,45 @@ "P": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_seedling" } }, "place_monster": [ { "monster": "mon_cat", "chance": 30, "x": 19, "y": 10 } ], - "place_nested": [ { "chunks": [ [ "ruins_4x4_front", 80 ], [ "ruins_4x4_junk", 20 ] ], "x": 15, "y": 11 } ] + "place_nested": [ + { "chunks": [ [ "ruins_4x4_front", 80 ], [ "ruins_4x4_junk", 20 ] ], "x": 15, "y": 11 }, + { "chunks": [ "desolatebarn_3_roof" ], "x": 0, "y": 0, "z": 1 } + ] + } + }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_4_roof", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ........ ", + " . . . ....... ", + " ...... ......... ", + " ...... ......... ", + " ..... ...... .. ", + " ..... ", + " ...... ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } } }, { @@ -187,7 +334,46 @@ { "chance": 20, "item": "hand_tools", "x": 6, "y": 7 } ], "place_rubble": [ { "x": [ 17, 18 ], "y": 2 }, { "x": 18, "y": 3 }, { "x": 6, "y": 3 } ], - "place_nested": [ { "chunks": [ [ "null", 70 ], [ "ruins_8x8_yard", 30 ] ], "x": 8, "y": 10 } ] + "place_nested": [ + { "chunks": [ [ "null", 70 ], [ "ruins_8x8_yard", 30 ] ], "x": 8, "y": 10 }, + { "chunks": [ "desolatebarn_4_roof" ], "x": 0, "y": 0, "z": 1 } + ] + } + }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_5_roof", + "//": "barn with chance of spawning antique gun", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " . ...... .. ", + " ............ ", + " ............ ", + " ............ ", + " ............ ", + " ........... ", + " ............ ", + " ............ ", + " ........... ", + " ........... ", + " ............ ", + " ............ ", + " ........... ", + " .. ..... ... ", + " ", + " ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } } }, { @@ -247,10 +433,47 @@ "place_nested": [ { "chunks": [ [ "ruins_4x4_front", 60 ], [ "ruins_4x4_junk", 40 ] ], "x": 11, "y": 6 }, { "chunks": [ [ "null", 80 ], [ "ruins_4x4_junk", 20 ] ], "x": 8, "y": 10 }, - { "chunks": [ [ "null", 60 ], [ "ruins_4x4_camp", 30 ], [ "ruins_4x4_NPCs", 10 ] ], "x": 13, "y": 10 } + { "chunks": [ [ "null", 60 ], [ "ruins_4x4_camp", 30 ], [ "ruins_4x4_NPCs", 10 ] ], "x": 13, "y": 10 }, + { "chunks": [ "desolatebarn_5_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_6_roof", + "//": "Barn with chance of drug stash", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " . . . ..... ", + " .............. ", + " ................ ", + " ........... ... ", + " ................ ", + " ................ ", + " ................ ", + " ............... ", + " ............... ", + " . ... .... . .. ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } + } + }, { "method": "json", "om_terrain": "desolatebarn", @@ -296,11 +519,48 @@ ], "place_rubble": [ { "repeat": [ 5, 40 ], "x": [ 4, 19 ], "y": [ 7, 16 ] } ], "place_nested": [ - { "chunks": [ [ "null", 60 ], [ "ruins_4x4_junk", 40 ] ], "x": 9, "y": 8 }, - { "chunks": [ [ "null", 80 ], [ "ruins_4x4_camp", 20 ] ], "x": 5, "y": 8 } + { "chunks": [ [ "null", 60 ], [ "ruins_4x4_junk", 40 ] ], "x": 10, "y": 8 }, + { "chunks": [ [ "null", 80 ], [ "ruins_4x4_camp", 20 ] ], "x": 5, "y": 8 }, + { "chunks": [ "desolatebarn_6_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_7_roof", + "//": "Barn with a plant growing in it", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ..... ", + " .... ", + " .. . ", + " .... ", + " .... ", + " .... ", + " . ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } + } + }, { "method": "json", "om_terrain": "desolatebarn", @@ -350,10 +610,47 @@ "place_rubble": [ { "repeat": [ 0, 20 ], "x": [ 5, 9 ], "y": [ 15, 21 ] } ], "place_nested": [ { "chunks": [ [ "null", 85 ], [ "ruins_8x8_yard", 15 ] ], "x": 4, "y": 5 }, - { "chunks": [ [ "null", 85 ], [ "ruins_8x8_yard", 15 ] ], "x": 11, "y": 13 } + { "chunks": [ [ "null", 85 ], [ "ruins_8x8_yard", 15 ] ], "x": 11, "y": 13 }, + { "chunks": [ "desolatebarn_7_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_8_roof", + "//": "barn with a small shelter inside. NOTE: TK - high chance of a survivor spawning in this map.", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " .......... ", + " .......... ", + " ............. ", + " ............. ", + " ............. ", + " ............. ", + " ............. ", + " ............. ", + " ............. ", + " .......... ", + " .......... ", + " ", + " ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } + } + }, { "method": "json", "om_terrain": "desolatebarn", @@ -401,7 +698,46 @@ { "chance": 25, "item": "trash", "x": 16, "y": 10 } ], "place_rubble": [ { "repeat": [ 0, 80 ], "x": [ 11, 20 ], "y": [ 8, 18 ] }, { "repeat": [ 0, 15 ], "x": [ 8, 10 ], "y": [ 10, 16 ] } ], - "place_nested": [ { "chunks": [ [ "null", 40 ], [ "ruins_4x4_camp", 20 ], [ "ruins_4x4_NPCs", 40 ] ], "x": 12, "y": 11 } ] + "place_nested": [ + { "chunks": [ [ "null", 40 ], [ "ruins_4x4_camp", 20 ], [ "ruins_4x4_NPCs", 40 ] ], "x": 12, "y": 11 }, + { "chunks": [ "desolatebarn_8_roof" ], "x": 0, "y": 0, "z": 1 } + ] + } + }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_9_roof", + "//": "Fairly intact barn with a well", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " . . ....... ", + " ........... ", + " ............ ", + " ............ ", + " ............. ", + " ............. ", + " ............. ", + " ............. ", + " ............. ", + " ............ ", + " ...... .... . ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } } }, { @@ -458,7 +794,46 @@ { "chance": 10, "item": "plumbing_bulk", "x": 17, "y": 14 }, { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 15 } ], - "place_nested": [ { "chunks": [ [ "null", 40 ], [ "ruins_4x4_camp", 40 ], [ "ruins_4x4_NPCs", 20 ] ], "x": 8, "y": 8 } ] + "place_nested": [ + { "chunks": [ [ "null", 40 ], [ "ruins_4x4_camp", 40 ], [ "ruins_4x4_NPCs", 20 ] ], "x": 8, "y": 8 }, + { "chunks": [ "desolatebarn_9_roof" ], "x": 0, "y": 0, "z": 1 } + ] + } + }, + { + "method": "json", + "nested_mapgen_id": "desolatebarn_10_roof", + "//": "Fairly intact barn with a tractor and fenced off animal areas", + "type": "mapgen", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " .. ..... .. ", + " ........... ", + " ............. ", + " ............ ", + " ............. ", + " ............ ", + " ............. ", + " ............ ", + " .. . ... . ", + " ", + " ", + " ", + " .... ... ", + " .... .... ", + " .... .... ", + " ... .... ", + " .... .... ", + " .. . .... ", + " " + ], + "nested": { ".": { "chunks": [ "desolate_shingle_roof_chunk" ] } } } }, { @@ -514,7 +889,8 @@ { "repeat": [ 0, 2 ], "x": 6, "y": [ 14, 16 ] }, { "repeat": [ 0, 2 ], "x": 18, "y": [ 14, 16 ] }, { "repeat": [ 0, 3 ], "x": [ 10, 14 ], "y": 22 } - ] + ], + "place_nested": [ { "chunks": [ "desolatebarn_10_roof" ], "x": 0, "y": 0, "z": 1 } ] } } ] diff --git a/data/json/mapgen/hells_raiders/bandit_camp.json b/data/json/mapgen/hells_raiders/bandit_camp.json index 5558a477acec2..d7d1c2caebc01 100644 --- a/data/json/mapgen/hells_raiders/bandit_camp.json +++ b/data/json/mapgen/hells_raiders/bandit_camp.json @@ -125,12 +125,12 @@ " -,,,5-------------,,,- ... ", " -,,,,,,,,,,,,,,,,,,,,-............ ", " -,,,,,,,,,,,,,,,,,,,,- ... ", - " --,,,,,,,,,,,,,,,,,,-- ä ä . ", + " --,,,,,,,,,,,,,,,,,,-- . ", + " -,,,,,,,,,,,,,,,,,,- . ", " -,,,,,,,,,,,,,,,,,,- . ", " -,,,,,,,,,,,,,,,,,,- . ", " -,,,,,,,,,,,,,,,,,,- . ", " -,,,,,,,,,,,,,,,,,,- . ", - " -,,,,,,,,,,,,,,,,,,- ä ä . ", " --,,,,,,,,,,,,,,,,,,-- . ", " -,,,,,,,,,,,,,,,,,,,,- . ", " -,,,,,,,,,,,,,,,,,,,,- . ", @@ -139,7 +139,7 @@ " . .. ", " . ", " . ", - " . Ä Ä ", + " . ", " . .. ", " . .. ", " .. ,,,,,,, . ", @@ -148,7 +148,7 @@ " ,,,,,,, . ", " ,,,,,,, . ", " .. ,,,,,,, . ", - " .. Ä Ä ,,,,,,, . ", + " .. ,,,,,,, . ", " . ,,,,,,, . ", " . ,,,,,,, . ", " . ,,,,,,, . ", @@ -166,8 +166,7 @@ ], "palettes": [ "roof_palette" ], "items": { ",": { "item": "roof_trash", "chance": 5 } }, - "terrain": { ",": "t_shingle_flat_roof", ".": "t_flat_roof" }, - "nested": { "Ä": { "chunks": [ "tent_5x5_roof" ] }, "ä": { "chunks": [ "tent_3x3_roof" ] } } + "terrain": { ",": "t_shingle_flat_roof", ".": "t_flat_roof" } } } ] diff --git a/data/json/mapgen/hells_raiders/bandit_work_camp.json b/data/json/mapgen/hells_raiders/bandit_work_camp.json index e981b8acac2b0..4149f8d0ecb69 100644 --- a/data/json/mapgen/hells_raiders/bandit_work_camp.json +++ b/data/json/mapgen/hells_raiders/bandit_work_camp.json @@ -170,18 +170,18 @@ " ", " ", " ", - " Ä Ä ", + " ", + " ################### ", + " ################### ", + " ################### ", + " ################### ", " ################### ", " ################### ", " ################### ", " ################### ", - " ################### Ä ", - " ################### Ä ", " ################### ", - " ################### Ä ", " ################### ", " ################### ", - " ################### Ä ", " ################### ", " ################### ", " ################### ", @@ -192,8 +192,7 @@ " ", " " ], - "terrain": { "#": "t_tar_flat_roof" }, - "nested": { "Ä": { "chunks": [ "tent_5x5_roof" ] } } + "terrain": { "#": "t_tar_flat_roof" } } } ] diff --git a/data/json/mapgen/nested/rural_outdoors_nested.json b/data/json/mapgen/nested/rural_outdoors_nested.json index 8712cc5ec2881..302a4c2a8643d 100644 --- a/data/json/mapgen/nested/rural_outdoors_nested.json +++ b/data/json/mapgen/nested/rural_outdoors_nested.json @@ -1,4 +1,10 @@ [ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "desolate_shingle_roof_chunk", + "object": { "mapgensize": [ 1, 1 ], "rows": [ "." ], "terrain": { ".": [ [ "t_shingle_flat_roof", 90 ], [ "t_open_air", 10 ] ] } } + }, { "type": "mapgen", "method": "json", @@ -64,6 +70,7 @@ "__R_" ], "palettes": [ "desolatebarn_palette" ], + "terrain": { "^": "t_dirtfloor" }, "items": { "^": { "item": "hardware", "chance": 10 }, "R": { "item": "hardware", "chance": 25 } }, "place_monster": [ { "monster": "mon_dog_skeleton", "chance": 60, "x": 2, "y": 1 } ], "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ] @@ -100,6 +107,7 @@ "_mg^" ], "palettes": [ "desolatebarn_palette" ], + "terrain": { "^": "t_dirtfloor" }, "items": { "^": { "item": "hardware", "chance": 10 } }, "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ] } @@ -527,7 +535,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "ruins_8x8_yard", - "//": "yard with shed", + "//": "yard with ruined shed", "object": { "mapgensize": [ 8, 8 ], "rotation": [ 0, 3 ], @@ -546,6 +554,26 @@ "items": { "r": { "item": "hardware", "chance": 10 } } } }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "small_camp_8x8_tent_roof", + "//": "a tent and firepit", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + " RRR ", + " RRR ", + " RRR ", + " ", + " ", + " ", + " ", + " " + ], + "terrain": { "R": "t_canvas_roof" } + } + }, { "type": "mapgen", "method": "json", @@ -565,14 +593,15 @@ " " ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "terrain": { "k": "t_trunk" }, + "terrain": { "#": "t_dirt", "x": "t_dirt", "+": "t_dirt", "b": "t_dirt", "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 }, { "item": "cannedfood", "x": 3, "y": 1, "chance": 75 }, { "item": "camping", "x": 1, "y": 5, "chance": 30, "repeat": [ 1, 3 ] }, { "item": "stash_wood", "x": 3, "y": 6, "chance": 100, "repeat": [ 6, 10 ] } - ] + ], + "place_nested": [ { "chunks": [ "small_camp_8x8_tent_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -623,7 +652,8 @@ "#+#" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" } + "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_3x3_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -639,7 +669,8 @@ "###" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" } + "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_3x3_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -655,7 +686,8 @@ "###" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" } + "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_3x3_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -671,7 +703,8 @@ "###" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" } + "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_3x3_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -705,7 +738,8 @@ "##+##" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -723,13 +757,15 @@ "#####" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "leather_tent_5x5_S", + "//": "Canvas roof since we don't have a skin/leather one", "object": { "mapgensize": [ 5, 5 ], "rotation": [ 0, 3 ], @@ -746,7 +782,8 @@ "X": "f_skin_center_groundsheet", "x": "f_large_skin_groundsheet", "+": "f_large_skin_door" - } + }, + "place_nested": [ { "chunks": [ "tent_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -764,7 +801,8 @@ "#####" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { @@ -782,13 +820,15 @@ "#####" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" }, + "place_nested": [ { "chunks": [ "tent_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ] } }, { "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_3x3_S", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 3, 3 ], "rotation": [ 0, 3 ], @@ -810,6 +850,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_3x3_E", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 3, 3 ], "rotation": [ 0, 3 ], @@ -831,6 +872,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_3x3_N", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 3, 3 ], "rotation": [ 0, 3 ], @@ -852,6 +894,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_3x3_W", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 3, 3 ], "rotation": [ 0, 3 ], @@ -873,6 +916,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_5x5_S", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 5, 5 ], "rotation": [ 0, 3 ], @@ -896,6 +940,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_5x5_E", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 5, 5 ], "rotation": [ 0, 3 ], @@ -919,6 +964,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_5x5_N", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 5, 5 ], "rotation": [ 0, 3 ], @@ -942,6 +988,7 @@ "type": "mapgen", "method": "json", "nested_mapgen_id": "tent_b_5x5_W", + "//": "No roof due to the ruined state. Could make chunks to sync roof and wall/floor, but too insignificant to bother", "object": { "mapgensize": [ 5, 5 ], "rotation": [ 0, 3 ], diff --git a/data/json/mapgen/nested/strip_mall_nested.json b/data/json/mapgen/nested/strip_mall_nested.json index 695f323eb9c4e..cde697b5365b6 100644 --- a/data/json/mapgen/nested/strip_mall_nested.json +++ b/data/json/mapgen/nested/strip_mall_nested.json @@ -1,4 +1,76 @@ [ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "indoor_tent_5x5_S", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "#####", + "#xxx#", + "#xXx#", + "#xxx#", + "##+##" + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "indoor_tent_5x5_E", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "#####", + "#xxx#", + "#xXx+", + "#xxx#", + "#####" + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "indoor_tent_5x5_N", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "##+##", + "#xxx#", + "#xXx#", + "#xxx#", + "#####" + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "indoor_tent_5x5_W", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "#####", + "#xxx#", + "+xXx#", + "#xxx#", + "#####" + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "furniture": { "#": "f_large_canvas_wall", "X": "f_center_groundsheet", "x": "f_large_groundsheet", "+": "f_large_canvas_door" } + } + }, { "type": "mapgen", "method": "json", @@ -837,10 +909,10 @@ }, "furniture": { ".": "f_null", "#": "f_sign", "B": "f_brazier", "C": "f_camp_chair", "T": "f_tourist_table" }, "nested": { - "N": { "chunks": [ "tent_5x5_N" ] }, - "S": { "chunks": [ "tent_5x5_S" ] }, - "E": { "chunks": [ "tent_5x5_E" ] }, - "W": { "chunks": [ "tent_5x5_W" ] } + "N": { "chunks": [ "indoor_tent_5x5_N" ] }, + "S": { "chunks": [ "indoor_tent_5x5_S" ] }, + "E": { "chunks": [ "indoor_tent_5x5_E" ] }, + "W": { "chunks": [ "indoor_tent_5x5_W" ] } }, "items": { ".": { "item": "trash", "chance": 4 }, @@ -932,10 +1004,10 @@ "m": "f_makeshift_bed" }, "nested": { - "N": { "chunks": [ "tent_5x5_N" ] }, - "S": { "chunks": [ "tent_5x5_S" ] }, - "E": { "chunks": [ "tent_5x5_E" ] }, - "W": { "chunks": [ "tent_5x5_W" ] } + "N": { "chunks": [ "indoor_tent_5x5_N" ] }, + "S": { "chunks": [ "indoor_tent_5x5_S" ] }, + "E": { "chunks": [ "indoor_tent_5x5_E" ] }, + "W": { "chunks": [ "indoor_tent_5x5_W" ] } }, "items": { ".": { "item": "trash", "chance": 5 }, @@ -2364,7 +2436,7 @@ }, "toilets": { "*": { } }, "place_signs": [ { "signage": "Ultimate Explorers of ", "x": 10, "y": 21 } ], - "nested": { "V": { "chunks": [ "tent_5x5_S" ] } }, + "nested": { "V": { "chunks": [ "indoor_tent_5x5_S" ] } }, "place_loot": [ { "item": "money_strap_one", "x": 3, "y": 10, "chance": 75, "repeat": [ 1, 4 ] }, { "item": "money_strap_five", "x": 3, "y": 10, "chance": 75, "repeat": [ 1, 4 ] }, diff --git a/data/json/mapgen_palettes/abandoned_barn_p.json b/data/json/mapgen_palettes/abandoned_barn_p.json index dbe90c71c89de..e3b285bab613e 100644 --- a/data/json/mapgen_palettes/abandoned_barn_p.json +++ b/data/json/mapgen_palettes/abandoned_barn_p.json @@ -19,11 +19,14 @@ "b": "t_dirtfloor", "B": "t_door_boarded", "c": "t_dirtfloor", + "C": "t_dirtfloor", "d": "t_region_groundcover_barren", "D": "t_door_boarded_damaged", + "g": "t_dirtfloor", "h": "t_dirtfloor", "I": "t_dirtfloor", "L": [ "t_covered_well", [ "t_water_pump", 2 ] ], + "m": "t_dirtfloor", "M": "t_milking_machine", "n": "t_dirtfloor", "N": "t_dirtfloor", diff --git a/data/json/mapgen_palettes/mil_surplus.json b/data/json/mapgen_palettes/mil_surplus.json index fbb7cf8b863a3..71c601762a9cc 100644 --- a/data/json/mapgen_palettes/mil_surplus.json +++ b/data/json/mapgen_palettes/mil_surplus.json @@ -1,4 +1,20 @@ [ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "indoor_tent_3x3_N", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "#+#", + "#x#", + "###" + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "furniture": { "#": "f_canvas_wall", "x": "f_groundsheet", "+": "f_canvas_door" } + } + }, { "type": "palette", "id": "mil_surplus", @@ -142,7 +158,7 @@ ], "U": { "item": "trash" } }, - "nested": { "T": { "chunks": [ "tent_3x3_N" ] } } + "nested": { "T": { "chunks": [ "indoor_tent_3x3_N" ] } } }, { "type": "palette", @@ -327,6 +343,6 @@ }, "L": { "item": "SUS_janitors_closet", "chance": 50 } }, - "nested": { "T": { "chunks": [ [ "tent_3x3_N", 25 ], [ "deployed_small_tent", 25 ], [ "null", 50 ] ] } } + "nested": { "T": { "chunks": [ [ "indoor_tent_3x3_N", 25 ], [ "deployed_small_tent", 25 ], [ "null", 50 ] ] } } } ]