diff --git a/data/json/mapgen/house/house33.json b/data/json/mapgen/house/house33.json new file mode 100644 index 000000000000..d051d5c81420 --- /dev/null +++ b/data/json/mapgen/house/house33.json @@ -0,0 +1,185 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_33", + "object": { + "fill_ter": "t_floor", + "rows": [ + ".&``````.%%%.```.%%%....", + "##=====##!!!#~~~#!!!#...", + "#&~~~~~~#~~~~~~~~~~~#...", + "#~~~~~~~#KG~~~~~~G~~~.[.", + "#~~~~~~~##oo##*##oo##...", + "#~~~~~~~# | |D d#...", + "#~~~~~~~# hh |D d#...", + "#N~~~~~~# ff |||+|#...", + "#NA~~~~~# ff |t__B#...", + "######*## hh |||_B#...", + ".^#III T| | +>|_So...", + "..o E || || |U|_t#..[", + "..#R RR |||+|#...", + "..#|||||| |RR D#...", + "..#6 |t_+ + o...", + "..#6 |8S| | #...", + "..#|+||||Y xx s|b I#...", + "..#1__FJJ H| @@#...", + "..o5_____ H| @@#...", + "..#34O_27 |d I#...", + "..##o#*##yHHHHs##oo##...", + "....````##oooo##^%%.....", + ".X..````............[...", + "........................" + ], + "palettes": [ "standard_domestic_palette" ], + "terrain": { + "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], + "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], + "=": "t_door_metal_locked", + "&": "t_gates_control_brick", + "#": "t_brick_wall", + "~": "t_thconc_floor", + "A": "t_thconc_floor", + "N": "t_thconc_floor", + "K": "t_thconc_floor", + "G": "t_thconc_floor", + "`": "t_concrete", + "!": "t_railing", + "_": "t_linoleum_white", + "J": "t_linoleum_white", + "1": "t_linoleum_white", + "2": "t_linoleum_white", + "3": "t_linoleum_white", + "4": "t_linoleum_white", + "5": "t_linoleum_white", + "7": "t_linoleum_white", + "8": "t_linoleum_white", + "O": "t_linoleum_white", + "F": "t_linoleum_white", + "B": "t_linoleum_white", + "S": "t_linoleum_white", + "t": "t_linoleum_white" + }, + "place_loot": [ + { "item": "hose", "x": 7, "y": 21 }, + { "item": "lawnmower", "x": 1, "y": 4 }, + { "item": "television", "x": 11, "y": 16 }, + { "item": "stereo", "x": 12, "y": 16 } + ], + "place_vehicles": [ + { "vehicle": "car", "x": 4, "y": 4, "chance": 35, "rotation": 270 }, + { "vehicle": "tricycle", "x": 6, "y": 22, "chance": 40, "status": 0 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_33_roof", + "object": { + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + "|22222222222222222223 ", + "|...................3 ", + "|...................3 ", + "|...................3 ", + "|...................3 ", + "|....&.........N....3 ", + "|...................3 ", + "|...................3 ", + "|-5.................3 ", + " |.............=...3 ", + " |.................3 ", + " |.................3 ", + " |............X....3 ", + " |.................3 ", + " |.................3 ", + " |.................3 ", + " |.................3 ", + " |.................3 ", + " |.................3 ", + " |-----|......5----3 ", + " |------| ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_33_basement", + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ||||||||||||| ", + " |3.........z| ", + " |........z.U| ", + " |..........U| ", + " |.........z.| ", + " |||||||......|||||| ", + " |1...........+<+.Z| ", + " |............|U|.W| ", + " |............|||||| ", + " |...........2.....| ", + " |.................| ", + " |.................| ", + " |.................| ", + " |.................| ", + " |.................| ", + " |.................| ", + " |||||||.F...g|||||| ", + " |||||||| ", + " ", + " " + ], + "palettes": [ "basement_empty" ], + "nested": { + "1": { + "chunks": [ + [ "null", 70 ], + [ "room_6x6_office_E", 40 ], + [ "room_6x6_brewer_E", 20 ], + [ "room_6x6_junk_E", 50 ], + [ "6x6_sewing_open", 20 ] + ] + }, + "2": { + "chunks": [ + [ "null", 70 ], + [ "room_6x6_guns_W", 5 ], + [ "room_6x6_brewer_W", 10 ], + [ "6x6_electronics_open", 20 ], + [ "room_6x6_junk_W", 20 ] + ] + }, + "3": { + "chunks": [ + [ "null", 80 ], + [ "5x5_gym_N", 20 ], + [ "5x5_gym_S", 20 ], + [ "5x5_gym_E", 20 ], + [ "5x5_gym_W", 20 ], + [ "livingroom_5x5_S_1", 30 ], + [ "livingroom_5x5_E_1", 30 ], + [ "livingroom_5x5_N_1", 30 ], + [ "livingroom_5x5_W_1", 30 ], + [ "livingroom_5x5_S_2", 30 ], + [ "livingroom_5x5_E_2", 30 ], + [ "livingroom_5x5_N_2", 30 ], + [ "livingroom_5x5_W_2", 30 ], + [ "home_office_4x4_N", 20 ], + [ "home_office_4x4_S", 20 ] + ] + } + } + } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 6508851a4501..2f414cffc730 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -510,6 +510,16 @@ { "point": [ 0, 0, -1 ], "overmap": "basement" } ] }, + { + "type": "city_building", + "id": "house_33", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_33_north" }, + { "point": [ 0, 0, -1 ], "overmap": "house_33_basement_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_33_roof_north" } + ] + }, { "type": "city_building", "id": "house_08", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index ce891f01d7a3..7e4c193c8c91 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -80,6 +80,7 @@ "house_30", "house_31", "house_32", + "house_33", "house_crack1", "house_crack2", "house_crack3", @@ -245,6 +246,7 @@ "house_30_roof", "house_31_roof", "house_32_roof", + "house_33_roof", "house_crack1_roof", "house_crack3_roof", "house_detatched10_roof", @@ -325,6 +327,7 @@ "house_17_basement", "house_19_basement", "house_22_basement", + "house_33_basement", "house_2story_basement", "house_crack3_basement", "house_detatched1_basement", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index d39ef2e447a9..e61f12069843 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -637,6 +637,7 @@ "house_30": 50, "house_31": 50, "house_32": 50, + "house_33": 50, "house_garage": 50, "house_garage2": 50, "house_garage3": 50,