From 2dac99cb4dee230f4f19d107a1c3790e8f13facc Mon Sep 17 00:00:00 2001 From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com> Date: Sat, 22 Oct 2022 20:22:10 -0700 Subject: [PATCH 1/2] add bungalow 07 and 08 --- data/json/mapgen/house/bungalow07.json | 85 +++++++++++++++++ data/json/mapgen/house/bungalow08.json | 92 +++++++++++++++++++ .../overmap/multitile_city_buildings.json | 18 ++++ .../overmap_terrain_residential.json | 4 + data/json/regional_map_settings.json | 2 + 5 files changed, 201 insertions(+) create mode 100644 data/json/mapgen/house/bungalow07.json create mode 100644 data/json/mapgen/house/bungalow08.json diff --git a/data/json/mapgen/house/bungalow07.json b/data/json/mapgen/house/bungalow07.json new file mode 100644 index 0000000000000..c6d0f2f0bc642 --- /dev/null +++ b/data/json/mapgen/house/bungalow07.json @@ -0,0 +1,85 @@ +[ + { + "type": "mapgen", + "om_terrain": "bungalow07", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ], + "fill_ter": "t_floor", + "rows": [ + ".................---.p..", + ".....X...........---....", + "..[....%###oo###%---....", + ".......%#D¤@@¤ #%---....", + "..##oo### @@ ##o*###%.", + "..#¤@@¤D| d|b LL#%.", + "..o @@ |+| | #%.", + "..o )|v| II|V xy#%.", + "..#++| |||+||||V lllo%.", + "..#dd|b + RRy o%.", + "..#|||||| HHH#^.", + "..oB____+ ==$= sss#..", + "..#B8tS8|R =ff= #..", + "..#||||||R $ff$ 1#..", + "..orh + =$== J Fo..", + "..#r PR| AJ 2o..", + "..#||+||###¶¶### 5 O#..", + "..#Z U#j----j#6 J 3#..", + "..#WzNNU#j----j#6 yY#..", + "..##oo###j....j####oo#..", + "........................", + ".......[................", + "..[..........G.KG.....[.", + "........................" + ], + "terrain": { + "_": "t_linoleum_gray", + "G": "t_region_groundcover_urban", + "K": "t_region_groundcover_urban", + "=": "t_carpet_green", + "f": "t_carpet_green", + "$": "t_carpet_green" + }, + "furniture": { ")": "f_treadmill", "$": "f_chair" }, + "place_loot": [ { "item": "television", "x": 19, "y": 7 } ] + } + }, + { + "type": "mapgen", + "om_terrain": "bungalow07_roof", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "roof_palette" ], + "fill_ter": "t_shingle_flat_roof", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,--------,,,,,,,,", + ",,,,,,,,-......-,,,,,,,,", + ",,3------......-------,,", + ",,3..................|,,", + ",,3..................|,,", + ",,3..................|,,", + ",,3...N..............|,,", + ",,3..................|,,", + ",,3..................5,,", + ",,3..................|,,", + ",,3..................|,,", + ",,3..................|,,", + ",,3..............X...|,,", + ",,3..................|,,", + ",,3..................|,,", + ",,3..................|,,", + ",,3..................|,,", + ",,22222222222222222222,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,," + ], + "terrain": { ".": "t_shingle_flat_roof", ",": "t_open_air" } + } + } +] diff --git a/data/json/mapgen/house/bungalow08.json b/data/json/mapgen/house/bungalow08.json new file mode 100644 index 0000000000000..61d0a2e480927 --- /dev/null +++ b/data/json/mapgen/house/bungalow08.json @@ -0,0 +1,92 @@ +[ + { + "type": "mapgen", + "om_terrain": "bungalow08", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ], + "fill_ter": "t_floor", + "rows": [ + ".......!--!.............", + "......p!--!.............", + ".[.....!--!.%%%%%%%%%...", + ".......!--!.####oo###...", + "..jjj..!--!.#y $ RR#...", + ".......!----or s#...", + ".%%%%%%%----orh l Ho.[.", + ".##oo####*o##r l Ho...", + ".#¤@@¤|(```=|T l H#...", + ".# @@ |b```L| s#...", + ".o | ``` |||||#...", + ".o + |w8St#...", + ".# |++|++| +____o...", + ".#d|dD|WZ| yRR|QBB8#...", + ".#|||||||| R|||||||#...", + "^#v+ + R|y VV y#...", + ".#D+ || ,&,, #--.", + ".#|| y|6 J ,ff, ¶--.", + ".o d|6 J F| &ff& o--.", + ".o@@ d|7 2| ,ff, o...", + ".#@@¤ T|4n5O1|y,,&,y#...", + ".###oo####oo####ooo##...", + "........................", + ".................[......" + ], + "terrain": { + "#": "t_wall_p", + "`": "t_carpet_red", + "_": "t_linoleum_gray", + "|": "t_wall", + "?": "t_column", + ";": "t_water_sh", + "W": "t_linoleum_gray", + "Z": "t_linoleum_gray", + ",": "t_carpet_yellow", + "f": "t_carpet_yellow", + "&": "t_carpet_yellow", + "-": "t_concrete" + }, + "furniture": { "(": "f_table", "$": "f_piano", "&": "f_chair", "=": "f_rack" }, + "items": { "(": { "item": "table_foyer", "chance": 50 }, "=": { "item": "clothing_outdoor_shoes", "chance": 50 } }, + "place_loot": [ { "item": "laptop", "x": 14, "y": 6 } ] + } + }, + { + "type": "mapgen", + "om_terrain": "bungalow08_roof", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "roof_palette" ], + "fill_ter": "t_shingle_flat_roof", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,---------,,,", + ",,,,,,,,,,,,-.......|,,,", + ",,,,,,,,,,,,-.......|,,,", + ",,,,,,,,,,,,-.......|,,,", + ",------------.......|,,,", + ",3..................|,,,", + ",3..................|,,,", + ",3..................|,,,", + ",3..................|,,,", + ",3..................|,,,", + ",3..................|,,,", + ",3..................|,,,", + ",5..................|,,,", + ",3.............oooo.|,,,", + ",3.............oooo.|,,,", + ",3.............oooo.|,,,", + ",3.............oooo.|,,,", + ",3..................|,,,", + ",22222222222222222222,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,," + ], + "terrain": { ".": "t_shingle_flat_roof", ",": "t_open_air" } + } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 3cb42092e46ed..a2cd5d9a98790 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -101,6 +101,24 @@ { "point": [ 0, 0, 1 ], "overmap": "bungalow06_roof_north" } ] }, + { + "type": "city_building", + "id": "bungalow07", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "bungalow07_north" }, + { "point": [ 0, 0, 1 ], "overmap": "bungalow07_roof_north" } + ] + }, + { + "type": "city_building", + "id": "bungalow08", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "bungalow08_north" }, + { "point": [ 0, 0, 1 ], "overmap": "bungalow08_roof_north" } + ] + }, { "type": "city_building", "id": "urban_1_house", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index fdf24272fcf95..aa6ad28a087e3 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -57,6 +57,8 @@ "bungalow04", "bungalow05", "bungalow06", + "bungalow07", + "bungalow08", "duplex", "garden_house_1_floor_1", "garden_house_1_floor_2", @@ -336,6 +338,8 @@ "bungalow04_roof", "bungalow05_roof", "bungalow06_roof", + "bungalow07_roof", + "bungalow08_roof", "duplex_roof", "garden_house_1_roof", "house_01_roof", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 8d15dd9f80fb1..8be77453bbe96 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -839,6 +839,8 @@ "bungalow04": 50, "bungalow05": 50, "bungalow06": 50, + "bungalow07": 50, + "bungalow08": 50, "house_w_1": 50, "house_two_story_basement": 50, "multi_unit_two_story_basement": 40, From 358f25372468edce25247ff3a5154e9ea49edc6e Mon Sep 17 00:00:00 2001 From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com> Date: Sat, 22 Oct 2022 20:25:16 -0700 Subject: [PATCH 2/2] Update overmap_terrain_residential.json --- .../overmap/overmap_terrain/overmap_terrain_residential.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index aa6ad28a087e3..5c403fecc3439 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -339,7 +339,7 @@ "bungalow05_roof", "bungalow06_roof", "bungalow07_roof", - "bungalow08_roof", + "bungalow08_roof", "duplex_roof", "garden_house_1_roof", "house_01_roof",