diff --git a/data/json/mapgen/hotel_tower.json b/data/json/mapgen/hotel_tower.json index ed0e6c8d47851..acbf28641cdfe 100644 --- a/data/json/mapgen/hotel_tower.json +++ b/data/json/mapgen/hotel_tower.json @@ -1,14 +1,17 @@ [ { "method": "json", + "om_terrain": [ [ "hotel_tower_1_3", "hotel_tower_1_2", "hotel_tower_1_1" ] ], + "type": "mapgen", + "weight": 250, "object": { "fill_ter": "t_pavement", "rows": [ " sssssssssssssssssssssssss________sssss________sssssssssssssssssssssssss", " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", - " s_____,_____,_____,_____,________s'''s________,_____,_____,_V___,_____s", - " s_____,_V___,_____,_____,________s'''s________,_____,_____,_____,_____s", + " s_____,_V___,_____,_V___,________s'''s________,_V___,_____,_V___,_____s", + " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", " s_____,_____,_____,_____,________sssss________,_____,_____,_____,_____s", " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s", " s_____________________________________________________________________s", @@ -17,10 +20,10 @@ " s_____________________________________________________________________s", " s_____________________________________________________________________s", " s_____,_____,_____,_____,_____________________,_____,_____,_____,_____s", - " s_____,_____,_____,_____,________sssss________,_____,_____,_____,_____s", - " s_____,_____,_____,_____,________s'''s________,_____,_V___,_V___,_____s", + " s___V_,_____,___V_,_____,________sssss________,_____,_V___,_____,_V___s", + " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", + " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", - " s_____,_____,___v_,_____,________s'''s________,_____,_____,_____,_____s", " s_____,_____,_____,_____,________s'''s________,_____,_____,_____,_____s", " sssssssssssssssssssssssss________s'''s________sssssssssssssssssssssssss", " sssssssssssssssssssssssss________s'''s________sssssssssssssssssssssssss", @@ -37,13 +40,13 @@ { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 0, 23 ], "chance": 2 }, { "monster": "GROUP_ZOMBIE", "x": [ 48, 71 ], "y": [ 0, 23 ], "chance": 2 } ] - }, - "om_terrain": [ [ "hotel_tower_1_3", "hotel_tower_1_2", "hotel_tower_1_1" ] ], - "type": "mapgen", - "weight": 250 + } }, { "method": "json", + "om_terrain": [ [ "hotel_tower_1_6", "hotel_tower_1_5A", "hotel_tower_1_4" ] ], + "type": "mapgen", + "weight": 250, "object": { "fill_ter": "t_floor", "rows": [ @@ -57,20 +60,20 @@ " s___________________________sssssssssssssss___________________________s", " s_____,_____,_____,_____,_sssssssssssssssssss_,_____,_____,_____,_____s", " s_____,_____,_____,_____,sssssssssssssssssssss,_____,_V___,_____,_____s", - " s_____,_____,_____,_____,ssssss-HHGGGHH-ssssss,_____,_____,_____,_____s", - " s_____,_____,_____,_____,sssss||^.....^||sssss,_____,_____,_____,_____s", - " s_____,___v_,_____,_____,ssss||^......Yc||ssss,_____,_____,_____,___v_s", - " s_____,_____,_____,_____,sss||^.......YcD||sss,_____,_____,_____,_____s", + " s_____,_____,_____,_____,ssssss%HHGGGHH%ssssss,_____,_____,_____,_____s", + " s_____,___v_,_____,_____,sssss%%^.....^%%sssss,_____,_____,_____,___v_s", + " s_____,_____,_____,_____,ssss%%^......Yc%%ssss,_____,_____,_____,_____s", + " s_____,_____,_____,_____,sss%%^.......YcD%%sss,_____,_____,_____,_____s", " ssssssssssssssssssssssssssssH^........YcxDHssssssssssssssssssssssssssss", " ssssssssssssssssssssssssssssH..........ch.Hssssssssssssssssssssssssssss", " s'''''''''''''''''''''''''''H.j.t......c..H'''''''''''''''''''''''''''s", " s'''''''''''''''''''''''''''H.j.t......ch.H'''''''''''''''''''''''''''s", " s''''''''''T'''''T'''''''T''H.j........c..H''T'''''''T'''''T''''''''''s", - " s'''''''''''''''''''''''''''|.jjj......c.L|'''''''''''''''''''''''''''s", - " s''''|-www-|-www-|-www-|-www||.........-+||www-|-www-|-www-|-www-|''''s", - " s''''|...Ld|....d|....d|....d|...........|d..ht|d....|d..L.|d....|''''s", - " s''''|c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c|''''s", - " s''''|c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o|''''s" + " s'''''''''''''''''''''''''''%.jjj......c.L%'''''''''''''''''''''''''''s", + " s''''%%www%%%www%%%www%%%www%%.........%+%%www%%%www%%%www%%%www%%''''s", + " s''''%...Ld|....d|....d|....d|...........|d..ht|d....|d..L.|d....%''''s", + " s''''%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%''''s", + " s''''%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%''''s" ], "palettes": [ "hotel_tower_palette.json" ], "terrain": { "V": "t_pavement", "w": "t_window_domestic", "x": "t_console_broken" }, @@ -91,10 +94,193 @@ { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 7, 23 ], "repeat": 2 }, { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 23 ] } ] - }, - "om_terrain": [ [ "hotel_tower_1_6", "hotel_tower_1_5", "hotel_tower_1_4" ] ], + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_flr2_1_6", "hotel_tower_flr2_1_5A", "hotel_tower_flr2_1_4" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "********************************111111111*******************************", + "*******************************11111011111******************************", + "******************************1111100011111*****************************", + "*****************************111110000011111****************************", + "*****************************111100000001111****************************", + "*****************************111000000000111****************************", + "*****************************111000000000111****************************", + "*****************************111000000000111****************************", + "*****************************111000000000111****************************", + "*****************************111111111111111****************************", + "******%%www%%%www%%%www%%%www%%H%%HHHHH%%H%%www%%%www%%%www%%%www%%*****", + "******%...Ld|....d|....d|....d|^...^^....^|d..ht|d....|d..L.|d....%*****", + "******%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%*****", + "******%c..BB|c..BB|o..BBXc.LBB|t.........t|BB..cXBB..c|BB..o|BB..o%*****" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "w": "t_window_domestic", "x": "t_console_broken" }, + "furniture": { "D": "f_desk" }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 }, + "o": { "item": "hotel_coffee_bar", "chance": 100 } + }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 21, 23 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 21, 23 ] } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_flr3_1_6", "hotel_tower_flr3_1_5", "hotel_tower_flr3_1_4" ] ], "type": "mapgen", - "weight": 250 + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "******%%www%%%www%%%www%%%www%%%H%%HHH%%H%%%www%%%www%%%www%%%www%%*****", + "******%...Ld|....d|....d|....d|^.........^|d..ht|d....|d..L.|d....%*****", + "******%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%*****", + "******%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%*****" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "w": "t_window_domestic", "x": "t_console_broken" }, + "furniture": { "D": "f_desk" }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 }, + "o": { "item": "hotel_coffee_bar", "chance": 100 } + }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 21, 23 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 21, 23 ] } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_flr4_1_6", "hotel_tower_flr4_1_5", "hotel_tower_flr4_1_4" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "************************************************************************", + "******%%www%%%www%%%www%%%www%%%H%%HHH%%H%%%www%%%www%%%www%%%www%%*****", + "******%...Ld|....d|....d|....d|^.........^|d..ht|d....|d..L.|d....%*****", + "******%c..BB|o..BB|c.LBB|c..BB|h.........h|BB..h|BB..o|BB..c|BB..c%*****", + "******%c..BB|c..BB|o..BB|c.LBB|t.........t|BB..c|BB..c|BB..o|BB..o%*****" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "w": "t_window_domestic", "x": "t_console_broken" }, + "furniture": { "D": "f_desk" }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 }, + "o": { "item": "hotel_coffee_bar", "chance": 100 } + }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 21, 23 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 21, 23 ] } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_roof_1_6", "hotel_tower_roof_1_5", "hotel_tower_roof_1_4" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " |222222222222222222222222222222222222222222222222222222222223 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 " + ], + "palettes": [ "roof_palette" ] + } }, { "method": "json", @@ -104,29 +290,29 @@ "object": { "fill_ter": "t_floor", "rows": [ - " s''''|o....|c....|c....|c....|t.........t|d...c|....c|....c|....c|''''s", - " s''''|....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....|''''s", - " s''''|...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...|''''s", - " s''''|..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..|''''s", - " s''''|..+.S|..+.S|..+.S|..+.S|888=...|x88|S.+..|S.+..|S.+..|S.+..|''''s", - " s''''|..|.&|..|.&|..|.&|..|.&|888=...=888|&.|..|&.|..|&.|..|&.|..|''''s", - " s'|--|..|bb|..|bb|..|bb|..|bb|88x|...=888|bb|..|bb|..|bb|..|bb|..|--|'s", - " s'|.>|-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-|>.|'s", - " ss|..|...........................................................|..|ss", + " s''''%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%''''s", + " s''''%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%''''s", + " s''''%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%''''s", + " s''''%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%''''s", + " s''''%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%''''s", + " s'''4%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%4'''s", + " s'%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%'s", + " s'%<>%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%><%'s", + " ss%..%...........................................................%..%ss", " ss=..+...........................................................+..=ss", - " ss|..|^..........................................................|..|ss", - " |..|-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-|..| ", - " |--|..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..|--| ", - " |..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..| ", - " |..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..| ", - " |..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..| ", - " |..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...| ", - " |....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....| ", - " |c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o| ", - " |o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c| ", - " |c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c| ", - " |....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....| ", - " |-www-|-www-|-www-|-www-|-www-|-www-|-www-|-www-|-www-|-www-| ", + " ss%..%^..........................................................%..%ss", + " %UF%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%UF% ", + " %%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%% ", + " %..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..% ", + " %..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..% ", + " %..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..% ", + " %..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...% ", + " %....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....% ", + " %c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o% ", + " %o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c% ", + " %c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c% ", + " %....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....% ", + " %%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%% ", " " ], "palettes": [ "hotel_tower_palette.json" ], @@ -147,6 +333,211 @@ ] } }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_flr2_1_9", "hotel_tower_flr2_1_8", "hotel_tower_flr2_1_7" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "******%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%*****", + "******%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%*****", + "******%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%*****", + "******%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%*****", + "******%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%*****", + "****4*%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%*4***", + "***%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%**", + "***%><%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%<>%**", + "***H..%...........................................................%..H**", + "***H..+...........................................................+..H**", + "***H..%^..........................................................%..H**", + "***%UF%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%UF%**", + "***%%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%**", + "******%..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%*****", + "******%..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%*****", + "******%..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%*****", + "******%..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%*****", + "******%....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%*****", + "******%c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%*****", + "******%o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%*****", + "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****", + "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****", + "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****", + "*************************************************************************" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" }, + "toilets": { "&": { } }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 }, + "o": { "item": "hotel_coffee_bar", "chance": 100 } + }, + "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_flr3_1_9", "hotel_tower_flr3_1_8", "hotel_tower_flr3_1_7" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "******%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%*****", + "******%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%*****", + "******%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%*****", + "******%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%*****", + "******%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%*****", + "*****4%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%4****", + "***%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%**", + "***%<>%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%><%**", + "***H..%...........................................................%..H**", + "***H..+...........................................................+..H**", + "***H..%^..........................................................%..H**", + "***%UF%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%UF%**", + "***%%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%**", + "******%..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%*****", + "******%..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%*****", + "******%..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%*****", + "******%..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%*****", + "******%....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%*****", + "******%c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%*****", + "******%o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%*****", + "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****", + "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****", + "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****", + "*************************************************************************" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" }, + "toilets": { "&": { } }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 }, + "o": { "item": "hotel_coffee_bar", "chance": 100 } + }, + "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_flr4_1_9", "hotel_tower_flr4_1_8", "hotel_tower_flr4_1_7" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "******%o....|c....|c....|c....|t.........t|d...c|....c|....c|....c%*****", + "******%....h|...Lh|....h|....h|h.........h|BB..c|h...L|h....|h....%*****", + "******%...ht|...ht|...ht|...ht|^.........^|BB...|th...|th...|th...%*****", + "******%..|--|..|--|..|--|..|--|---|...|---|--|..|--|..|--|..|--|..%*****", + "******%..+.S|..+.S|..+.S|..+.S|888G...|x88|S.+..|S.+..|S.+..|S.+..%*****", + "****4*%..|.&|..|.&|..|.&|..|.&|888G...G888|&.|..|&.|..|&.|..|&.|..%*4***", + "***%%%%..|bb|..|bb|..|bb|..|bb|88x|...G888|bb|..|bb|..|bb|..|bb|..%%%%**", + "***%>F%-7|--|-7|--|-7|--|-7|--|---|...|---|--|7-|--|7-|--|7-|--|7-%F>%**", + "***H.U%...........................................................%U.H**", + "***H..+...........................................................+..H**", + "***%7%%^..........................................................%%7%**", + "***%.<%-7|--|-7|--|-7|--|-7|--|-7|--|--|7-|--|7-|--|7-|--|7-|--|7-%<.%**", + "***%%%%..|bb|..|bb|..|bb|..|bb|..|bb|bb|..|bb|..|bb|..|bb|..|bb|..%%%%**", + "******%..|.&|..|.&|..|.&|..|.&|..|.&|&.|..|&.|..|&.|..|&.|..|&.|..%*****", + "******%..+.S|..+.S|..+.S|..+.S|..+.S|S.+..|S.+..|S.+..|S.+..|S.+..%*****", + "******%..|--|..|--|..|--|..|--|..|--|--|..|--|..|--|..|--|..|--|..%*****", + "******%..Lht|..LBB|...ht|...ht|...ht|BB..L|th...|th...|BB...|th...%*****", + "******%....h|o..BB|....h|....h|....h|BB..c|h....|h....|BB..c|h....%*****", + "******%c....|c...d|c....|c...L|o....|d...c|....c|....o|dL..c|....o%*****", + "******%o..BB|c..BB|c..BB|c..BB|c..BB|BB..o|BB..o|BB..c|BB..o|BB..c%*****", + "******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****", + "******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****", + "******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****", + "*************************************************************************" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" }, + "toilets": { "&": { } }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 }, + "o": { "item": "hotel_coffee_bar", "chance": 100 } + }, + "item": { "S": { "item": "towel", "chance": 3, "amount": [ 1, 2 ] } }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "hotel_tower_roof_1_9", "hotel_tower_roof_1_8", "hotel_tower_roof_1_7" ] ], + "type": "mapgen", + "weight": 250, + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |-5|..%%%%%%%%%%%%%%%%%%%%%%%%%DD%%%%%%%%%%%%%%%%%%%%%%%%%%%%..35-3 ", + " |.....%.....................................................%.....3 ", + " |.....%.....YYYYY.................................YYYYY.....%.....3 ", + " ########....66666.................................66666.....####### ", + " #______+.....................AAAAAA.........................+____H# ", + " #_>_HHH#.....................AAAAAA.........................#___>H# ", + " ########.....................AAAAAA.........................####### ", + " |..%.....66666.................................66666.....%..3 ", + " |..%.....YYYYY.................................YYYYY.....%..3 ", + " |..%.....................................................%..3 ", + " |..%%%%%%%%%%%%%%%%%%%%%%%%%DD%%%%%%%%%%%%%%%%%%%%%%%%%%%%..3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |...........................................................3 ", + " |-----------------------------------------------------------3 ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { + ">": [ "t_stairs_down" ], + "#": "t_adobe_brick_wall", + "_": "t_thconc_floor", + "+": "t_door_metal_c", + "D": "t_chaingate_l", + "%": "t_chainfence", + "H": "t_generator_broken" + }, + "furniture": { "Y": "f_standing_tank", "6": "f_water_heater", "7": "f_roof_turbine_vent" }, + "liquids": { "6": { "liquid": "water_clean", "amount": [ 0, 100 ] }, "Y": { "liquid": "water_clean", "amount": [ 100, 1000 ] } }, + "place_monsters": [ + { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 0, 22 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 24, 47 ], "y": [ 23, 3 ], "repeat": 2 }, + { "monster": "GROUP_ZOMBIE", "x": [ 49, 65 ], "y": [ 0, 22 ], "repeat": 2 } + ] + } + }, { "method": "json", "om_terrain": [ [ "hotel_tower_b_3", "hotel_tower_b_2", "hotel_tower_b_1" ] ], @@ -200,7 +591,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "hotel_tower_1_5" ], + "om_terrain": [ "hotel_tower_1_5B" ], "weight": 250, "object": { "fill_ter": "t_floor", @@ -213,20 +604,66 @@ "________________________", "________________________", "__sssssssssssssssssssss_", - "_,sssssXsssssssssXsssss,", "_,sssssssssssssssssssss,", - "_,sss|HHHGGHHHGGHHH|sss,", - "_,sssH............^|sss,", + "_,sssssssssssssssssssss,", + "_,sss%HHHGGHHHGGHHH%sss,", + "_,sssH............^%sss,", "_,sssH^............Hsss,", - "_,sss|cccc.........Hsss,", - "sssss|LL.c.........Hssss", - "sssss|...x......hh.|ssss", - "'''''|h..c......tt.H''''", - "'''''|D.r|......tt.H''''", - "''T''|-+-|......hh.H''T'", - "'''''|^............|''''", - "|-www||...........||www-", - "|....d|...........|d..ht", + "_,sss%cccc.........Hsss,", + "sssss%LL.c.........Hssss", + "sssss%...x......hh.%ssss", + "'''''%h..c......tt.H''''", + "'''''%D.r%......tt.H''''", + "''T''%%+%%......hh.H''T'", + "'''''%^............%''''", + "%%www%%...........%%www%", + "%....d|...........|d..ht", + "%c..BB|h.........h|BB..h", + "%c.LBB|t.........t|BB..c" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic", "x": "t_console_broken" }, + "furniture": { "D": "f_desk" }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 } + }, + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ], + "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 10, 15 ], "y": [ 11, 19 ], "chance": 100, "repeat": [ 1, 3 ] } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "hotel_tower_flr2_1_5B" ], + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111000111****", + "*****111111111000111****", + "*****111111111000111****", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111111111****", + "%%www%%%%H%HHHH%H%%%www%", + "|....d|...^jjjj^..|d..ht", "|c..BB|h.........h|BB..h", "|c.LBB|t.........t|BB..c" ], @@ -239,14 +676,14 @@ "c": { "item": "magazines", "chance": 15 }, "d": { "item": "book_hotel_tower_bible", "chance": 2 } }, - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] } ], "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 10, 15 ], "y": [ 11, 19 ], "chance": 100, "repeat": [ 1, 3 ] } ] } }, { "type": "mapgen", "method": "json", - "om_terrain": [ "hotel_tower_1_5" ], + "om_terrain": [ "hotel_tower_1_5C" ], "weight": 250, "object": { "fill_ter": "t_floor", @@ -261,17 +698,17 @@ "________________________", "________________________", "________________________", + "_____________V__________", "________________________", "________________________", - "________________________", - "__'''''''''''''''''''''_", - "ssssssssssssssssssssssss", - "sssss|---HGGHGGH---|ssss", - "'''''|.............|''''", + "___MMMMMMsssssssMMMMMM__", + "sssXsssssssssssssssssXss", + "sssss%%%%HGGHGGH%%%%ssss", + "'''''%.............%''''", "'''''H.............H''''", "''T''H....ccccc....H''T'", - "'''''|^...cDxDc...^|''''", - "|-www||......hc...||www-", + "'''''%^...cDxDc...^%''''", + "%%www%%......hc...%%www%", "|....d|...ccccc...|d..ht", "|c..BB|...........|BB..h", "|c.LBB|h.........h|BB..c" @@ -281,6 +718,7 @@ "+": [ "t_door_c", "t_door_c", "t_door_o" ], "G": "t_door_glass_c", "w": "t_window_domestic", + "V": "t_pavement", "x": "t_console_broken" }, "furniture": { "D": "f_desk" }, @@ -291,7 +729,58 @@ "d": { "item": "book_hotel_tower_bible", "chance": 2 } }, "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 7, 23 ], "repeat": 2 } ], - "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 3, 21 ], "y": [ 11, 17 ], "chance": 100, "repeat": [ 1, 3 ] } ] + "place_vehicles": [ { "vehicle": "luggage_cart", "x": [ 3, 21 ], "y": [ 16, 17 ], "chance": 100, "repeat": [ 1, 3 ] } ], + "vehicles": { "V": { "vehicle": "suburban_home", "chance": 100, "rotation": 180 } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "hotel_tower_flr2_1_5C" ], + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "************************", + "************************", + "************************", + "************************", + "************************", + "************************", + "***1111111111111111111**", + "***1000000000000000001**", + "***1000000000000000001**", + "***1000000000000000001**", + "***1000000000000000001**", + "***1000000000000000001**", + "***1000000000000000001**", + "***1000000000000000001**", + "***1111111111111111111**", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111111111****", + "*****111111111111111****", + "%%www%%%H%%HHHH%%H%%www%", + "|....d|...^jjjj^..|d..ht", + "|c..BB|h.........h|BB..h", + "|c.LBB|t.........t|BB..c" + ], + "palettes": [ "hotel_tower_palette.json" ], + "terrain": { + "+": [ "t_door_c", "t_door_c", "t_door_o" ], + "G": "t_door_glass_c", + "w": "t_window_domestic", + "x": "t_console_broken" + }, + "furniture": { "D": "f_desk" }, + "items": { + "B": { "item": "bed", "chance": 50 }, + "L": { "item": "hotel_luggage", "chance": 100 }, + "c": { "item": "magazines", "chance": 15 }, + "d": { "item": "book_hotel_tower_bible", "chance": 2 } + }, + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 7, 23 ], "y": [ 21, 23 ] } ] } } ] diff --git a/data/json/mapgen_palettes/hotel_tower_palette.json b/data/json/mapgen_palettes/hotel_tower_palette.json index acc3f7722767e..0b1d665dc2f77 100644 --- a/data/json/mapgen_palettes/hotel_tower_palette.json +++ b/data/json/mapgen_palettes/hotel_tower_palette.json @@ -26,14 +26,19 @@ }, "terrain": { ",": "t_pavement_y", + "1": "t_flat_roof", + "0": "t_glass_roof", + "*": "t_open_air", "6": "t_wall_glass", "_": "t_pavement", "2": "t_carpet_green", "s": "t_sidewalk", "'": [ [ "t_grass", 5 ], "t_dirt", "t_shrub" ], + "M": [ "t_shrub_lilac", "t_shrub_hydrangea" ], " ": [ [ "t_grass", 5 ], "t_dirt", "t_shrub" ], - "-": "t_adobe_brick_wall", - "|": "t_adobe_brick_wall", + "-": "t_wall_w", + "|": "t_wall_w", + "%": "t_adobe_brick_wall", "T": "t_tree_young", "v": "t_pavement", "w": "t_water_pool_shallow", @@ -51,6 +56,7 @@ ">": "t_stairs_down", "#": "t_rock", "$": "t_sewage_pipe", + "4": "t_gutter_downspout", "P": "t_sewage_pump" } } diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index ffa0b724b4921..53b65e1f90ac1 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -840,7 +840,7 @@ }, { "type": "city_building", - "id": "hotel", + "id": "hotel_1", "locations": [ "land" ], "overmaps": [ { "point": [ 1, 0, 0 ], "overmap": "road_end_north" }, @@ -848,11 +848,123 @@ { "point": [ 1, 1, 0 ], "overmap": "hotel_tower_1_2_north" }, { "point": [ 2, 1, 0 ], "overmap": "hotel_tower_1_1_north" }, { "point": [ 0, 2, 0 ], "overmap": "hotel_tower_1_6_north" }, - { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5_north" }, + { "point": [ 0, 2, 1 ], "overmap": "hotel_tower_flr2_1_6_north" }, + { "point": [ 0, 2, 2 ], "overmap": "hotel_tower_flr3_1_6_north" }, + { "point": [ 0, 2, 3 ], "overmap": "hotel_tower_flr4_1_6_north" }, + { "point": [ 0, 2, 4 ], "overmap": "hotel_tower_roof_1_6_north" }, + { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5A_north" }, + { "point": [ 1, 2, 1 ], "overmap": "hotel_tower_flr2_1_5A_north" }, + { "point": [ 1, 2, 2 ], "overmap": "hotel_tower_flr3_1_5_north" }, + { "point": [ 1, 2, 3 ], "overmap": "hotel_tower_flr4_1_5_north" }, + { "point": [ 1, 2, 4 ], "overmap": "hotel_tower_roof_1_5_north" }, { "point": [ 2, 2, 0 ], "overmap": "hotel_tower_1_4_north" }, + { "point": [ 2, 2, 1 ], "overmap": "hotel_tower_flr2_1_4_north" }, + { "point": [ 2, 2, 2 ], "overmap": "hotel_tower_flr3_1_4_north" }, + { "point": [ 2, 2, 3 ], "overmap": "hotel_tower_flr4_1_4_north" }, + { "point": [ 2, 2, 4 ], "overmap": "hotel_tower_roof_1_4_north" }, { "point": [ 0, 3, 0 ], "overmap": "hotel_tower_1_9_north" }, + { "point": [ 0, 3, 1 ], "overmap": "hotel_tower_flr2_1_9_north" }, + { "point": [ 0, 3, 2 ], "overmap": "hotel_tower_flr3_1_9_north" }, + { "point": [ 0, 3, 3 ], "overmap": "hotel_tower_flr4_1_9_north" }, + { "point": [ 0, 3, 4 ], "overmap": "hotel_tower_roof_1_9_north" }, { "point": [ 1, 3, 0 ], "overmap": "hotel_tower_1_8_north" }, + { "point": [ 1, 3, 1 ], "overmap": "hotel_tower_flr2_1_8_north" }, + { "point": [ 1, 3, 2 ], "overmap": "hotel_tower_flr3_1_8_north" }, + { "point": [ 1, 3, 3 ], "overmap": "hotel_tower_flr4_1_8_north" }, + { "point": [ 1, 3, 4 ], "overmap": "hotel_tower_roof_1_8_north" }, { "point": [ 2, 3, 0 ], "overmap": "hotel_tower_1_7_north" }, + { "point": [ 2, 3, 1 ], "overmap": "hotel_tower_flr2_1_7_north" }, + { "point": [ 2, 3, 2 ], "overmap": "hotel_tower_flr3_1_7_north" }, + { "point": [ 2, 3, 3 ], "overmap": "hotel_tower_flr4_1_7_north" }, + { "point": [ 2, 3, 4 ], "overmap": "hotel_tower_roof_1_7_north" }, + { "point": [ 0, 3, -1 ], "overmap": "hotel_tower_b_3_north" }, + { "point": [ 1, 3, -1 ], "overmap": "hotel_tower_b_2_north" }, + { "point": [ 2, 3, -1 ], "overmap": "hotel_tower_b_1_north" } + ] + }, + { + "type": "city_building", + "id": "hotel_2", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 1, 0, 0 ], "overmap": "road_end_north" }, + { "point": [ 0, 1, 0 ], "overmap": "hotel_tower_1_3_north" }, + { "point": [ 1, 1, 0 ], "overmap": "hotel_tower_1_2_north" }, + { "point": [ 2, 1, 0 ], "overmap": "hotel_tower_1_1_north" }, + { "point": [ 0, 2, 0 ], "overmap": "hotel_tower_1_6_north" }, + { "point": [ 0, 2, 1 ], "overmap": "hotel_tower_flr2_1_6_north" }, + { "point": [ 0, 2, 2 ], "overmap": "hotel_tower_flr3_1_6_north" }, + { "point": [ 0, 2, 3 ], "overmap": "hotel_tower_flr4_1_6_north" }, + { "point": [ 0, 2, 4 ], "overmap": "hotel_tower_roof_1_6_north" }, + { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5B_north" }, + { "point": [ 1, 2, 1 ], "overmap": "hotel_tower_flr2_1_5B_north" }, + { "point": [ 1, 2, 2 ], "overmap": "hotel_tower_flr3_1_5_north" }, + { "point": [ 1, 2, 3 ], "overmap": "hotel_tower_flr4_1_5_north" }, + { "point": [ 1, 2, 4 ], "overmap": "hotel_tower_roof_1_5_north" }, + { "point": [ 2, 2, 0 ], "overmap": "hotel_tower_1_4_north" }, + { "point": [ 2, 2, 1 ], "overmap": "hotel_tower_flr2_1_4_north" }, + { "point": [ 2, 2, 2 ], "overmap": "hotel_tower_flr3_1_4_north" }, + { "point": [ 2, 2, 3 ], "overmap": "hotel_tower_flr4_1_4_north" }, + { "point": [ 2, 2, 4 ], "overmap": "hotel_tower_roof_1_4_north" }, + { "point": [ 0, 3, 0 ], "overmap": "hotel_tower_1_9_north" }, + { "point": [ 0, 3, 1 ], "overmap": "hotel_tower_flr2_1_9_north" }, + { "point": [ 0, 3, 2 ], "overmap": "hotel_tower_flr3_1_9_north" }, + { "point": [ 0, 3, 3 ], "overmap": "hotel_tower_flr4_1_9_north" }, + { "point": [ 0, 3, 4 ], "overmap": "hotel_tower_roof_1_9_north" }, + { "point": [ 1, 3, 0 ], "overmap": "hotel_tower_1_8_north" }, + { "point": [ 1, 3, 1 ], "overmap": "hotel_tower_flr2_1_8_north" }, + { "point": [ 1, 3, 2 ], "overmap": "hotel_tower_flr3_1_8_north" }, + { "point": [ 1, 3, 3 ], "overmap": "hotel_tower_flr4_1_8_north" }, + { "point": [ 1, 3, 4 ], "overmap": "hotel_tower_roof_1_8_north" }, + { "point": [ 2, 3, 0 ], "overmap": "hotel_tower_1_7_north" }, + { "point": [ 2, 3, 1 ], "overmap": "hotel_tower_flr2_1_7_north" }, + { "point": [ 2, 3, 2 ], "overmap": "hotel_tower_flr3_1_7_north" }, + { "point": [ 2, 3, 3 ], "overmap": "hotel_tower_flr4_1_7_north" }, + { "point": [ 2, 3, 4 ], "overmap": "hotel_tower_roof_1_7_north" }, + { "point": [ 0, 3, -1 ], "overmap": "hotel_tower_b_3_north" }, + { "point": [ 1, 3, -1 ], "overmap": "hotel_tower_b_2_north" }, + { "point": [ 2, 3, -1 ], "overmap": "hotel_tower_b_1_north" } + ] + }, + { + "type": "city_building", + "id": "hotel_3", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 1, 0, 0 ], "overmap": "road_end_north" }, + { "point": [ 0, 1, 0 ], "overmap": "hotel_tower_1_3_north" }, + { "point": [ 1, 1, 0 ], "overmap": "hotel_tower_1_2_north" }, + { "point": [ 2, 1, 0 ], "overmap": "hotel_tower_1_1_north" }, + { "point": [ 0, 2, 0 ], "overmap": "hotel_tower_1_6_north" }, + { "point": [ 0, 2, 1 ], "overmap": "hotel_tower_flr2_1_6_north" }, + { "point": [ 0, 2, 2 ], "overmap": "hotel_tower_flr3_1_6_north" }, + { "point": [ 0, 2, 3 ], "overmap": "hotel_tower_flr4_1_6_north" }, + { "point": [ 0, 2, 4 ], "overmap": "hotel_tower_roof_1_6_north" }, + { "point": [ 1, 2, 0 ], "overmap": "hotel_tower_1_5C_north" }, + { "point": [ 1, 2, 1 ], "overmap": "hotel_tower_flr2_1_5C_north" }, + { "point": [ 1, 2, 2 ], "overmap": "hotel_tower_flr3_1_5_north" }, + { "point": [ 1, 2, 3 ], "overmap": "hotel_tower_flr4_1_5_north" }, + { "point": [ 1, 2, 4 ], "overmap": "hotel_tower_roof_1_5_north" }, + { "point": [ 2, 2, 0 ], "overmap": "hotel_tower_1_4_north" }, + { "point": [ 2, 2, 1 ], "overmap": "hotel_tower_flr2_1_4_north" }, + { "point": [ 2, 2, 2 ], "overmap": "hotel_tower_flr3_1_4_north" }, + { "point": [ 2, 2, 3 ], "overmap": "hotel_tower_flr4_1_4_north" }, + { "point": [ 2, 2, 4 ], "overmap": "hotel_tower_roof_1_4_north" }, + { "point": [ 0, 3, 0 ], "overmap": "hotel_tower_1_9_north" }, + { "point": [ 0, 3, 1 ], "overmap": "hotel_tower_flr2_1_9_north" }, + { "point": [ 0, 3, 2 ], "overmap": "hotel_tower_flr3_1_9_north" }, + { "point": [ 0, 3, 3 ], "overmap": "hotel_tower_flr4_1_9_north" }, + { "point": [ 0, 3, 4 ], "overmap": "hotel_tower_roof_1_9_north" }, + { "point": [ 1, 3, 0 ], "overmap": "hotel_tower_1_8_north" }, + { "point": [ 1, 3, 1 ], "overmap": "hotel_tower_flr2_1_8_north" }, + { "point": [ 1, 3, 2 ], "overmap": "hotel_tower_flr3_1_8_north" }, + { "point": [ 1, 3, 3 ], "overmap": "hotel_tower_flr4_1_8_north" }, + { "point": [ 1, 3, 4 ], "overmap": "hotel_tower_roof_1_8_north" }, + { "point": [ 2, 3, 0 ], "overmap": "hotel_tower_1_7_north" }, + { "point": [ 2, 3, 1 ], "overmap": "hotel_tower_flr2_1_7_north" }, + { "point": [ 2, 3, 2 ], "overmap": "hotel_tower_flr3_1_7_north" }, + { "point": [ 2, 3, 3 ], "overmap": "hotel_tower_flr4_1_7_north" }, + { "point": [ 2, 3, 4 ], "overmap": "hotel_tower_roof_1_7_north" }, { "point": [ 0, 3, -1 ], "overmap": "hotel_tower_b_3_north" }, { "point": [ 1, 3, -1 ], "overmap": "hotel_tower_b_2_north" }, { "point": [ 2, 3, -1 ], "overmap": "hotel_tower_b_1_north" } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index f0cde32e72b62..027408bbfea79 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -1509,20 +1509,148 @@ }, { "type": "overmap_terrain", - "id": "hotel_tower_1_5", + "id": "hotel_tower_flr2_1_4", + "copy-from": "generic_city_building", + "name": "hotel parking", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr3_1_4", + "copy-from": "generic_city_building", + "name": "hotel parking", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr4_1_4", + "copy-from": "generic_city_building", + "name": "hotel parking", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_roof_1_4", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_1_5A", + "copy-from": "generic_city_building", + "name": "hotel entrance", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_5A", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr3_1_5", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr4_1_5", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_roof_1_5", + "copy-from": "generic_city_building", + "name": "hotel entrance", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_1_5B", "copy-from": "generic_city_building", "name": "hotel entrance", "sym": "H", "color": "light_blue" }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_5B", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_1_5C", + "copy-from": "generic_city_building", + "name": "hotel entrance", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_5C", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, { "type": "overmap_terrain", "id": "hotel_tower_1_6", "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_6", + "copy-from": "generic_city_building", + "name": "hotel parking", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr3_1_6", + "copy-from": "generic_city_building", + "name": "hotel parking", + "sym": "h", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr4_1_6", + "copy-from": "generic_city_building", "name": "hotel parking", "sym": "h", "color": "light_blue" }, + { + "type": "overmap_terrain", + "id": "hotel_tower_roof_1_6", + "copy-from": "generic_city_building", + "name": "hotel", + "sym": "h", + "color": "light_blue" + }, { "type": "overmap_terrain", "id": "hotel_tower_1_7", @@ -1531,6 +1659,38 @@ "sym": "H", "color": "light_blue" }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_7", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr3_1_7", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr4_1_7", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_roof_1_7", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, { "type": "overmap_terrain", "id": "hotel_tower_1_8", @@ -1539,6 +1699,38 @@ "sym": "H", "color": "light_blue" }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_8", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr3_1_8", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr4_1_8", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_roof_1_8", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, { "type": "overmap_terrain", "id": "hotel_tower_1_9", @@ -1547,6 +1739,38 @@ "sym": "H", "color": "light_blue" }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr2_1_9", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr3_1_9", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_flr4_1_9", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "hotel_tower_roof_1_9", + "copy-from": "generic_city_building", + "name": "hotel tower", + "sym": "H", + "color": "light_blue" + }, { "type": "overmap_terrain", "id": "hotel_tower_b_1", diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 46c22b86ad736..2a9430e9f0f93 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -797,7 +797,9 @@ "s_petstore_1": 100, "s_petstore_2": 100, "megastore": 150, - "hotel": 75, + "hotel_1": 75, + "hotel_2": 75, + "hotel_3": 75, "hospital": 175, "public_works": 200, "office_tower_2": 150,