diff --git a/data/json/mapgen/house/house_inner_garden.json b/data/json/mapgen/house/house_inner_garden.json new file mode 100644 index 0000000000000..ba19c5dd67965 --- /dev/null +++ b/data/json/mapgen/house/house_inner_garden.json @@ -0,0 +1,114 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_inner_garden", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...$..GssMMMMMMMMsssss..", + ".$.....ssM......Msssssu.", + ".......ssM.....##xxxxx%#", + ".#MMM##8]#8#8#8#~~~~~~u#", + ".#888#E #5 #~~~~~~~#", + "^#yay##8]# #~~~~~~##", + "##4 #~~~~~~N#", + "#h #~~~~~~U#", + "## #~~~~~~U#", + ".# +~~~~~~U#", + ".# y y8]888#8#88#8##", + ".###iL## #8sssssssssss#.", + ".p#n 8s#3..3..sFs#.", + ".M#K JA ]s.......sFs#.", + ".^#QllJA 8s#......sFs#.", + "######## #8sSsssssssss#.", + "#y + y8]#8]#8]8888#.", + "o 6 #R + 1 #.", + "o #R #++#HLH #.", + "#O ##+#Wg#### #.", + "#######j ####j + #.", + ".....^#t d#dd t# #OOOO#.", + "......###o#o###########.", + "........................" + ], + "palettes": [ "house_w_foundation_palette" ], + "terrain": { "8": "t_wall_glass", "#": "t_rock_wall", "]": "t_door_glass_c", "%": "t_wall_w" }, + "furniture": { "a": "f_displaycase" }, + "place_vehicles": [ + { "vehicle": "showroom_small_vehicles", "x": 17, "y": 5, "rotation": 270, "chance": 20, "status": 0 }, + { "vehicle": "showroom_small_vehicles", "x": 19, "y": 5, "rotation": 270, "chance": 20, "status": 0 } + ], + "items": { + "E": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] }, + "G": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, + "a": { "item": "art", "chance": 100 }, + "n": [ + { "item": "SUS_dishes", "chance": 100 }, + { "item": "SUS_silverware", "chance": 100 }, + { "item": "SUS_kitchen_sink", "chance": 100 } + ], + "Q": [ { "item": "SUS_cookware", "chance": 100 }, { "item": "SUS_spice_collection", "chance": 100 } ], + "K": [ + { "item": "SUS_utensils", "chance": 100 }, + { "item": "SUS_knife_drawer", "chance": 100 }, + { "item": "SUS_junk_drawer", "chance": 100 }, + { "item": "SUS_appliances_cupboard", "chance": 100 } + ], + "J": [ { "item": "SUS_breakfast_cupboard", "chance": 100 }, { "item": "SUS_coffee_cupboard", "chance": 100 } ], + "l": { "item": "SUS_fridge", "chance": 100 }, + "i": { "item": "SUS_oven", "chance": 100 } + }, + "nested": { + "1": { "chunks": [ [ "bedroom_4x4_adult_1_E", 20 ] ] }, + "3": { "chunks": [ [ "garden_3x3_1", 50 ], [ "garden_3x3_2", 33 ], [ "garden_3x3_3", 33 ] ] }, + "4": { "chunks": [ [ "diningroom_5x5_N_S", 50 ], [ "diningroom_6x6_N_S_1A", 50 ] ] }, + "5": { + "chunks": [ + [ "livingroom_5x5_N_1", 20 ], + [ "livingroom_5x5_S_1", 20 ], + [ "livingroom_5x5_E_1", 20 ], + [ "livingroom_5x5_E_2", 20 ], + [ "livingroom_5x5_W_1", 20 ] + ] + }, + "6": { "chunks": [ [ "bonus_room_3x3_S_6", 40 ], [ "bonus_room_3x3_S_5", 20 ], [ "bonus_room_3x3_S_7", 40 ] ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_inner_garden_roof", + "object": { + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + " ", + " --------|", + " ---------------.......|", + " |................ooo..|", + " |.....................|", + "5|................ooo.A|", + "|~.....................|", + "||................ooo..|", + " |.....................|", + " |..........22222222223|", + " |..........3 ", + " |..&.......3 ", + " |..........3 ", + " |..........3 ", + "||..........3 ", + "|...........22222222222 ", + "|.....................| ", + "|.....................| ", + "|................... .| ", + "-------...............| ", + " 5..&............| ", + " ----------------- ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index bdabbc119972f..d39f219c916f1 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -76,6 +76,15 @@ { "point": [ 0, 0, -1 ], "overmap": "basement" } ] }, + { + "type": "city_building", + "id": "house_inner_garden", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_inner_garden_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_inner_garden_roof_north" } + ] + }, { "type": "city_building", "id": "s_electronics", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index 742df73bf684c..70aa81386b929 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -468,6 +468,23 @@ "see_cost": 2, "mondensity": 2 }, + { + "type": "overmap_terrain", + "id": "house_inner_garden", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_inner_garden_roof", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2 + }, { "type": "overmap_terrain", "id": "house_w_1", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index b958b7ac3dc94..1f8cb793d1ab8 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -546,6 +546,7 @@ "house_w_4": 40, "house_w_5": 40, "house_w_6": 40, + "house_inner_garden": 40, "emptyresidentiallot": 20, "apartments_con_new": 10, "apartments_mod_new": 10,