From 2610709e0bf4b9b02d67409b51ddeeb8f2b16453 Mon Sep 17 00:00:00 2001 From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com> Date: Thu, 29 Sep 2022 01:49:00 -0700 Subject: [PATCH] 2StoryModern03 (#61174) * 2StoryModern03 Add 2StoryModern03 house * Update 2storymodern03.json * Update palettes.json * Update palettes.json --- data/json/mapgen/house/2storymodern03.json | 192 ++++++++++++++++++ .../overmap/multitile_city_buildings.json | 11 + .../overmap_terrain_residential.json | 4 + data/json/regional_map_settings.json | 1 + data/mods/No_Hope/palettes.json | 1 + 5 files changed, 209 insertions(+) create mode 100644 data/json/mapgen/house/2storymodern03.json diff --git a/data/json/mapgen/house/2storymodern03.json b/data/json/mapgen/house/2storymodern03.json new file mode 100644 index 0000000000000..436aa09ab1eea --- /dev/null +++ b/data/json/mapgen/house/2storymodern03.json @@ -0,0 +1,192 @@ +[ + { + "type": "mapgen", + "om_terrain": "2StoryModern03_basement", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ], + "fill_ter": "t_floor", + "rows": [ + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^###################^", + "^^^^#UU_m#u__c#A !!!!A#^", + "^^^^#___m#____# #^", + "^^^^#g__m#b__X#V eee #^", + "^^^^###+###+###V eee A#^", + "^^^^#q+ #^", + "^^^^######### T#^", + "^^^^#D,$,,,,+ #^", + "^^^^#,,,,h,,###++#++# #^", + "^^^^#¤@@,II,+d#zz#LL#<#^", + "^^^^###################^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^", + "^^^^^^^^^^^^^^^^^^^^^^^^" + ], + "terrain": { + "_": "t_thconc_floor", + "m": "t_thconc_floor", + "g": "t_thconc_floor", + "U": "t_thconc_floor", + "b": "t_thconc_floor", + ",": "t_carpet_red", + "d": "t_carpet_red", + "I": "t_carpet_red", + "h": "t_carpet_red", + "@": "t_carpet_red", + "$": "t_carpet_red", + "¶": "t_door_glass_c", + "D": "t_carpet_red", + "¤": "t_carpet_red" + }, + "items": { "¤": { "item": "nightstand", "chance": 30 } }, + "furniture": { "!": "f_counter", "$": "f_bigmirror", "¤": "f_table" } + } + }, + { + "type": "mapgen", + "om_terrain": "2StoryModern03_1", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom" ], + "fill_ter": "t_floor_waxed", + "rows": [ + ".--.....................", + ".--p...........[........", + ".--......[..............", + ".------------.....,,,...", + ".------------.....,,,...", + ".--%%%%#oo#--...........", + ".--#oo##yy#--%#::::::#%.", + ".--#ffh V#*#%#HHHsyy#%.", + ".--off V# #o#H a#%.", + ".--#h RR #&#H ll a#%.", + ".--##3 #s ##.", + ".--%#2 yo.", + ".--%#F 6# A≠o.", + ".--%#1J 6# RR ####.", + ".--%::JO574# ##+# # <#.", + ".--%%::#####L #S_# >#.", + ".------%%%##o¶#t_###o##.", + ".-------------##o#^%%%%.", + "..###*####..............", + "..#N//``U#......----G-..", + "..oN$/``Uo...X..------..", + "..#NNNqqU#......-G-KG-..", + "..###oo###.[....---G--..", + "........................" + ], + "terrain": { + "#": "t_concrete_wall", + "_": "t_linoleum_gray", + "%": [ [ "t_shrub", 2 ], "t_shrub_strawberry", "t_shrub_blueberry" ], + "[": [ [ "t_region_tree_nut", 5 ], [ "t_region_tree_shade", 4 ], [ "t_region_tree_fruit", 2 ] ], + ",": "t_shrub_lilac", + "`": "t_thconc_floor", + "U": "t_thconc_floor", + "q": "t_thconc_floor", + "/": "t_carpet_yellow", + "N": "t_carpet_yellow", + "$": "t_carpet_yellow", + "K": "t_sidewalk", + "G": "t_sidewalk" + }, + "furniture": { "≠": "f_piano", "$": "f_stool", "&": "f_table" }, + "items": { "&": { "item": "table_foyer", "chance": 50 } } + } + }, + { + "type": "mapgen", + "om_terrain": "2StoryModern03_2", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom" ], + "fill_ter": "t_floor_waxed", + "rows": [ + "........................", + "........................", + "........................", + "........................", + "........................", + ".......{{{{.............", + "...{{{{{,,{...##o##o##..", + "...{,,,,,,{{{.#88w__t#..", + "...{,,,,,,,,{{#B___S##..", + "...{,₸,₸,₸,,,,#B___8##..", + "...##::::::#¶o####+####.", + "....#d + y!#.", + "....od T bRRRR# o.", + "....#D @@ #+######+## #.", + "....##¤@@¤# d#v R#>o.", + ".....#::::#Dd#Ph z!R#y#.", + "..........#####rr#o####.", + "..............#oo#.^....", + "..((((((((..............", + "..((((((((..............", + "..((((((((..............", + "..((((((((..............", + "..((((((((..............", + "........................" + ], + "terrain": { + "#": "t_concrete_wall", + ".": "t_open_air", + "_": "t_linoleum_gray", + "(": "t_shingle_flat_roof", + "{": "t_railing_v", + ",": "t_floor_noroof", + "₸": "t_floor_noroof" + }, + "furniture": { "!": "f_table", "₸": "f_deckchair", "¤": "f_table" }, + "items": { "!": { "item": "table_foyer", "chance": 50 }, "¤": { "item": "nightstand", "chance": 30 } } + } + }, + { + "type": "mapgen", + "om_terrain": "2StoryModern03_roof", + "weight": 250, + "method": "json", + "object": { + "palettes": [ "roof_palette" ], + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " -------- ", + " -......| ", + " -.....~| ", + " -.....~| ", + " ------------......|| ", + " 3...........=.....| ", + " 3.A...............| ", + " 3.................| ", + " 33.....N.......&..| ", + " 222222...........| ", + " 22222..222222 ", + " 2222 ", + " ", + " ", + " ", + " ", + " ", + " " + ] + } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index e7aea225d9e69..37729594da510 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -21,6 +21,17 @@ { "point": [ 0, 0, 2 ], "overmap": "2storyModern02_roof_north", "locations": [ "land" ] } ] }, + { + "type": "city_building", + "id": "2StoryModern03", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, -1 ], "overmap": "2StoryModern03_basement_north" }, + { "point": [ 0, 0, 0 ], "overmap": "2StoryModern03_1_north" }, + { "point": [ 0, 0, 1 ], "overmap": "2StoryModern03_2_north" }, + { "point": [ 0, 0, 2 ], "overmap": "2StoryModern03_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 0103f5d606cec..7798df975bdfc 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -45,6 +45,8 @@ "2storyModern01_second", "2storyModern02_1", "2storyModern02_2", + "2StoryModern03_1", + "2StoryModern03_2", "duplex", "garden_house_1_floor_1", "garden_house_1_floor_2", @@ -315,6 +317,7 @@ "id": [ "2storyModern01_roof", "2storyModern02_roof", + "2StoryModern03_roof", "duplex_roof", "garden_house_1_roof", "house_01_roof", @@ -416,6 +419,7 @@ "id": [ "2storyModern01_basement", "2storyModern02_basement", + "2StoryModern03_basement", "basement_bionic", "basement_bionic_decoy", "basement_chem", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 1cfb682b9af3a..5d020e7a5fefc 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -831,6 +831,7 @@ "houses": { "2storyModern01": 5, "2storyModern02": 50, + "2StoryModern03": 50, "house_w_1": 50, "house_two_story_basement": 50, "multi_unit_two_story_basement": 40, diff --git a/data/mods/No_Hope/palettes.json b/data/mods/No_Hope/palettes.json index 4de11e8cee49c..02ec614fda7f1 100644 --- a/data/mods/No_Hope/palettes.json +++ b/data/mods/No_Hope/palettes.json @@ -93,6 +93,7 @@ "|": "t_wall_w", "#": "t_brick_wall", ":": "t_wall_glass", + "¶": "t_door_glass_c", "-": "t_sidewalk", "o": [ [ "t_window_frame", 5 ],