From daddaecc613863285dfc9873d9d4be7082dc7828 Mon Sep 17 00:00:00 2001 From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:08:43 -0700 Subject: [PATCH] feat(content): bungalow 25 (#3523) bungalow 25 add bungalow 25 --- data/json/mapgen/house/bungalow25.json | 106 ++++++++++++++++++ .../overmap/multitile_city_buildings.json | 9 ++ .../overmap_terrain_residential.json | 2 + data/json/regional_map_settings.json | 1 + 4 files changed, 118 insertions(+) create mode 100644 data/json/mapgen/house/bungalow25.json diff --git a/data/json/mapgen/house/bungalow25.json b/data/json/mapgen/house/bungalow25.json new file mode 100644 index 000000000000..fd3dcd5053db --- /dev/null +++ b/data/json/mapgen/house/bungalow25.json @@ -0,0 +1,106 @@ +[ + { + "type": "mapgen", + "om_terrain": "bungalow25", + "weight": 250, + "method": "json", + "object": { + "palettes": [ + "standard_domestic_palette", + "standard_domestic_lino_kitchen", + "standard_domestic_lino_bathroom", + "standard_domestic_landscaping_palette" + ], + "fill_ter": "t_floor", + "rows": [ + ".?---------p............", + ".#{{{{{##*o###%%^##o##..", + ".#-----|$ L|q#%%##8_t#..", + ".#-----|R b|+#oo#Q__So%.", + ".#-----|R +__BB#%.", + ".#-----|R ||+|||||||#..", + ".#-----|R y|b zz|D dd#..", + ".#-----+ V| | ¤#..", + ".#-----| V|& /| @@o%.", + ".#|||||| |||||| @@o%.", + ".#1_4_y + ¤#..", + ".o5_7_ s`l`H|+|#oo##..", + ".oO_JA x`l`H| Z#=,,(..", + ".#F_J_ s`l`H| Wo=,,(..", + "^#3___ ```T|UU#=,,(..", + ".#2_66 E |####,,G(..", + ".#|||| y#,,,,,K(..", + ".#v d|+| `h`` ¶,,,,,K(..", + ".#|+|| | hffh o,,,,,G(..", + ".# | `ff` #((,,(((..", + ".# @@ | hffh #%........", + ".#¤@@¤D|y``h`y#%........", + ".##oo#####oo###%........", + "........................" + ], + "terrain": { + "#": "t_wall_b", + "_": "t_linoleum_gray", + "A": "t_linoleum_gray", + "-": "t_concrete", + ",": "t_floor_noroof", + "0": [ [ "t_shrub", 2 ], "t_shrub_strawberry", "t_shrub_blueberry" ], + "(": "t_railing_v", + "{": "t_door_metal_locked", + "?": "t_gates_mech_control", + "`": "t_carpet_green", + "h": "t_carpet_green", + "f": "t_carpet_green", + "T": "t_carpet_green", + "H": "t_carpet_green", + "l": "t_carpet_green", + "K": "t_floor_noroof", + "G": "t_floor_noroof" + }, + "furniture": { "$": "f_rack", "&": "f_ergometer", "/": "f_treadmill", "=": "f_rack" }, + "items": { + "=": [ { "item": "sports", "chance": 30 }, { "item": "camping", "chance": 30 } ], + "$": { "item": "clothing_outdoor_shoes", "chance": 50 } + }, + "place_loot": [ { "item": "television", "x": 9, "y": 12 } ], + "place_vehicles": [ { "vehicle": "car", "x": 4, "y": 5, "chance": 15, "status": 80, "rotation": 90 } ] + } + }, + { + "type": "mapgen", + "om_terrain": "bungalow25_roof", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "roof_palette" ], + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + " ------------- ----- ", + " -...........- 5-...- ", + " -...........----....- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -....X..............- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -...............----- ", + " -.&.............- ", + " -...............- ", + " 5...............- ", + " -............---- ", + " -............- ", + " -.......oooo.- ", + " -.......oooo.- ", + " -.......oooo.- ", + " -.......oooo.- ", + " -............- ", + " -------------- ", + " " + ], + "terrain": { ".": "t_shingle_flat_roof" } + } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 579cb788c440..e892a7b20759 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -263,6 +263,15 @@ { "point": [ 0, 0, 1 ], "overmap": "bungalow24_roof_north" } ] }, + { + "type": "city_building", + "id": "bungalow25", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "bungalow25_north" }, + { "point": [ 0, 0, 1 ], "overmap": "bungalow25_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 0b04d9e8ece5..289a6c010e83 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -74,6 +74,7 @@ "bungalow22", "bungalow23", "bungalow24", + "bungalow25", "duplex", "garden_house_1_floor_1", "garden_house_1_floor_2", @@ -274,6 +275,7 @@ "bungalow22_roof", "bungalow23_roof", "bungalow24_roof", + "bungalow25_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 9499c2b97abc..cd0dc93abc42 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -606,6 +606,7 @@ "bungalow22": 50, "bungalow23": 50, "bungalow24": 50, + "bungalow25": 50, "house_w_1": 50, "house_two_story_basement": 50, "house_crack1": 5,