From 352e716024fe2b25cfce752a5fb506e93da3cf35 Mon Sep 17 00:00:00 2001 From: porkbrain Date: Sat, 27 Jul 2024 17:04:54 +0200 Subject: [PATCH] Fixes zones in player floor's apartment (#227) --- .../assets/maps/building1_player_floor.ron | 6586 ++++++++--------- .../assets/scenes/building1_player_floor.tscn | 301 +- main_game_lib/src/state.rs | 9 + main_game_lib/src/top_down.rs | 16 +- main_game_lib/src/top_down/layout.rs | 66 +- main_game_lib/src/top_down/scene_configs.rs | 69 - scenes/top_down/src/building1_basement2.rs | 2 - scenes/top_down/src/building1_player_floor.rs | 19 +- .../watch_entry_to_hallway.rs | 22 +- scenes/top_down/src/clinic.rs | 7 +- scenes/top_down/src/clinic_ward.rs | 3 +- scenes/top_down/src/compound.rs | 3 +- scenes/top_down/src/compound_tower.rs | 3 +- scenes/top_down/src/downtown.rs | 2 - scenes/top_down/src/mall.rs | 4 +- scenes/top_down/src/plant_shop.rs | 3 +- scenes/top_down/src/prelude.rs | 3 +- scenes/top_down/src/sewers.rs | 3 +- scenes/top_down/src/twinpeaks_apartment.rs | 5 +- .../building1_player_floor.svg | 220 +- 20 files changed, 3643 insertions(+), 3703 deletions(-) delete mode 100644 main_game_lib/src/top_down/scene_configs.rs diff --git a/main_game/assets/maps/building1_player_floor.ron b/main_game/assets/maps/building1_player_floor.ron index 1cac84c3..aac2059c 100644 --- a/main_game/assets/maps/building1_player_floor.ron +++ b/main_game/assets/maps/building1_player_floor.ron @@ -1,35 +1,35 @@ ( zones: ( - inner: {Zone(Bed): (zone_group: (5), zone_size: 30, zone_successors: [Zone(PlayerApartment)]), Zone(BottomLeftApartmentBathroomDoor): (zone_group: (6), zone_size: 42, zone_successors: [Zone(BottomLeftApartment)]), Zone(BottomLeftApartmentDoor): (zone_group: (6), zone_size: 37, zone_successors: [Zone(BottomLeftApartment), Zone(Hallway)]), Zone(BottomLeftApartment): (zone_group: (6), zone_size: 2187, zone_successors: [Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartmentDoor), Zone(BottomRightApartment), Zone(Hallway)]), Zone(BottomRightApartmentDoor): (zone_group: (6), zone_size: 35, zone_successors: [Zone(BottomRightApartment), Zone(Hallway)]), Zone(BottomRightApartment): (zone_group: (6), zone_size: 1050, zone_successors: [Zone(BottomLeftApartment), Zone(BottomRightApartmentDoor), Zone(Hallway)]), Zone(Elevator): (zone_group: (6), zone_size: 68, zone_successors: [Zone(Hallway)]), Zone(Hallway): (zone_group: (5), zone_size: 1550, zone_successors: [Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment), Zone(BottomRightApartmentDoor), Zone(BottomRightApartment), Zone(Elevator), Zone(PlayerApartment), Zone(PlayerDoor)]), Zone(Meditation): (zone_group: (5), zone_size: 125, zone_successors: [Zone(PlayerApartment)]), Zone(PlayerApartment): (zone_group: (5), zone_size: 2725, zone_successors: [Zone(Bed), Zone(Hallway), Zone(Meditation), Zone(PlayerDoor), Zone(Tea)]), Zone(PlayerDoor): (zone_group: (5), zone_size: 64, zone_successors: [Zone(Hallway), Zone(PlayerApartment)]), Zone(Tea): (zone_group: (5), zone_size: 45, zone_successors: [Zone(PlayerApartment)])}, + inner: {Zone(Apartment2): (zone_group: (5), zone_size: 3237, zone_successors: [Zone(Apartment2BathroomDoor), Zone(Apartment2Door), Zone(Hallway)]), Zone(Apartment2BathroomDoor): (zone_group: (5), zone_size: 42, zone_successors: [Zone(Apartment2)]), Zone(Apartment2Door): (zone_group: (5), zone_size: 45, zone_successors: [Zone(Apartment2), Zone(Hallway)]), Zone(Bed): (zone_group: (5), zone_size: 30, zone_successors: [Zone(PlayerApartment)]), Zone(Elevator): (zone_group: (5), zone_size: 68, zone_successors: [Zone(Hallway)]), Zone(Hallway): (zone_group: (5), zone_size: 1550, zone_successors: [Zone(Apartment2), Zone(Apartment2Door), Zone(Elevator), Zone(PlayerApartment), Zone(PlayerDoor)]), Zone(Meditation): (zone_group: (5), zone_size: 125, zone_successors: [Zone(PlayerApartment)]), Zone(PlayerApartment): (zone_group: (5), zone_size: 2725, zone_successors: [Zone(Bed), Zone(Hallway), Zone(Meditation), Zone(PlayerDoor), Zone(Tea)]), Zone(PlayerDoor): (zone_group: (5), zone_size: 64, zone_successors: [Zone(Hallway), Zone(PlayerApartment)]), Zone(Tea): (zone_group: (5), zone_size: 45, zone_successors: [Zone(PlayerApartment)])}, ), squares: { - (x: -81, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -81, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -81, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -81, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -81, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -81, y: -32): [Wall], (x: -81, y: -31): [Wall], (x: -81, y: -30): [Wall], @@ -40,33 +40,33 @@ (x: -81, y: -25): [Wall], (x: -81, y: -24): [Wall], (x: -81, y: -23): [Wall], - (x: -80, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -58): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -57): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -56): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -55): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -54): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -43): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -42): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -41): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -40): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -38): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -35): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -80, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -80, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -58): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -80, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -80, y: -32): [Wall, Empty, Zone(Hallway)], (x: -80, y: -31): [Wall, Empty, Zone(Hallway)], (x: -80, y: -30): [Empty, Empty, Zone(Hallway)], @@ -79,33 +79,33 @@ (x: -80, y: -23): [Wall, Empty, Zone(Hallway)], (x: -80, y: -22): [Empty, Empty, Zone(Hallway)], (x: -80, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -79, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -79, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -79, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -79, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -79, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -79, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -79, y: -32): [Wall, Empty, Zone(Hallway)], (x: -79, y: -31): [Wall, Empty, Zone(Hallway)], (x: -79, y: -30): [Empty, Empty, Zone(Hallway)], @@ -118,33 +118,33 @@ (x: -79, y: -23): [Wall, Empty, Zone(Hallway)], (x: -79, y: -22): [Empty, Empty, Zone(Hallway)], (x: -79, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -78, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -78, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -78, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -78, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -78, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -78, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -78, y: -32): [Wall, Empty, Zone(Hallway)], (x: -78, y: -31): [Wall, Empty, Zone(Hallway)], (x: -78, y: -30): [Empty, Empty, Zone(Hallway)], @@ -157,33 +157,33 @@ (x: -78, y: -23): [Wall, Empty, Zone(Hallway)], (x: -78, y: -22): [Empty, Empty, Zone(Hallway)], (x: -78, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -77, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -77, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -77, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -77, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -77, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -77, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -77, y: -32): [Wall, Empty, Zone(Hallway)], (x: -77, y: -31): [Wall, Empty, Zone(Hallway)], (x: -77, y: -30): [Empty, Empty, Zone(Hallway)], @@ -196,33 +196,33 @@ (x: -77, y: -23): [Wall, Empty, Zone(Hallway)], (x: -77, y: -22): [Empty, Empty, Zone(Hallway)], (x: -77, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -76, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -76, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -76, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -76, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -76, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -76, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -76, y: -32): [Wall, Empty, Zone(Hallway)], (x: -76, y: -31): [Wall, Empty, Zone(Hallway)], (x: -76, y: -30): [Empty, Empty, Zone(Hallway)], @@ -235,33 +235,33 @@ (x: -76, y: -23): [Wall, Empty, Zone(Hallway)], (x: -76, y: -22): [Empty, Empty, Zone(Hallway)], (x: -76, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -75, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -75, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -75, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -75, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -75, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -75, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -75, y: -32): [Wall, Empty, Zone(Hallway)], (x: -75, y: -31): [Wall, Empty, Zone(Hallway)], (x: -75, y: -30): [Empty, Empty, Zone(Hallway)], @@ -274,33 +274,33 @@ (x: -75, y: -23): [Wall, Empty, Zone(Hallway)], (x: -75, y: -22): [Empty, Empty, Zone(Hallway)], (x: -75, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -74, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -74, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -74, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -74, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -74, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -74, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -74, y: -32): [Wall, Empty, Zone(Hallway)], (x: -74, y: -31): [Wall, Empty, Zone(Hallway)], (x: -74, y: -30): [Empty, Empty, Zone(Hallway)], @@ -313,33 +313,33 @@ (x: -74, y: -23): [Wall, Empty, Zone(Hallway)], (x: -74, y: -22): [Empty, Empty, Zone(Hallway)], (x: -74, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -73, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -73, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -73, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -73, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -73, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -73, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -73, y: -32): [Wall, Empty, Zone(Hallway)], (x: -73, y: -31): [Wall, Empty, Zone(Hallway)], (x: -73, y: -30): [Empty, Empty, Zone(Hallway)], @@ -352,33 +352,33 @@ (x: -73, y: -23): [Wall, Empty, Zone(Hallway)], (x: -73, y: -22): [Empty, Empty, Zone(Hallway)], (x: -73, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -72, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -72, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -72, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -72, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -72, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -72, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -72, y: -32): [Wall, Empty, Zone(Hallway)], (x: -72, y: -31): [Wall, Empty, Zone(Hallway)], (x: -72, y: -30): [Empty, Empty, Zone(Hallway)], @@ -391,33 +391,33 @@ (x: -72, y: -23): [Wall, Empty, Zone(Hallway)], (x: -72, y: -22): [Empty, Empty, Zone(Hallway)], (x: -72, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -71, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -71, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -71, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -71, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -71, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -71, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -71, y: -32): [Wall, Empty, Zone(Hallway)], (x: -71, y: -31): [Wall, Empty, Zone(Hallway)], (x: -71, y: -30): [Empty, Empty, Zone(Hallway)], @@ -430,33 +430,33 @@ (x: -71, y: -23): [Wall, Empty, Zone(Hallway)], (x: -71, y: -22): [Wall, Empty, Zone(Hallway)], (x: -71, y: -21): [Empty, Empty, Zone(Hallway)], - (x: -70, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -70, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -70, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -70, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -70, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -70, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -70, y: -32): [Wall, Empty, Zone(Hallway)], (x: -70, y: -31): [Wall, Empty, Zone(Hallway)], (x: -70, y: -30): [Empty, Empty, Zone(Hallway)], @@ -469,33 +469,33 @@ (x: -70, y: -23): [Empty, Empty, Zone(Hallway)], (x: -70, y: -22): [Wall, Empty, Zone(Hallway)], (x: -70, y: -21): [Wall, Empty, Zone(Hallway)], - (x: -69, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -43): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -42): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -41): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -40): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -38): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -69, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -69, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -69, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -69, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -69, y: -32): [Wall, Empty, Zone(Hallway)], (x: -69, y: -31): [Wall, Empty, Zone(Hallway)], (x: -69, y: -30): [Empty, Empty, Zone(Hallway)], @@ -508,33 +508,33 @@ (x: -69, y: -23): [Empty, Empty, Zone(Hallway)], (x: -69, y: -22): [Empty, Empty, Zone(Hallway)], (x: -69, y: -21): [Wall, Empty, Zone(Hallway)], - (x: -68, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -39): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -68, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -68, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -68, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -39): [Trail, Empty, Zone(Apartment2)], + (x: -68, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -68, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -68, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -68, y: -32): [Wall, Empty, Zone(Hallway)], (x: -68, y: -31): [Wall, Empty, Zone(Hallway)], (x: -68, y: -30): [Empty, Empty, Zone(Hallway)], @@ -547,33 +547,33 @@ (x: -68, y: -23): [Empty, Empty, Zone(Hallway)], (x: -68, y: -22): [Empty, Empty, Zone(Hallway)], (x: -68, y: -21): [Wall, Empty, Zone(Hallway)], - (x: -67, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -39): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -67, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -67, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -67, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -39): [Trail, Empty, Zone(Apartment2)], + (x: -67, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -67, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -67, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -67, y: -32): [Wall, Empty, Zone(Hallway)], (x: -67, y: -31): [Wall, Empty, Zone(Hallway)], (x: -67, y: -30): [Empty, Empty, Zone(Hallway)], @@ -586,33 +586,33 @@ (x: -67, y: -23): [Empty, Empty, Zone(Hallway)], (x: -67, y: -22): [Empty, Empty, Zone(Hallway)], (x: -67, y: -21): [Wall, Empty, Zone(Hallway)], - (x: -66, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -54): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -53): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -52): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -51): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -50): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -49): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -47): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -46): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -45): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -43): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -42): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -41): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -40): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -39): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -66, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -66, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -66, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -54): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -52): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -51): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -50): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -49): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -48): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -47): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -46): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -45): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -43): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -41): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -40): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -39): [Trail, Empty, Zone(Apartment2)], + (x: -66, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -66, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -66, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -66, y: -32): [Wall, Empty, Zone(Hallway)], (x: -66, y: -31): [Wall, Empty, Zone(Hallway)], (x: -66, y: -30): [Empty, Empty, Zone(Hallway)], @@ -629,33 +629,33 @@ (x: -66, y: -19): [Empty, Empty, Zone(Hallway)], (x: -66, y: -18): [Empty, Empty, Zone(Hallway)], (x: -66, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -65, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -65, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -65, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -65, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -65, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -65, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -65, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -65, y: -32): [Wall, Empty, Zone(Hallway)], (x: -65, y: -31): [Wall, Empty, Zone(Hallway)], (x: -65, y: -30): [Empty, Empty, Zone(Hallway)], @@ -672,33 +672,33 @@ (x: -65, y: -19): [Empty, Empty, Zone(Hallway)], (x: -65, y: -18): [Empty, Empty, Zone(Hallway)], (x: -65, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -64, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -64, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -64, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -64, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -64, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -64, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -64, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -64, y: -32): [Wall, Empty, Zone(Hallway)], (x: -64, y: -31): [Wall, Empty, Zone(Hallway)], (x: -64, y: -30): [Empty, Empty, Zone(Hallway)], @@ -715,33 +715,33 @@ (x: -64, y: -19): [Empty, Empty, Zone(Hallway)], (x: -64, y: -18): [Empty, Empty, Zone(Hallway)], (x: -64, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -63, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -43): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -42): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -41): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -40): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -38): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -35): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -63, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -63, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -63, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -63, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -63, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -63, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -63, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -63, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -63, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -63, y: -32): [Wall, Empty, Zone(Hallway)], (x: -63, y: -31): [Wall, Empty, Zone(Hallway)], (x: -63, y: -30): [Empty, Empty, Zone(Hallway)], @@ -758,33 +758,33 @@ (x: -63, y: -19): [Empty, Empty, Zone(Hallway)], (x: -63, y: -18): [Empty, Empty, Zone(Hallway)], (x: -63, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -62, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -43): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -42): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -41): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -40): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -38): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -35): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -62, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -62, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -62, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -62, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -62, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -62, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -62, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -62, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -62, y: -32): [Wall, Empty, Zone(Hallway)], (x: -62, y: -31): [Empty, Empty, Zone(Hallway)], (x: -62, y: -30): [Empty, Empty, Zone(Hallway)], @@ -801,33 +801,33 @@ (x: -62, y: -19): [Empty, Empty, Zone(Hallway)], (x: -62, y: -18): [Empty, Empty, Zone(Hallway)], (x: -62, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -61, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -61, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -61, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -61, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -61, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -61, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -61, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -61, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -61, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -61, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -61, y: -32): [Wall, Empty, Zone(Hallway)], (x: -61, y: -31): [Empty, Empty, Zone(Hallway)], (x: -61, y: -30): [Empty, Empty, Zone(Hallway)], @@ -844,33 +844,33 @@ (x: -61, y: -19): [Empty, Empty, Zone(Hallway)], (x: -61, y: -18): [Empty, Empty, Zone(Hallway)], (x: -61, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -60, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -60, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -60, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -60, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -60, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -60, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -60, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -60, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -60, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -60, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -60, y: -32): [Wall, Empty, Zone(Hallway)], (x: -60, y: -31): [Empty, Empty, Zone(Hallway)], (x: -60, y: -30): [Trail, Empty, Zone(Hallway)], @@ -887,33 +887,33 @@ (x: -60, y: -19): [Empty, Empty, Zone(Hallway)], (x: -60, y: -18): [Empty, Empty, Zone(Hallway)], (x: -60, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -59, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -59, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -59, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -59, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -59, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -59, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -59, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -59, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -59, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -59, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -59, y: -32): [Wall, Empty, Zone(Hallway)], (x: -59, y: -31): [Empty, Empty, Zone(Hallway)], (x: -59, y: -30): [Trail, Empty, Zone(Hallway)], @@ -930,33 +930,33 @@ (x: -59, y: -19): [Empty, Empty, Zone(Hallway)], (x: -59, y: -18): [Empty, Empty, Zone(Hallway)], (x: -59, y: -17): [Empty, Empty, Zone(Hallway)], - (x: -58, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -58, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -58, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -58, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -58, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -58, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -58, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -58, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -58, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -58, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -58, y: -32): [Wall, Empty, Zone(Hallway)], (x: -58, y: -31): [Empty, Empty, Zone(Hallway)], (x: -58, y: -30): [Trail, Empty, Zone(Hallway)], @@ -990,33 +990,33 @@ (x: -58, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -58, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -58, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -57, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -57, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -57, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -57, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -57, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -57, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -57, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -57, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -57, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -57, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -57, y: -32): [Wall, Empty, Zone(Hallway)], (x: -57, y: -31): [Empty, Empty, Zone(Hallway)], (x: -57, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1050,33 +1050,33 @@ (x: -57, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -57, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -57, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -56, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -56, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -56, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -56, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -56, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -56, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -56, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -56, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -56, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -56, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -56, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -56, y: -32): [Wall, Empty, Zone(Hallway)], (x: -56, y: -31): [Empty, Empty, Zone(Hallway)], (x: -56, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1110,33 +1110,33 @@ (x: -56, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -56, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -56, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -55, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -55, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -55, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -55, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -55, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -55, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -55, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -55, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -55, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -55, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -55, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -55, y: -32): [Wall, Empty, Zone(Hallway)], (x: -55, y: -31): [Empty, Empty, Zone(Hallway)], (x: -55, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1170,33 +1170,33 @@ (x: -55, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -55, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -55, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -54, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -54, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -54, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -54, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -54, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -54, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -54, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -54, y: -32): [Wall, Empty, Zone(Hallway)], (x: -54, y: -31): [Empty, Empty, Zone(Hallway)], (x: -54, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1230,33 +1230,33 @@ (x: -54, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -54, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -54, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -53, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -54): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -53, y: -53): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -53, y: -52): [Wall, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -53, y: -51): [Wall, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -53, y: -50): [Wall, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -53, y: -49): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -53, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -53, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -53, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -53, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -53, y: -54): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -53, y: -53): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -53, y: -52): [Wall, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -53, y: -51): [Wall, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -53, y: -50): [Wall, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -53, y: -49): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -53, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -53, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -53, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -53, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -53, y: -32): [Wall, Empty, Zone(Hallway)], (x: -53, y: -31): [Empty, Empty, Zone(Hallway)], (x: -53, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1290,33 +1290,33 @@ (x: -53, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -53, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -53, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -52, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -54): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -52, y: -53): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -52, y: -52): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -52, y: -51): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -52, y: -50): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -52, y: -49): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -52, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -52, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -52, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -52, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -52, y: -54): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -52, y: -53): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -52, y: -52): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -52, y: -51): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -52, y: -50): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -52, y: -49): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -52, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -52, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -52, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -52, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -52, y: -32): [Wall, Empty, Zone(Hallway)], (x: -52, y: -31): [Empty, Empty, Zone(Hallway)], (x: -52, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1346,33 +1346,33 @@ (x: -52, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -52, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -52, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -51, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -54): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -51, y: -53): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -51, y: -52): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -51, y: -51): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -51, y: -50): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -51, y: -49): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -51, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -51, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -51, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -51, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -51, y: -54): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -51, y: -53): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -51, y: -52): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -51, y: -51): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -51, y: -50): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -51, y: -49): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -51, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -51, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -51, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -51, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -51, y: -32): [Wall, Empty, Zone(Hallway)], (x: -51, y: -31): [Empty, Empty, Zone(Hallway)], (x: -51, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1402,33 +1402,33 @@ (x: -51, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -51, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -51, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -50, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -54): [Trail, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -50, y: -53): [Trail, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -50, y: -52): [Trail, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -50, y: -51): [Trail, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -50, y: -50): [Trail, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -50, y: -49): [Trail, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -50, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -47): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -46): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -45): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -44): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -50, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -50, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -50, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -50, y: -54): [Trail, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -50, y: -53): [Trail, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -50, y: -52): [Trail, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -50, y: -51): [Trail, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -50, y: -50): [Trail, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -50, y: -49): [Trail, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -50, y: -48): [Trail, Empty, Zone(Apartment2)], + (x: -50, y: -47): [Trail, Empty, Zone(Apartment2)], + (x: -50, y: -46): [Trail, Empty, Zone(Apartment2)], + (x: -50, y: -45): [Trail, Empty, Zone(Apartment2)], + (x: -50, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -50, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -50, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -50, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -50, y: -32): [Wall, Empty, Zone(Hallway)], (x: -50, y: -31): [Empty, Empty, Zone(Hallway)], (x: -50, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1459,33 +1459,33 @@ (x: -50, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -50, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -50, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -49, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -54): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -49, y: -53): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -49, y: -52): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -49, y: -51): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -49, y: -50): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -49, y: -49): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -49, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -49, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -49, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -49, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -49, y: -54): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -49, y: -53): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -49, y: -52): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -49, y: -51): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -49, y: -50): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -49, y: -49): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -49, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -49, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -49, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -49, y: -32): [Wall, Empty, Zone(Hallway)], (x: -49, y: -31): [Empty, Empty, Zone(Hallway)], (x: -49, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1516,33 +1516,33 @@ (x: -49, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -49, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -49, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -48, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -54): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -48, y: -53): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -48, y: -52): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -48, y: -51): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -48, y: -50): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -48, y: -49): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -48, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -48, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -48, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -48, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -48, y: -54): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -48, y: -53): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -48, y: -52): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -48, y: -51): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -48, y: -50): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -48, y: -49): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -48, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -48, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -48, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -48, y: -32): [Wall, Empty, Zone(Hallway)], (x: -48, y: -31): [Empty, Empty, Zone(Hallway)], (x: -48, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1580,33 +1580,33 @@ (x: -48, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -48, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -48, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -47, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -54): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -47, y: -53): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -47, y: -52): [Wall, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -47, y: -51): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -47, y: -50): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -47, y: -49): [Empty, Zone(BottomLeftApartmentBathroomDoor), Zone(BottomLeftApartment)], - (x: -47, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -47, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -47, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -47, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -47, y: -54): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -47, y: -53): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -47, y: -52): [Wall, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -47, y: -51): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -47, y: -50): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -47, y: -49): [Empty, Zone(Apartment2BathroomDoor), Zone(Apartment2)], + (x: -47, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -47, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -47, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -47, y: -32): [Wall, Empty, Zone(Hallway)], (x: -47, y: -31): [Empty, Empty, Zone(Hallway)], (x: -47, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1644,33 +1644,33 @@ (x: -47, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -47, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -47, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -46, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -43): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -42): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -41): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -40): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -38): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -35): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -46, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -46, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -46, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -46, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -46, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -46, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -46, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -46, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -46, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -46, y: -32): [Wall, Empty, Zone(Hallway)], (x: -46, y: -31): [Empty, Empty, Zone(Hallway)], (x: -46, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1708,33 +1708,33 @@ (x: -46, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -46, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -46, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -45, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -43): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -42): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -41): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -40): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -39): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -38): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -35): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -45, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -45, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -45, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -45, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -45, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -45, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -45, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -45, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -45, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -45, y: -32): [Wall, Empty, Zone(Hallway)], (x: -45, y: -31): [Empty, Empty, Zone(Hallway)], (x: -45, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1772,33 +1772,33 @@ (x: -45, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -45, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -45, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -44, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -44, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -44, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -44, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -44, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -44, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -44, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -44, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -44, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -44, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -44, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -44, y: -32): [Wall, Empty, Zone(Hallway)], (x: -44, y: -31): [Empty, Empty, Zone(Hallway)], (x: -44, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1836,33 +1836,33 @@ (x: -44, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -44, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -44, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -43, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -43, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -43, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -43, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -43, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -43, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -43, y: -32): [Wall, Empty, Zone(Hallway)], (x: -43, y: -31): [Empty, Empty, Zone(Hallway)], (x: -43, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1900,33 +1900,33 @@ (x: -43, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -43, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -43, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -42, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -42, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -42, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -42, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -42, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -42, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -42, y: -32): [Wall, Empty, Zone(Hallway)], (x: -42, y: -31): [Empty, Empty, Zone(Hallway)], (x: -42, y: -30): [Trail, Empty, Zone(Hallway)], @@ -1964,33 +1964,33 @@ (x: -42, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -42, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -42, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -41, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -41, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -41, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -41, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -41, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -41, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -41, y: -32): [Wall, Empty, Zone(Hallway)], (x: -41, y: -31): [Empty, Empty, Zone(Hallway)], (x: -41, y: -30): [Trail, Empty, Zone(Hallway)], @@ -2028,33 +2028,33 @@ (x: -41, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -41, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -41, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -40, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -40, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -40, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -40, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -40, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -40, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -40, y: -32): [Wall, Empty, Zone(Hallway)], (x: -40, y: -31): [Empty, Empty, Zone(Hallway)], (x: -40, y: -30): [Trail, Empty, Zone(Hallway)], @@ -2108,33 +2108,33 @@ (x: -40, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -40, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -40, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -39, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -39, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -39, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -39, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -39, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -39, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -39, y: -32): [Wall, Empty, Zone(Hallway)], (x: -39, y: -31): [Empty, Empty, Zone(Hallway)], (x: -39, y: -30): [Trail, Empty, Zone(Hallway)], @@ -2188,33 +2188,33 @@ (x: -39, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -39, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -39, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -38, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -54): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -53): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -52): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -51): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -50): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -49): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -38, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -38, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -38, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -38, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -38, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -38, y: -32): [Wall, Empty, Zone(Hallway)], (x: -38, y: -31): [Empty, Empty, Zone(Hallway)], (x: -38, y: -30): [Trail, Empty, Zone(Hallway)], @@ -2268,33 +2268,33 @@ (x: -38, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -38, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -38, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -37, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -37, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -37, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -37, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -37, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -37, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -37, y: -32): [Wall, Empty, Zone(Hallway)], (x: -37, y: -31): [Empty, Empty, Zone(Hallway)], (x: -37, y: -30): [Trail, Empty, Zone(Hallway)], @@ -2348,33 +2348,33 @@ (x: -37, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -37, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -37, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -36, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -36, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -36, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -36, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -36, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -36, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -36, y: -32): [Wall, Empty, Zone(Hallway)], (x: -36, y: -31): [Empty, Empty, Zone(Hallway)], (x: -36, y: -30): [Trail, Empty, Zone(Hallway)], @@ -2428,35 +2428,35 @@ (x: -36, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -36, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -36, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -35, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -35, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -35, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -35, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -35, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -35, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -35, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -35, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -35, y: -31): [Empty, Empty, Zone(Hallway)], (x: -35, y: -30): [Trail, Empty, Zone(Hallway)], (x: -35, y: -29): [Empty, Empty, Zone(Hallway)], (x: -35, y: -28): [Empty, Empty, Zone(Hallway)], @@ -2508,35 +2508,35 @@ (x: -35, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -35, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -35, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -34, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -35): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -34, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -34, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -34, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -34, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -34, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -34, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -34, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -34, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -34, y: -31): [Empty, Empty, Zone(Hallway)], (x: -34, y: -30): [Trail, Empty, Zone(Hallway)], (x: -34, y: -29): [Empty, Empty, Zone(Hallway)], (x: -34, y: -28): [Empty, Empty, Zone(Hallway)], @@ -2588,35 +2588,35 @@ (x: -34, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -34, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -34, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -33, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -33, y: -35): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -33, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -33, y: -33): [Wall, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -33, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -33, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -33, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -33, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -33, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -33, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -33, y: -31): [Empty, Empty, Zone(Hallway)], (x: -33, y: -30): [Trail, Empty, Zone(Hallway)], (x: -33, y: -29): [Empty, Empty, Zone(Hallway)], (x: -33, y: -28): [Empty, Empty, Zone(Hallway)], @@ -2668,35 +2668,35 @@ (x: -33, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -33, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -33, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -32, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -32, y: -35): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -32, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -32, y: -33): [Wall, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -32, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -32, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -32, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -32, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -32, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -32, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -32, y: -31): [Empty, Empty, Zone(Hallway)], (x: -32, y: -30): [Trail, Empty, Zone(Hallway)], (x: -32, y: -29): [Empty, Empty, Zone(Hallway)], (x: -32, y: -28): [Empty, Empty, Zone(Hallway)], @@ -2748,35 +2748,35 @@ (x: -32, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -32, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -32, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -31, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -48): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -43): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -42): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -41): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -40): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -39): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -37): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -36): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -31, y: -35): [Trail, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -31, y: -34): [Trail, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -31, y: -33): [Wall, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -31, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -31, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -31, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -31, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -31, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -31, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -31, y: -31): [Empty, Empty, Zone(Hallway)], (x: -31, y: -30): [Trail, Empty, Zone(Hallway)], (x: -31, y: -29): [Trail, Empty, Zone(Hallway)], (x: -31, y: -28): [Trail, Empty, Zone(Hallway)], @@ -2828,35 +2828,35 @@ (x: -31, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -31, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -31, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -30, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -30, y: -35): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -30, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -30, y: -33): [Wall, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -30, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -30, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -30, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -30, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -30, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -30, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -30, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -30, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -30, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -30, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -30, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -30, y: -31): [Empty, Empty, Zone(Hallway)], (x: -30, y: -30): [Empty, Empty, Zone(Hallway)], (x: -30, y: -29): [Empty, Empty, Zone(Hallway)], (x: -30, y: -28): [Empty, Empty, Zone(Hallway)], @@ -2908,35 +2908,35 @@ (x: -30, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -30, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -30, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -29, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -29, y: -35): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -29, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -29, y: -33): [Wall, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -29, y: -32): [Wall, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -29, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -29, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -29, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -29, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: -29, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: -29, y: -32): [Wall, Empty, Zone(Hallway)], + (x: -29, y: -31): [Empty, Empty, Zone(Hallway)], (x: -29, y: -30): [Empty, Empty, Zone(Hallway)], (x: -29, y: -29): [Empty, Empty, Zone(Hallway)], (x: -29, y: -28): [Empty, Empty, Zone(Hallway)], @@ -2988,35 +2988,35 @@ (x: -29, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -29, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -29, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -28, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -28, y: -35): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -28, y: -34): [Empty, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -28, y: -33): [Wall, Zone(BottomLeftApartmentDoor), Zone(BottomLeftApartment)], - (x: -28, y: -32): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], - (x: -28, y: -31): [Empty, Zone(BottomLeftApartmentDoor), Zone(Hallway)], + (x: -28, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -28, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -28, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -28, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -28, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -28, y: -33): [Wall, Zone(Apartment2Door), Zone(Apartment2)], + (x: -28, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -28, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -28, y: -30): [Empty, Empty, Zone(Hallway)], (x: -28, y: -29): [Empty, Empty, Zone(Hallway)], (x: -28, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3068,35 +3068,35 @@ (x: -28, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -28, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -28, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -27, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -27, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -27, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -27, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -27, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -27, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -27, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -27, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -27, y: -33): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -27, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -27, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -27, y: -30): [Empty, Empty, Zone(Hallway)], (x: -27, y: -29): [Empty, Empty, Zone(Hallway)], (x: -27, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3148,35 +3148,35 @@ (x: -27, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -27, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -27, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -26, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -26, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -26, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -26, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -26, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -26, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -26, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -26, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -26, y: -33): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -26, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -26, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -26, y: -30): [Empty, Empty, Zone(Hallway)], (x: -26, y: -29): [Empty, Empty, Zone(Hallway)], (x: -26, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3228,35 +3228,35 @@ (x: -26, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -26, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -26, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -25, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -25, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -25, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -25, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -25, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -25, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -25, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -25, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -25, y: -33): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -25, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -25, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -25, y: -30): [Empty, Empty, Zone(Hallway)], (x: -25, y: -29): [Empty, Empty, Zone(Hallway)], (x: -25, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3308,38 +3308,38 @@ (x: -25, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -25, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -25, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -24, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -55): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -54): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -53): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -24, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -24, y: -31): [Empty, Empty, Zone(Hallway)], - (x: -24, y: -30): [Empty, Empty, Zone(Hallway)], - (x: -24, y: -29): [Empty, Empty, Zone(Hallway)], - (x: -24, y: -28): [Empty, Empty, Zone(Hallway)], + (x: -24, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -24, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -24, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -24, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -24, y: -55): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -54): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -52): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -51): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -50): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -49): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -48): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -47): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -46): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -45): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -43): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -41): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -40): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -39): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -37): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -36): [Trail, Empty, Zone(Apartment2)], + (x: -24, y: -35): [Trail, Zone(Apartment2Door), Zone(Apartment2)], + (x: -24, y: -34): [Trail, Zone(Apartment2Door), Zone(Apartment2)], + (x: -24, y: -33): [Trail, Zone(Apartment2Door), Zone(Apartment2)], + (x: -24, y: -32): [Trail, Zone(Apartment2Door), Zone(Hallway)], + (x: -24, y: -31): [Trail, Zone(Apartment2Door), Zone(Hallway)], + (x: -24, y: -30): [Trail, Empty, Zone(Hallway)], + (x: -24, y: -29): [Trail, Empty, Zone(Hallway)], + (x: -24, y: -28): [Trail, Empty, Zone(Hallway)], (x: -24, y: -27): [Trail, Empty, Zone(Hallway)], (x: -24, y: -26): [Empty, Empty, Zone(Hallway)], (x: -24, y: -25): [Empty, Empty, Zone(Hallway)], @@ -3388,35 +3388,35 @@ (x: -24, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -24, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -24, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -23, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -23, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -23, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -23, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -23, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -23, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -23, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -23, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -23, y: -33): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -23, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -23, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -23, y: -30): [Empty, Empty, Zone(Hallway)], (x: -23, y: -29): [Empty, Empty, Zone(Hallway)], (x: -23, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3468,35 +3468,35 @@ (x: -23, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -23, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -23, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -22, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -22, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -22, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -22, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -22, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -22, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -22, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -22, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -22, y: -33): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -22, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -22, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -22, y: -30): [Empty, Empty, Zone(Hallway)], (x: -22, y: -29): [Empty, Empty, Zone(Hallway)], (x: -22, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3548,35 +3548,35 @@ (x: -22, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -22, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -22, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -21, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -34): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -33): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -21, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -21, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -21, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -21, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -21, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -21, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -21, y: -34): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -21, y: -33): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -21, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -21, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -21, y: -30): [Empty, Empty, Zone(Hallway)], (x: -21, y: -29): [Empty, Empty, Zone(Hallway)], (x: -21, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3628,35 +3628,35 @@ (x: -21, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -21, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -21, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -20, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -20, y: -32): [Empty, Empty, Zone(Hallway)], - (x: -20, y: -31): [Empty, Empty, Zone(Hallway)], + (x: -20, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -20, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -20, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -20, y: -35): [Empty, Zone(Apartment2Door), Zone(Apartment2)], + (x: -20, y: -34): [Wall, Zone(Apartment2Door), Zone(Apartment2)], + (x: -20, y: -33): [Wall, Zone(Apartment2Door), Zone(Apartment2)], + (x: -20, y: -32): [Empty, Zone(Apartment2Door), Zone(Hallway)], + (x: -20, y: -31): [Empty, Zone(Apartment2Door), Zone(Hallway)], (x: -20, y: -30): [Empty, Empty, Zone(Hallway)], (x: -20, y: -29): [Empty, Empty, Zone(Hallway)], (x: -20, y: -28): [Empty, Empty, Zone(Hallway)], @@ -3708,33 +3708,33 @@ (x: -20, y: 18): [Wall, Zone(Bed), Zone(PlayerApartment)], (x: -20, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -20, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -19, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -19, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -19, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -19, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -19, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -19, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -19, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -19, y: -32): [Wall, Empty, Zone(Hallway)], (x: -19, y: -31): [Empty, Empty, Zone(Hallway)], (x: -19, y: -30): [Empty, Empty, Zone(Hallway)], @@ -3788,33 +3788,33 @@ (x: -19, y: 18): [Wall, Zone(Bed), Zone(PlayerApartment)], (x: -19, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -19, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -18, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -18, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -18, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -18, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -18, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -18, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -18, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -18, y: -32): [Wall, Empty, Zone(Hallway)], (x: -18, y: -31): [Wall, Empty, Zone(Hallway)], (x: -18, y: -30): [Empty, Empty, Zone(Hallway)], @@ -3868,33 +3868,33 @@ (x: -18, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -18, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -18, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -17, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -17, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -17, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -17, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -17, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -17, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -17, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -17, y: -32): [Wall, Empty, Zone(Hallway)], (x: -17, y: -31): [Wall, Empty, Zone(Hallway)], (x: -17, y: -30): [Empty, Empty, Zone(Hallway)], @@ -3948,33 +3948,33 @@ (x: -17, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -17, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -17, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -16, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -16, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -16, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -16, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -16, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -16, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -16, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -16, y: -32): [Wall, Empty, Zone(Hallway)], (x: -16, y: -31): [Wall, Empty, Zone(Hallway)], (x: -16, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4028,33 +4028,33 @@ (x: -16, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -16, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -16, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -15, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -15, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -15, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -15, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -56): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -15, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -15, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -15, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -15, y: -32): [Wall, Empty, Zone(Hallway)], (x: -15, y: -31): [Wall, Empty, Zone(Hallway)], (x: -15, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4108,33 +4108,33 @@ (x: -15, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -15, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -15, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -14, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -14, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -14, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -14, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -14, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -14, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -14, y: -32): [Wall, Empty, Zone(Hallway)], (x: -14, y: -31): [Wall, Empty, Zone(Hallway)], (x: -14, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4188,33 +4188,33 @@ (x: -14, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -14, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -14, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -13, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -13, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -13, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -13, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -13, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -13, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -13, y: -32): [Wall, Empty, Zone(Hallway)], (x: -13, y: -31): [Wall, Empty, Zone(Hallway)], (x: -13, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4268,33 +4268,33 @@ (x: -13, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -13, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -13, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -12, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -12, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -12, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -12, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -12, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -12, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -12, y: -32): [Wall, Empty, Zone(Hallway)], (x: -12, y: -31): [Wall, Empty, Zone(Hallway)], (x: -12, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4348,33 +4348,33 @@ (x: -12, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -12, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -12, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -11, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -38): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -37): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -36): [Trail, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -11, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -11, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -11, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -11, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -11, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -11, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -11, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -41): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -40): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -39): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -38): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -37): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -36): [Trail, Empty, Zone(Apartment2)], + (x: -11, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -11, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -11, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -11, y: -32): [Wall, Empty, Zone(Hallway)], (x: -11, y: -31): [Wall, Empty, Zone(Hallway)], (x: -11, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4428,33 +4428,33 @@ (x: -11, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: -11, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -11, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -10, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -10, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -10, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -10, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -10, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -10, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -10, y: -32): [Wall, Empty, Zone(Hallway)], (x: -10, y: -31): [Wall, Empty, Zone(Hallway)], (x: -10, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4508,33 +4508,33 @@ (x: -10, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -10, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -10, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -9, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -9, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -9, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -9, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -9, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -9, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -9, y: -32): [Wall, Empty, Zone(Hallway)], (x: -9, y: -31): [Wall, Empty, Zone(Hallway)], (x: -9, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4588,33 +4588,33 @@ (x: -9, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -9, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -9, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -8, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -8, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -8, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -8, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -8, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -8, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -8, y: -32): [Wall, Empty, Zone(Hallway)], (x: -8, y: -31): [Wall, Empty, Zone(Hallway)], (x: -8, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4668,33 +4668,33 @@ (x: -8, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -8, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -8, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -7, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -7, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -7, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -7, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -7, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -7, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -7, y: -32): [Wall, Empty, Zone(Hallway)], (x: -7, y: -31): [Wall, Empty, Zone(Hallway)], (x: -7, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4748,33 +4748,33 @@ (x: -7, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -7, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -7, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -6, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -6, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -6, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -6, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -6, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -6, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -6, y: -32): [Wall, Empty, Zone(Hallway)], (x: -6, y: -31): [Wall, Empty, Zone(Hallway)], (x: -6, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4828,33 +4828,33 @@ (x: -6, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: -6, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -6, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -5, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -5, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -5, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -5, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -5, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -5, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -5, y: -32): [Wall, Empty, Zone(Hallway)], (x: -5, y: -31): [Wall, Empty, Zone(Hallway)], (x: -5, y: -30): [Empty, Empty, Zone(Hallway)], @@ -4887,33 +4887,33 @@ (x: -5, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: -5, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -5, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -4, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -4, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -4, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -4, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -4, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -4, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -4, y: -32): [Wall, Empty, Zone(Hallway)], (x: -4, y: -31): [Wall, Empty, Zone(Hallway)], (x: -4, y: -30): [Trail, Empty, Zone(Hallway)], @@ -4946,33 +4946,33 @@ (x: -4, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: -4, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -4, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -3, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -3, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -3, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -3, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -3, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -3, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -3, y: -32): [Wall, Empty, Zone(Hallway)], (x: -3, y: -31): [Wall, Empty, Zone(Hallway)], (x: -3, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5005,33 +5005,33 @@ (x: -3, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: -3, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -3, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -2, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -58): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -57): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -56): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -55): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -54): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -53): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -52): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -51): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -50): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -49): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -48): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -47): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -46): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -45): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -44): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -37): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -36): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -35): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -2, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -2, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -58): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -2, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: -2, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -2, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -2, y: -32): [Wall, Empty, Zone(Hallway)], (x: -2, y: -31): [Wall, Empty, Zone(Hallway)], (x: -2, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5064,33 +5064,33 @@ (x: -2, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: -2, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -2, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: -1, y: -59): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -58): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -57): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -56): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -55): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -54): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -53): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -52): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -51): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -50): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -49): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -48): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -47): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -46): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -45): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -44): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -43): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -42): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -41): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -40): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -39): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -38): [Empty, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -37): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -36): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -35): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -34): [Wall, Empty, Zone(BottomLeftApartment)], - (x: -1, y: -33): [Wall, Empty, Zone(BottomLeftApartment)], + (x: -1, y: -59): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -58): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: -1, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: -1, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: -1, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: -1, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: -1, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: -1, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: -1, y: -33): [Wall, Empty, Zone(Apartment2)], (x: -1, y: -32): [Wall, Empty, Zone(Hallway)], (x: -1, y: -31): [Wall, Empty, Zone(Hallway)], (x: -1, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5123,31 +5123,31 @@ (x: -1, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: -1, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: -1, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 0, y: -57): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -55): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -54): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -53): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -52): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -51): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -50): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -49): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -48): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -47): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -46): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -45): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -44): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 0, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 0, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 0, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 0, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 0, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 0, y: -37): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -36): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -35): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 0, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 0, y: -57): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 0, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 0, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 0, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 0, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 0, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 0, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 0, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 0, y: -32): [Wall, Empty, Zone(Hallway)], (x: 0, y: -31): [Wall, Empty, Zone(Hallway)], (x: 0, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5180,33 +5180,33 @@ (x: 0, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 0, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 0, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 1, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 1, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -52): [Wall, Empty, Zone(BottomRightApartment)], - (x: 1, y: -51): [Wall, Empty, Zone(BottomRightApartment)], - (x: 1, y: -50): [Wall, Empty, Zone(BottomRightApartment)], - (x: 1, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 1, y: -35): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 1, y: -34): [Wall, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 1, y: -33): [Wall, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 1, y: -32): [Wall, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 1, y: -31): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], + (x: 1, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 1, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: 1, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: 1, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: 1, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 1, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 1, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 1, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 1, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 1, y: -31): [Wall, Empty, Zone(Hallway)], (x: 1, y: -30): [Empty, Empty, Zone(Hallway)], (x: 1, y: -29): [Empty, Empty, Zone(Hallway)], (x: 1, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5237,33 +5237,33 @@ (x: 1, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 1, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 1, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 2, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 2, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -52): [Wall, Empty, Zone(BottomRightApartment)], - (x: 2, y: -51): [Wall, Empty, Zone(BottomRightApartment)], - (x: 2, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 2, y: -35): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 2, y: -34): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 2, y: -33): [Wall, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 2, y: -32): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 2, y: -31): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], + (x: 2, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 2, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: 2, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: 2, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 2, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 2, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 2, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 2, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 2, y: -31): [Wall, Empty, Zone(Hallway)], (x: 2, y: -30): [Empty, Empty, Zone(Hallway)], (x: 2, y: -29): [Empty, Empty, Zone(Hallway)], (x: 2, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5294,33 +5294,33 @@ (x: 2, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 2, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 2, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 3, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 3, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -52): [Wall, Empty, Zone(BottomRightApartment)], - (x: 3, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 3, y: -35): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 3, y: -34): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 3, y: -33): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 3, y: -32): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 3, y: -31): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], + (x: 3, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 3, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: 3, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 3, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 3, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 3, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 3, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 3, y: -31): [Wall, Empty, Zone(Hallway)], (x: 3, y: -30): [Empty, Empty, Zone(Hallway)], (x: 3, y: -29): [Empty, Empty, Zone(Hallway)], (x: 3, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5351,36 +5351,36 @@ (x: 3, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 3, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 3, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 4, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 4, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -53): [Wall, Empty, Zone(BottomRightApartment)], - (x: 4, y: -52): [Wall, Empty, Zone(BottomRightApartment)], - (x: 4, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 4, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -41): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -40): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -39): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -38): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -37): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -36): [Trail, Empty, Zone(BottomRightApartment)], - (x: 4, y: -35): [Trail, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 4, y: -34): [Trail, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 4, y: -33): [Trail, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 4, y: -32): [Trail, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 4, y: -31): [Trail, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 4, y: -30): [Trail, Empty, Zone(Hallway)], - (x: 4, y: -29): [Trail, Empty, Zone(Hallway)], - (x: 4, y: -28): [Trail, Empty, Zone(Hallway)], + (x: 4, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 4, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: 4, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: 4, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 4, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 4, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 4, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 4, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 4, y: -31): [Wall, Empty, Zone(Hallway)], + (x: 4, y: -30): [Empty, Empty, Zone(Hallway)], + (x: 4, y: -29): [Empty, Empty, Zone(Hallway)], + (x: 4, y: -28): [Empty, Empty, Zone(Hallway)], (x: 4, y: -27): [Trail, Empty, Zone(Hallway)], (x: 4, y: -26): [Empty, Empty, Zone(Hallway)], (x: 4, y: -25): [Empty, Empty, Zone(Hallway)], @@ -5408,33 +5408,33 @@ (x: 4, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 4, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 4, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 5, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 5, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -54): [Wall, Empty, Zone(BottomRightApartment)], - (x: 5, y: -53): [Wall, Empty, Zone(BottomRightApartment)], - (x: 5, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 5, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 5, y: -35): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 5, y: -34): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 5, y: -33): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 5, y: -32): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 5, y: -31): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], + (x: 5, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 5, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: 5, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: 5, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 5, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 5, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 5, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 5, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 5, y: -31): [Wall, Empty, Zone(Hallway)], (x: 5, y: -30): [Empty, Empty, Zone(Hallway)], (x: 5, y: -29): [Empty, Empty, Zone(Hallway)], (x: 5, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5465,33 +5465,33 @@ (x: 5, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 5, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 5, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 6, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 6, y: -55): [Wall, Empty, Zone(BottomRightApartment)], - (x: 6, y: -54): [Wall, Empty, Zone(BottomRightApartment)], - (x: 6, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 6, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 6, y: -35): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 6, y: -34): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 6, y: -33): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 6, y: -32): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 6, y: -31): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], + (x: 6, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 6, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: 6, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: 6, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 6, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 6, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 6, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 6, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 6, y: -31): [Wall, Empty, Zone(Hallway)], (x: 6, y: -30): [Empty, Empty, Zone(Hallway)], (x: 6, y: -29): [Empty, Empty, Zone(Hallway)], (x: 6, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5522,33 +5522,33 @@ (x: 6, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 6, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 6, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 7, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 7, y: -55): [Wall, Empty, Zone(BottomRightApartment)], - (x: 7, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 7, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 7, y: -35): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 7, y: -34): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 7, y: -33): [Empty, Zone(BottomRightApartmentDoor), Zone(BottomRightApartment)], - (x: 7, y: -32): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], - (x: 7, y: -31): [Empty, Zone(BottomRightApartmentDoor), Zone(Hallway)], + (x: 7, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 7, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: 7, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 7, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 7, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 7, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 7, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 7, y: -31): [Wall, Empty, Zone(Hallway)], (x: 7, y: -30): [Empty, Empty, Zone(Hallway)], (x: 7, y: -29): [Empty, Empty, Zone(Hallway)], (x: 7, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5579,33 +5579,33 @@ (x: 7, y: 18): [Empty, Zone(Meditation), Zone(PlayerApartment)], (x: 7, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 7, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 8, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 8, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 8, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 8, y: -33): [Wall, Empty, Zone(BottomRightApartment)], - (x: 8, y: -32): [Empty, Empty, Zone(Hallway)], - (x: 8, y: -31): [Empty, Empty, Zone(Hallway)], + (x: 8, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 8, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 8, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 8, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 8, y: -33): [Wall, Empty, Zone(Apartment2)], + (x: 8, y: -32): [Wall, Empty, Zone(Hallway)], + (x: 8, y: -31): [Wall, Empty, Zone(Hallway)], (x: 8, y: -30): [Empty, Empty, Zone(Hallway)], (x: 8, y: -29): [Empty, Empty, Zone(Hallway)], (x: 8, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5636,33 +5636,33 @@ (x: 8, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 8, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 8, y: 20): [Wall, Empty, Zone(PlayerApartment)], - (x: 9, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 9, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -52): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -51): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -50): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -49): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -48): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -47): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -46): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -45): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -44): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -43): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 9, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 9, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 9, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 9, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 9, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -52): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -51): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -50): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -49): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -48): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -47): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -46): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -45): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -43): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 9, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 9, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 9, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 9, y: -32): [Wall, Empty, Zone(Hallway)], - (x: 9, y: -31): [Empty, Empty, Zone(Hallway)], + (x: 9, y: -31): [Wall, Empty, Zone(Hallway)], (x: 9, y: -30): [Empty, Empty, Zone(Hallway)], (x: 9, y: -29): [Empty, Empty, Zone(Hallway)], (x: 9, y: -28): [Empty, Empty, Zone(Hallway)], @@ -5693,31 +5693,31 @@ (x: 9, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 9, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 9, y: 20): [Wall, Empty, Zone(PlayerApartment)], - (x: 10, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 10, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 10, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 10, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 10, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 10, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 10, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 10, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 10, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 10, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 10, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 10, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 10, y: -32): [Wall, Empty, Zone(Hallway)], (x: 10, y: -31): [Wall, Empty, Zone(Hallway)], (x: 10, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5750,31 +5750,31 @@ (x: 10, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 10, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 10, y: 20): [Wall, Empty, Zone(PlayerApartment)], - (x: 11, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 11, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 11, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 11, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 11, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 11, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 11, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 11, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 11, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 11, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 11, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 11, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 11, y: -32): [Wall, Empty, Zone(Hallway)], (x: 11, y: -31): [Wall, Empty, Zone(Hallway)], (x: 11, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5807,31 +5807,31 @@ (x: 11, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 11, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 11, y: 20): [Wall, Empty, Zone(PlayerApartment)], - (x: 12, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 12, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 12, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 12, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 12, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 12, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 12, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 12, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 12, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 12, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 12, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 12, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 12, y: -32): [Wall, Empty, Zone(Hallway)], (x: 12, y: -31): [Wall, Empty, Zone(Hallway)], (x: 12, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5864,31 +5864,31 @@ (x: 12, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 12, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 12, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 13, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 13, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 13, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 13, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 13, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 13, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 13, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 13, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 13, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 13, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 13, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 13, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 13, y: -32): [Wall, Empty, Zone(Hallway)], (x: 13, y: -31): [Wall, Empty, Zone(Hallway)], (x: 13, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5921,31 +5921,31 @@ (x: 13, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 13, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 13, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 14, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 14, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 14, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 14, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 14, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 14, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 14, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 14, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 14, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 14, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 14, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 14, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 14, y: -32): [Wall, Empty, Zone(Hallway)], (x: 14, y: -31): [Wall, Empty, Zone(Hallway)], (x: 14, y: -30): [Empty, Empty, Zone(Hallway)], @@ -5978,31 +5978,31 @@ (x: 14, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 14, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 14, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 15, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 15, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -52): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -51): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -50): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -49): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -48): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -47): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -46): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -45): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -44): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -43): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -42): [Trail, Empty, Zone(BottomRightApartment)], - (x: 15, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 15, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 15, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 15, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 15, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -52): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -51): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -50): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -49): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -48): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -47): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -46): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -45): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -44): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -43): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -42): [Trail, Empty, Zone(Apartment2)], + (x: 15, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 15, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 15, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 15, y: -32): [Wall, Empty, Zone(Hallway)], (x: 15, y: -31): [Wall, Empty, Zone(Hallway)], (x: 15, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6035,31 +6035,31 @@ (x: 15, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 15, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 15, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 16, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 16, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 16, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 16, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 16, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 16, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 16, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 16, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 16, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 16, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 16, y: -32): [Wall, Empty, Zone(Hallway)], (x: 16, y: -31): [Wall, Empty, Zone(Hallway)], (x: 16, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6092,31 +6092,31 @@ (x: 16, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 16, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 16, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 17, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 17, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 17, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 17, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 17, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 17, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 17, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 17, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 17, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 17, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 17, y: -32): [Wall, Empty, Zone(Hallway)], (x: 17, y: -31): [Wall, Empty, Zone(Hallway)], (x: 17, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6149,31 +6149,31 @@ (x: 17, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 17, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 17, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 18, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 18, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 18, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 18, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 18, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 18, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 18, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 18, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 18, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 18, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 18, y: -32): [Wall, Empty, Zone(Hallway)], (x: 18, y: -31): [Wall, Empty, Zone(Hallway)], (x: 18, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6206,31 +6206,31 @@ (x: 18, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 18, y: 19): [Empty, Empty, Zone(PlayerApartment)], (x: 18, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 19, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 19, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -53): [Trail, Empty, Zone(BottomRightApartment)], - (x: 19, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 19, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 19, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 19, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 19, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -53): [Trail, Empty, Zone(Apartment2)], + (x: 19, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 19, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 19, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 19, y: -32): [Wall, Empty, Zone(Hallway)], (x: 19, y: -31): [Wall, Empty, Zone(Hallway)], (x: 19, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6263,31 +6263,31 @@ (x: 19, y: 18): [Wall, Empty, Zone(PlayerApartment)], (x: 19, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 19, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 20, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 20, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 20, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 20, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 20, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 20, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 20, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 20, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 20, y: -32): [Wall, Empty, Zone(Hallway)], (x: 20, y: -31): [Wall, Empty, Zone(Hallway)], (x: 20, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6320,31 +6320,31 @@ (x: 20, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 20, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 20, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 21, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 21, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -55): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -54): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -53): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -52): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -51): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -50): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -49): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -48): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -47): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -46): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -45): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -44): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -43): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -42): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -41): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -40): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -39): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -38): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -37): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -36): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -35): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -34): [Wall, Empty, Zone(BottomRightApartment)], - (x: 21, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 21, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 21, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -55): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -54): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -53): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -52): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -51): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -50): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -49): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -48): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -47): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -46): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -45): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -44): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -43): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -42): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -41): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -40): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -39): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -38): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -37): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -36): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -35): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -34): [Wall, Empty, Zone(Apartment2)], + (x: 21, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 21, y: -32): [Wall, Empty, Zone(Hallway)], (x: 21, y: -31): [Wall, Empty, Zone(Hallway)], (x: 21, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6377,31 +6377,31 @@ (x: 21, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 21, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 21, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 22, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 22, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 22, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 22, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 22, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 22, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 22, y: -32): [Wall, Empty, Zone(Hallway)], (x: 22, y: -31): [Wall, Empty, Zone(Hallway)], (x: 22, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6434,31 +6434,31 @@ (x: 22, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 22, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 22, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 23, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 23, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 23, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 23, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 23, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 23, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 23, y: -32): [Wall, Empty, Zone(Hallway)], (x: 23, y: -31): [Wall, Empty, Zone(Hallway)], (x: 23, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6491,31 +6491,31 @@ (x: 23, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 23, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 23, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 24, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 24, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 24, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 24, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 24, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 24, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 24, y: -32): [Wall, Empty, Zone(Hallway)], (x: 24, y: -31): [Wall, Empty, Zone(Hallway)], (x: 24, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6548,31 +6548,31 @@ (x: 24, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 24, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 24, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 25, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 25, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 25, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 25, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 25, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 25, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 25, y: -32): [Wall, Empty, Zone(Hallway)], (x: 25, y: -31): [Wall, Empty, Zone(Hallway)], (x: 25, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6605,31 +6605,31 @@ (x: 25, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 25, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 25, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 26, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 26, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 26, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 26, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 26, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 26, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 26, y: -32): [Wall, Empty, Zone(Hallway)], (x: 26, y: -31): [Wall, Empty, Zone(Hallway)], (x: 26, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6662,31 +6662,31 @@ (x: 26, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 26, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 26, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 27, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 27, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 27, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 27, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 27, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 27, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 27, y: -32): [Wall, Empty, Zone(Hallway)], (x: 27, y: -31): [Wall, Empty, Zone(Hallway)], (x: 27, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6719,31 +6719,31 @@ (x: 27, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 27, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 27, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 28, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 28, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 28, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 28, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 28, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 28, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 28, y: -32): [Wall, Empty, Zone(Hallway)], (x: 28, y: -31): [Wall, Empty, Zone(Hallway)], (x: 28, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6776,31 +6776,31 @@ (x: 28, y: 18): [Empty, Zone(Tea), Zone(PlayerApartment)], (x: 28, y: 19): [Wall, Zone(Tea), Zone(PlayerApartment)], (x: 28, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 29, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 29, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 29, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 29, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 29, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 29, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 29, y: -32): [Wall, Empty, Zone(Hallway)], (x: 29, y: -31): [Wall, Empty, Zone(Hallway)], (x: 29, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6833,31 +6833,31 @@ (x: 29, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 29, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 29, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 30, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 30, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 30, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 30, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 30, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 30, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 30, y: -32): [Wall, Empty, Zone(Hallway)], (x: 30, y: -31): [Wall, Empty, Zone(Hallway)], (x: 30, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6890,31 +6890,31 @@ (x: 30, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 30, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 30, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 31, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 31, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 31, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 31, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 31, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 31, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 31, y: -32): [Wall, Empty, Zone(Hallway)], (x: 31, y: -31): [Wall, Empty, Zone(Hallway)], (x: 31, y: -30): [Empty, Empty, Zone(Hallway)], @@ -6947,31 +6947,31 @@ (x: 31, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 31, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 31, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 32, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 32, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 32, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 32, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 32, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 32, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 32, y: -32): [Wall, Empty, Zone(Hallway)], (x: 32, y: -31): [Wall, Empty, Zone(Hallway)], (x: 32, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7004,31 +7004,31 @@ (x: 32, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 32, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 32, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 33, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 33, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 33, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 33, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 33, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 33, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 33, y: -32): [Wall, Empty, Zone(Hallway)], (x: 33, y: -31): [Wall, Empty, Zone(Hallway)], (x: 33, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7061,31 +7061,31 @@ (x: 33, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 33, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 33, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 34, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 34, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 34, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 34, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 34, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 34, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 34, y: -32): [Wall, Empty, Zone(Hallway)], (x: 34, y: -31): [Wall, Empty, Zone(Hallway)], (x: 34, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7118,31 +7118,31 @@ (x: 34, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 34, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 34, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 35, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 35, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 35, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 35, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 35, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 35, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 35, y: -32): [Wall, Empty, Zone(Hallway)], (x: 35, y: -31): [Wall, Empty, Zone(Hallway)], (x: 35, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7175,31 +7175,31 @@ (x: 35, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 35, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 35, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 36, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 36, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 36, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 36, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 36, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 36, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 36, y: -32): [Wall, Empty, Zone(Hallway)], (x: 36, y: -31): [Wall, Empty, Zone(Hallway)], (x: 36, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7232,31 +7232,31 @@ (x: 36, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 36, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 36, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 37, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 37, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 37, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 37, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 37, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 37, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 37, y: -32): [Wall, Empty, Zone(Hallway)], (x: 37, y: -31): [Wall, Empty, Zone(Hallway)], (x: 37, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7289,31 +7289,31 @@ (x: 37, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 37, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 37, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 38, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 38, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 38, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 38, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 38, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 38, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 38, y: -32): [Wall, Empty, Zone(Hallway)], (x: 38, y: -31): [Wall, Empty, Zone(Hallway)], (x: 38, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7346,31 +7346,31 @@ (x: 38, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 38, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 38, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 39, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 39, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 39, y: -33): [Wall, Empty, Zone(BottomRightApartment)], + (x: 39, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 39, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 39, y: -33): [Wall, Empty, Zone(Apartment2)], (x: 39, y: -32): [Wall, Empty, Zone(Hallway)], (x: 39, y: -31): [Wall, Empty, Zone(Hallway)], (x: 39, y: -30): [Wall, Empty, Zone(Hallway)], @@ -7404,31 +7404,31 @@ (x: 39, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 39, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 39, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 40, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 40, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 40, y: -33): [Empty, Empty, Zone(BottomRightApartment)], + (x: 40, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 40, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 40, y: -33): [Empty, Empty, Zone(Apartment2)], (x: 40, y: -32): [Empty, Empty, Zone(Hallway)], (x: 40, y: -31): [Empty, Empty, Zone(Hallway)], (x: 40, y: -30): [Empty, Empty, Zone(Hallway)], @@ -7462,31 +7462,31 @@ (x: 40, y: 18): [Empty, Empty, Zone(PlayerApartment)], (x: 40, y: 19): [Wall, Empty, Zone(PlayerApartment)], (x: 40, y: 20): [Empty, Empty, Zone(PlayerApartment)], - (x: 41, y: -57): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -56): [Wall, Empty, Zone(BottomRightApartment)], - (x: 41, y: -55): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -54): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -53): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -52): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -51): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -50): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -49): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -48): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -47): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -46): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -45): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -44): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -43): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -42): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -41): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -40): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -39): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -38): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -37): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -36): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -35): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -34): [Empty, Empty, Zone(BottomRightApartment)], - (x: 41, y: -33): [Empty, Empty, Zone(BottomRightApartment)], + (x: 41, y: -57): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -56): [Wall, Empty, Zone(Apartment2)], + (x: 41, y: -55): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -54): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -53): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -52): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -51): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -50): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -49): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -48): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -47): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -46): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -45): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -44): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -43): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -42): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -41): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -40): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -39): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -38): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -37): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -36): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -35): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -34): [Empty, Empty, Zone(Apartment2)], + (x: 41, y: -33): [Empty, Empty, Zone(Apartment2)], (x: 41, y: 1): [Wall], (x: 41, y: 2): [Wall], (x: 41, y: 3): [Wall], diff --git a/main_game/assets/scenes/building1_player_floor.tscn b/main_game/assets/scenes/building1_player_floor.tscn index a8e4880f..eb0ce595 100644 --- a/main_game/assets/scenes/building1_player_floor.tscn +++ b/main_game/assets/scenes/building1_player_floor.tscn @@ -1,56 +1,56 @@ [gd_scene load_steps=118 format=3 uid="uid://dyrtqlwb1xtvf"] -[ext_resource type="Texture2D" uid="uid://darta8tusokhc" path="res://assets/residential/indoors/player_apartment_bg.png" id="1_70osf"] -[ext_resource type="Texture2D" uid="uid://h5w2770frdhg" path="res://assets/residential/indoors/cloud_atlas.png" id="2_yacc0"] -[ext_resource type="Texture2D" uid="uid://b66m72s4baqbk" path="res://assets/residential/indoors/player_apartment_backwall_furniture.png" id="3_e2w78"] -[ext_resource type="Texture2D" uid="uid://dwuiv5li0qa0t" path="res://assets/residential/indoors/meditation_chair.png" id="4_njet2"] -[ext_resource type="Texture2D" uid="uid://byftoar0081d1" path="res://assets/residential/indoors/winnie_sleeping.png" id="5_u86a4"] -[ext_resource type="Texture2D" uid="uid://kk38aen6tkfg" path="res://assets/residential/indoors/winnie_meditating.png" id="6_5id1h"] -[ext_resource type="Texture2D" uid="uid://cgd4gem7h52i6" path="res://assets/residential/indoors/toilet.png" id="7_3q0vg"] -[ext_resource type="Texture2D" uid="uid://bsgf6tak08k2u" path="res://assets/residential/indoors/candle_atlas.png" id="7_qu8yb"] -[ext_resource type="Texture2D" uid="uid://bs6x68xdn0lx1" path="res://assets/residential/indoors/hallway1.png" id="8_uh48f"] -[ext_resource type="Texture2D" uid="uid://hny4j2anps08" path="res://assets/residential/indoors/elevator_atlas.png" id="9_hc3bl"] -[ext_resource type="Texture2D" uid="uid://pj6txeysfp8v" path="res://assets/residential/indoors/toileteye_atlas.png" id="9_x3rb8"] -[ext_resource type="Texture2D" uid="uid://drbv1a7tnye2r" path="res://assets/environment/vending_machine_atlas.png" id="10_sp5dx"] -[ext_resource type="Texture2D" uid="uid://eoxkn1y1pym5" path="res://assets/residential/indoors/cupboard1.png" id="11_iijqm"] -[ext_resource type="Texture2D" uid="uid://dofwik4dielt4" path="res://assets/residential/indoors/laundry_basket.png" id="12_b5il1"] -[ext_resource type="Texture2D" uid="uid://dkeh5yr5mpahy" path="res://assets/residential/indoors/shoerack.png" id="13_7ojeu"] -[ext_resource type="Texture2D" uid="uid://waug3cm18jbm" path="res://assets/residential/indoors/kitchen_table.png" id="14_aqp0s"] -[ext_resource type="Texture2D" uid="uid://c3e80emirrnkj" path="res://assets/residential/indoors/brown_light_door_atlas.png" id="15_8oxyo"] -[ext_resource type="Texture2D" uid="uid://fv8isbxnl2tb" path="res://assets/residential/indoors/fridge.png" id="16_0n6p3"] -[ext_resource type="Texture2D" uid="uid://ds5d1ssvswgsm" path="res://assets/residential/indoors/brown_dark_door_atlas.png" id="17_mm1s1"] -[ext_resource type="Texture2D" uid="uid://ofvhtlfhhsb3" path="res://assets/environment/package.png" id="18_fe7mm"] -[ext_resource type="Texture2D" uid="uid://2b0o1wvmujta" path="res://assets/environment/water_bottle_empty.png" id="19_fe26e"] -[ext_resource type="Texture2D" uid="uid://4m00yfjnbawb" path="res://assets/residential/indoors/player_neighbours_bg.png" id="20_alp5o"] -[ext_resource type="Texture2D" uid="uid://c7dracayybs03" path="res://assets/residential/indoors/cupboard2.png" id="21_vnmpr"] -[ext_resource type="Texture2D" uid="uid://ro52txu3n00" path="res://assets/environment/can.png" id="22_i1pqp"] -[ext_resource type="Texture2D" uid="uid://c4cag0lrr0xvm" path="res://assets/residential/indoors/skrabadlo.png" id="23_kalpq"] -[ext_resource type="Texture2D" uid="uid://cmq2aicwx30ac" path="res://assets/residential/indoors/coffee_table.png" id="26_trfib"] -[ext_resource type="Texture2D" uid="uid://b2fvesnictg4e" path="res://assets/residential/indoors/green_kitchen_set.png" id="27_oe34g"] -[ext_resource type="Texture2D" uid="uid://bwgbbegd64u7c" path="res://assets/residential/indoors/blue_bed.png" id="28_6pfto"] -[ext_resource type="Texture2D" uid="uid://cvqttpt4js7nr" path="res://assets/environment/beer.png" id="29_t2bpu"] -[ext_resource type="Texture2D" uid="uid://c5b62pc38ijn5" path="res://assets/environment/fruit_bowl.png" id="30_3c4bq"] -[ext_resource type="Texture2D" uid="uid://bg5e5qx72fkp5" path="res://assets/environment/room_light.png" id="31_wa4ug"] -[ext_resource type="Texture2D" uid="uid://cnbycag5da1ap" path="res://assets/residential/indoors/router_atlas.png" id="32_0gd0c"] -[ext_resource type="Texture2D" uid="uid://dggtq8cr8skng" path="res://assets/residential/indoors/side_table1.png" id="36_458u3"] -[ext_resource type="Texture2D" uid="uid://dfpb1mond3rnx" path="res://assets/residential/indoors/bed_wooden.png" id="37_6lbmy"] -[ext_resource type="Texture2D" uid="uid://h03jwe4lr73k" path="res://assets/residential/indoors/tissues.png" id="38_bam3r"] -[ext_resource type="Texture2D" uid="uid://fpc3f14s24e7" path="res://assets/residential/indoors/bath_horizontal.png" id="38_mdm3q"] -[ext_resource type="Texture2D" uid="uid://jfo33icc8k1l" path="res://assets/residential/indoors/bathroom_light.png" id="38_no0qc"] -[ext_resource type="Texture2D" uid="uid://c4gdjtb4d1w3k" path="res://assets/residential/indoors/kitchen_light.png" id="39_ft1ep"] -[ext_resource type="Texture2D" uid="uid://ckb3asbuhxg38" path="res://assets/residential/indoors/tvtable_back.png" id="39_h5xtj"] -[ext_resource type="Texture2D" uid="uid://dualkmd5i61e4" path="res://assets/residential/indoors/TV_flat_back.png" id="40_wwta0"] -[ext_resource type="Texture2D" uid="uid://dvwbybx42utvl" path="res://assets/residential/indoors/tv_flat.png" id="41_lo0xi"] -[ext_resource type="Texture2D" uid="uid://d01kfmw7mltte" path="res://assets/residential/indoors/sofa_blue_back.png" id="42_yuajs"] -[ext_resource type="Texture2D" uid="uid://cd5s8so082dss" path="res://assets/residential/indoors/chair_wood.png" id="43_bwyl6"] -[ext_resource type="Texture2D" uid="uid://b6ik715wdgoxg" path="res://assets/residential/indoors/table_big.png" id="44_m1c6h"] -[ext_resource type="Texture2D" uid="uid://bwbd0lhiuf2e8" path="res://assets/items/coffee.png" id="45_ucetx"] -[ext_resource type="Texture2D" uid="uid://c24128k3soyhf" path="res://assets/items/pill_box.png" id="46_r200y"] -[ext_resource type="Texture2D" uid="uid://dolvlk268uyvh" path="res://assets/environment/box_cardboard_sideways.png" id="47_jy22a"] -[ext_resource type="Texture2D" uid="uid://bl6casbqthnd3" path="res://assets/environment/plate_cookies.png" id="48_jgxiy"] -[ext_resource type="Texture2D" uid="uid://ctfvqwyu7rfpw" path="res://assets/environment/filter_yellow.png" id="49_e4apf"] -[ext_resource type="Texture2D" uid="uid://bbvgexcjujtws" path="res://assets/environment/filter_purple.png" id="50_laek6"] -[ext_resource type="Texture2D" uid="uid://drpvso2tmnxi2" path="res://assets/environment/filter_pink.png" id="51_8xqr1"] +[ext_resource type="Texture2D" uid="uid://ciwlf0c0gyyyq" path="res://assets/residential/indoors/player_apartment_bg.png" id="1_70osf"] +[ext_resource type="Texture2D" uid="uid://kytoyoyhjxxv" path="res://assets/residential/indoors/cloud_atlas.png" id="2_yacc0"] +[ext_resource type="Texture2D" uid="uid://dn0f5bt32acd5" path="res://assets/residential/indoors/player_apartment_backwall_furniture.png" id="3_e2w78"] +[ext_resource type="Texture2D" uid="uid://d4gt4aikjid7a" path="res://assets/residential/indoors/meditation_chair.png" id="4_njet2"] +[ext_resource type="Texture2D" uid="uid://2irnfvapged1" path="res://assets/residential/indoors/winnie_sleeping.png" id="5_u86a4"] +[ext_resource type="Texture2D" uid="uid://c44rfsmy150fo" path="res://assets/residential/indoors/winnie_meditating.png" id="6_5id1h"] +[ext_resource type="Texture2D" uid="uid://d07qq5e0nd3h1" path="res://assets/residential/indoors/toilet.png" id="7_3q0vg"] +[ext_resource type="Texture2D" uid="uid://c44tcg8mxxabp" path="res://assets/residential/indoors/candle_atlas.png" id="7_qu8yb"] +[ext_resource type="Texture2D" uid="uid://2nr502qjl1fn" path="res://assets/residential/indoors/hallway1.png" id="8_uh48f"] +[ext_resource type="Texture2D" uid="uid://cq4dga042qxr" path="res://assets/residential/indoors/elevator_atlas.png" id="9_hc3bl"] +[ext_resource type="Texture2D" uid="uid://b4vr2bjye6goo" path="res://assets/residential/indoors/toileteye_atlas.png" id="9_x3rb8"] +[ext_resource type="Texture2D" uid="uid://cqsdb5tp644w6" path="res://assets/environment/vending_machine_atlas.png" id="10_sp5dx"] +[ext_resource type="Texture2D" uid="uid://bycuegh5eiofi" path="res://assets/residential/indoors/cupboard1.png" id="11_iijqm"] +[ext_resource type="Texture2D" uid="uid://btsd7or6tk701" path="res://assets/residential/indoors/laundry_basket.png" id="12_b5il1"] +[ext_resource type="Texture2D" uid="uid://kbsekm7v1fbk" path="res://assets/residential/indoors/shoerack.png" id="13_7ojeu"] +[ext_resource type="Texture2D" uid="uid://cxrax8hnp6oxo" path="res://assets/residential/indoors/kitchen_table.png" id="14_aqp0s"] +[ext_resource type="Texture2D" uid="uid://iwunrdjegi2a" path="res://assets/residential/indoors/brown_light_door_atlas.png" id="15_8oxyo"] +[ext_resource type="Texture2D" uid="uid://mn6fsc2pn682" path="res://assets/residential/indoors/fridge.png" id="16_0n6p3"] +[ext_resource type="Texture2D" uid="uid://3212443mchtu" path="res://assets/residential/indoors/brown_dark_door_atlas.png" id="17_mm1s1"] +[ext_resource type="Texture2D" uid="uid://p6o4g707hml2" path="res://assets/environment/package.png" id="18_fe7mm"] +[ext_resource type="Texture2D" uid="uid://cgv4cowr33sy2" path="res://assets/environment/water_bottle_empty.png" id="19_fe26e"] +[ext_resource type="Texture2D" uid="uid://cyup11yq6ir8q" path="res://assets/residential/indoors/player_neighbours_bg.png" id="20_alp5o"] +[ext_resource type="Texture2D" uid="uid://bkv7f7wxjfce5" path="res://assets/residential/indoors/cupboard2.png" id="21_vnmpr"] +[ext_resource type="Texture2D" uid="uid://cs2tcnoaxbeyx" path="res://assets/environment/can.png" id="22_i1pqp"] +[ext_resource type="Texture2D" uid="uid://cut0xsw6oogl2" path="res://assets/residential/indoors/skrabadlo.png" id="23_kalpq"] +[ext_resource type="Texture2D" uid="uid://cnj3joi5hqv65" path="res://assets/residential/indoors/coffee_table.png" id="26_trfib"] +[ext_resource type="Texture2D" uid="uid://gufxulf5gqud" path="res://assets/residential/indoors/green_kitchen_set.png" id="27_oe34g"] +[ext_resource type="Texture2D" uid="uid://bbwbyf5acduh3" path="res://assets/residential/indoors/blue_bed.png" id="28_6pfto"] +[ext_resource type="Texture2D" uid="uid://d2v4j1m6u8ek1" path="res://assets/environment/beer.png" id="29_t2bpu"] +[ext_resource type="Texture2D" uid="uid://cgpp7lomv0qoy" path="res://assets/environment/fruit_bowl.png" id="30_3c4bq"] +[ext_resource type="Texture2D" uid="uid://cyrhalbx0wke7" path="res://assets/environment/room_light.png" id="31_wa4ug"] +[ext_resource type="Texture2D" uid="uid://dhm38fetha50k" path="res://assets/residential/indoors/router_atlas.png" id="32_0gd0c"] +[ext_resource type="Texture2D" uid="uid://dnu54tiuqoh11" path="res://assets/residential/indoors/side_table1.png" id="36_458u3"] +[ext_resource type="Texture2D" uid="uid://b8ddb3gvan3aq" path="res://assets/residential/indoors/bed_wooden.png" id="37_6lbmy"] +[ext_resource type="Texture2D" uid="uid://gcq6oilow74x" path="res://assets/residential/indoors/tissues.png" id="38_bam3r"] +[ext_resource type="Texture2D" uid="uid://d00p28mxdb8q6" path="res://assets/residential/indoors/bath_horizontal.png" id="38_mdm3q"] +[ext_resource type="Texture2D" uid="uid://b06fbgd0kvmos" path="res://assets/residential/indoors/bathroom_light.png" id="38_no0qc"] +[ext_resource type="Texture2D" uid="uid://bjomymsa6xoxb" path="res://assets/residential/indoors/kitchen_light.png" id="39_ft1ep"] +[ext_resource type="Texture2D" uid="uid://cnw31jeo4x5xo" path="res://assets/residential/indoors/tvtable_back.png" id="39_h5xtj"] +[ext_resource type="Texture2D" uid="uid://b61ggdw52hfs" path="res://assets/residential/indoors/TV_flat_back.png" id="40_wwta0"] +[ext_resource type="Texture2D" uid="uid://clp6kaugn0qhf" path="res://assets/residential/indoors/tv_flat.png" id="41_lo0xi"] +[ext_resource type="Texture2D" uid="uid://dauoqf2uncgtr" path="res://assets/residential/indoors/sofa_blue_back.png" id="42_yuajs"] +[ext_resource type="Texture2D" uid="uid://ds4y5uncew47s" path="res://assets/residential/indoors/chair_wood.png" id="43_bwyl6"] +[ext_resource type="Texture2D" uid="uid://dm8vr6r5xjpn6" path="res://assets/residential/indoors/table_big.png" id="44_m1c6h"] +[ext_resource type="Texture2D" uid="uid://d0d80cmhw0fkp" path="res://assets/items/coffee.png" id="45_ucetx"] +[ext_resource type="Texture2D" uid="uid://b1hvvdstv7cxc" path="res://assets/items/pill_box.png" id="46_r200y"] +[ext_resource type="Texture2D" uid="uid://d12k76fyavn8r" path="res://assets/environment/box_cardboard_sideways.png" id="47_jy22a"] +[ext_resource type="Texture2D" uid="uid://d3mwudfr1c4bb" path="res://assets/environment/plate_cookies.png" id="48_jgxiy"] +[ext_resource type="Texture2D" uid="uid://bidyqu0fcat0e" path="res://assets/environment/filter_yellow.png" id="49_e4apf"] +[ext_resource type="Texture2D" uid="uid://uq1l5ggop5dq" path="res://assets/environment/filter_purple.png" id="50_laek6"] +[ext_resource type="Texture2D" uid="uid://blamk2sswywea" path="res://assets/environment/filter_pink.png" id="51_8xqr1"] [sub_resource type="AtlasTexture" id="AtlasTexture_nte4w"] atlas = ExtResource("2_yacc0") @@ -718,233 +718,256 @@ sprite_frames = SubResource("SpriteFrames_lxk6t") [node name="HallwayEntity" type="Node" parent="Hallway/HallwayBg/VendingMachine"] -[node name="BottomApartments" type="Node2D" parent="."] +[node name="BottomApartment" type="Node2D" parent="."] -[node name="Bg" type="Sprite2D" parent="BottomApartments"] +[node name="Bg" type="Sprite2D" parent="BottomApartment"] z_index = -4 position = Vector2(0, 128) texture = ExtResource("20_alp5o") -[node name="HallwayEntity" type="Node" parent="BottomApartments/Bg"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/Bg"] -[node name="RightApartment" type="Node2D" parent="BottomApartments"] - -[node name="TableWithDrawers" type="Sprite2D" parent="BottomApartments/RightApartment"] +[node name="TableWithDrawers" type="Sprite2D" parent="BottomApartment"] position = Vector2(93, 119) texture = ExtResource("21_vnmpr") -[node name="Can" type="Sprite2D" parent="BottomApartments/RightApartment/TableWithDrawers"] +[node name="Can" type="Sprite2D" parent="BottomApartment/TableWithDrawers"] self_modulate = Color(0.0509804, 0.054902, 0.121569, 1) position = Vector2(9, -12) texture = ExtResource("22_i1pqp") -[node name="YSort" type="Node2D" parent="BottomApartments/RightApartment/TableWithDrawers"] +[node name="YSort" type="Node2D" parent="BottomApartment/TableWithDrawers"] position = Vector2(0, 10) -[node name="HallwayEntity" type="Node" parent="BottomApartments/RightApartment/TableWithDrawers"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/TableWithDrawers"] -[node name="Coffee" type="Sprite2D" parent="BottomApartments/RightApartment/TableWithDrawers"] +[node name="Coffee" type="Sprite2D" parent="BottomApartment/TableWithDrawers"] position = Vector2(-7, -12) texture = ExtResource("45_ucetx") -[node name="Skrabadlo" type="Sprite2D" parent="BottomApartments/RightApartment"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/TableWithDrawers/Coffee"] + +[node name="Skrabadlo" type="Sprite2D" parent="BottomApartment"] position = Vector2(51, 197) texture = ExtResource("23_kalpq") -[node name="YSort" type="Node2D" parent="BottomApartments/RightApartment/Skrabadlo"] +[node name="YSort" type="Node2D" parent="BottomApartment/Skrabadlo"] position = Vector2(0, 15) -[node name="HallwayEntity" type="Node" parent="BottomApartments/RightApartment/Skrabadlo"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/Skrabadlo"] -[node name="BedWooden" type="Sprite2D" parent="BottomApartments/RightApartment"] +[node name="BedWooden" type="Sprite2D" parent="BottomApartment"] position = Vector2(161, 161) texture = ExtResource("37_6lbmy") -[node name="YSort" type="Node2D" parent="BottomApartments/RightApartment/BedWooden"] +[node name="YSort" type="Node2D" parent="BottomApartment/BedWooden"] position = Vector2(-36, 57) -[node name="HallwayEntity" type="Node" parent="BottomApartments/RightApartment/BedWooden"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/BedWooden"] -[node name="LeftApartment" type="Node2D" parent="BottomApartments"] - -[node name="BottomLeftApartmentDoor" type="AnimatedSprite2D" parent="BottomApartments/LeftApartment"] +[node name="Apartment2Door" type="AnimatedSprite2D" parent="BottomApartment"] position = Vector2(-61, 111) sprite_frames = SubResource("SpriteFrames_j7cpw") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/BottomLeftApartmentDoor"] +[node name="YSort" type="Node2D" parent="BottomApartment/Apartment2Door"] position = Vector2(0, 18) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/BottomLeftApartmentDoor"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/Apartment2Door"] -[node name="CoffeeTable" type="Sprite2D" parent="BottomApartments/LeftApartment"] +[node name="CoffeeTable" type="Sprite2D" parent="BottomApartment"] position = Vector2(-112, 137) texture = ExtResource("26_trfib") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/CoffeeTable"] +[node name="YSort" type="Node2D" parent="BottomApartment/CoffeeTable"] position = Vector2(-2, 10) -[node name="Beer" type="Sprite2D" parent="BottomApartments/LeftApartment/CoffeeTable"] +[node name="Beer" type="Sprite2D" parent="BottomApartment/CoffeeTable"] position = Vector2(-2, -11) texture = ExtResource("29_t2bpu") -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/CoffeeTable/Beer"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/CoffeeTable/Beer"] -[node name="FruitBowl" type="Sprite2D" parent="BottomApartments/LeftApartment/CoffeeTable"] +[node name="FruitBowl" type="Sprite2D" parent="BottomApartment/CoffeeTable"] position = Vector2(-16, -8) texture = ExtResource("30_3c4bq") -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/CoffeeTable/FruitBowl"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/CoffeeTable/FruitBowl"] -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/CoffeeTable"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/CoffeeTable"] -[node name="GreenKitchenSet" type="Sprite2D" parent="BottomApartments/LeftApartment"] +[node name="GreenKitchenSet" type="Sprite2D" parent="BottomApartment"] position = Vector2(-5, 120) texture = ExtResource("27_oe34g") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/GreenKitchenSet"] +[node name="YSort" type="Node2D" parent="BottomApartment/GreenKitchenSet"] position = Vector2(0, 11) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/GreenKitchenSet"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/GreenKitchenSet"] -[node name="Bath" type="Sprite2D" parent="BottomApartments/LeftApartment"] +[node name="Bath" type="Sprite2D" parent="BottomApartment"] position = Vector2(-180, 137) texture = ExtResource("38_mdm3q") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/Bath"] +[node name="YSort" type="Node2D" parent="BottomApartment/Bath"] position = Vector2(-28, 13) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/Bath"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/Bath"] -[node name="Toilet" type="Sprite2D" parent="BottomApartments/LeftApartment"] +[node name="Toilet" type="Sprite2D" parent="BottomApartment"] position = Vector2(-199, 189) texture = ExtResource("7_3q0vg") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/Toilet"] +[node name="YSort" type="Node2D" parent="BottomApartment/Toilet"] position = Vector2(-1, 14) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/Toilet"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/Toilet"] -[node name="BottomLeftApartmentBathroomDoor" type="AnimatedSprite2D" parent="BottomApartments/LeftApartment"] +[node name="Apartment2BathroomDoor" type="AnimatedSprite2D" parent="BottomApartment"] position = Vector2(-165, 187) sprite_frames = SubResource("SpriteFrames_j7cpw") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/BottomLeftApartmentBathroomDoor"] +[node name="YSort" type="Node2D" parent="BottomApartment/Apartment2BathroomDoor"] position = Vector2(0, 18) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/BottomLeftApartmentBathroomDoor"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/Apartment2BathroomDoor"] -[node name="BedTable" type="Sprite2D" parent="BottomApartments/LeftApartment"] +[node name="BedTable" type="Sprite2D" parent="BottomApartment"] position = Vector2(-228, 128) texture = ExtResource("36_458u3") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/BedTable"] +[node name="YSort" type="Node2D" parent="BottomApartment/BedTable"] position = Vector2(-10, 10) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/BedTable"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/BedTable"] -[node name="Tissues" type="Sprite2D" parent="BottomApartments/LeftApartment/BedTable"] +[node name="Tissues" type="Sprite2D" parent="BottomApartment/BedTable"] position = Vector2(-4, -13) texture = ExtResource("38_bam3r") -[node name="PillBox" type="Sprite2D" parent="BottomApartments/LeftApartment/BedTable"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/BedTable/Tissues"] + +[node name="PillBox" type="Sprite2D" parent="BottomApartment/BedTable"] position = Vector2(6, -13) texture = ExtResource("46_r200y") -[node name="BlueBed" type="Sprite2D" parent="BottomApartments/LeftApartment"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/BedTable/PillBox"] + +[node name="BlueBed" type="Sprite2D" parent="BottomApartment"] position = Vector2(-263, 143) texture = ExtResource("28_6pfto") -[node name="YSort" type="Node2D" parent="BottomApartments/LeftApartment/BlueBed"] +[node name="YSort" type="Node2D" parent="BottomApartment/BlueBed"] position = Vector2(19, -12) -[node name="HallwayEntity" type="Node" parent="BottomApartments/LeftApartment/BlueBed"] - -[node name="Points" type="Node2D" parent="."] - -[node name="AfterSleepSpawn" type="Node2D" parent="Points"] -position = Vector2(-144, -58) - -[node name="Point" type="Node" parent="Points/AfterSleepSpawn"] - -[node name="MeditationSpawn" type="Node2D" parent="Points"] -position = Vector2(25, -60) - -[node name="Point" type="Node" parent="Points/MeditationSpawn"] - -[node name="NewGameSpawn" type="Node2D" parent="Points"] -position = Vector2(-15, -15) - -[node name="Point" type="Node" parent="Points/NewGameSpawn"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/BlueBed"] -[node name="InElevator" type="Node2D" parent="Points"] -position = Vector2(-192, 76) - -[node name="Point" type="Node" parent="Points/InElevator"] - -[node name="TvtableBack" type="Sprite2D" parent="."] +[node name="TvtableBack" type="Sprite2D" parent="BottomApartment"] position = Vector2(-264, 223) texture = ExtResource("39_h5xtj") -[node name="TvFlatBack" type="Sprite2D" parent="TvtableBack"] +[node name="TvFlatBack" type="Sprite2D" parent="BottomApartment/TvtableBack"] position = Vector2(0, -20) texture = ExtResource("40_wwta0") -[node name="YSort" type="Node2D" parent="TvtableBack"] +[node name="HallwayEntity" type="Node" parent="BottomApartment/TvtableBack/TvFlatBack"] + +[node name="YSort" type="Node2D" parent="BottomApartment/TvtableBack"] position = Vector2(-1, 7) -[node name="TvFlat" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/TvtableBack"] + +[node name="TvFlat" type="Sprite2D" parent="BottomApartment"] position = Vector2(-112, 101) texture = ExtResource("41_lo0xi") -[node name="YSort" type="Node2D" parent="TvFlat"] +[node name="YSort" type="Node2D" parent="BottomApartment/TvFlat"] position = Vector2(-1, 27) -[node name="SofaBlueBack" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/TvFlat"] + +[node name="SofaBlueBack" type="Sprite2D" parent="BottomApartment"] position = Vector2(-112, 169) texture = ExtResource("42_yuajs") -[node name="YSort" type="Node2D" parent="SofaBlueBack"] +[node name="YSort" type="Node2D" parent="BottomApartment/SofaBlueBack"] position = Vector2(-1, 11) -[node name="ChairWood" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/SofaBlueBack"] + +[node name="ChairWood" type="Sprite2D" parent="BottomApartment"] position = Vector2(-4, 178) texture = ExtResource("43_bwyl6") -[node name="YSort" type="Node2D" parent="ChairWood"] +[node name="YSort" type="Node2D" parent="BottomApartment/ChairWood"] position = Vector2(-1, 14) -[node name="ChairWood2" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/ChairWood"] + +[node name="ChairWood2" type="Sprite2D" parent="BottomApartment"] position = Vector2(19, 178) texture = ExtResource("43_bwyl6") -[node name="YSort" type="Node2D" parent="ChairWood2"] +[node name="YSort" type="Node2D" parent="BottomApartment/ChairWood2"] position = Vector2(0, 14) -[node name="TableBig" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/ChairWood2"] + +[node name="TableBig" type="Sprite2D" parent="BottomApartment"] position = Vector2(8, 201) texture = ExtResource("44_m1c6h") -[node name="YSort" type="Node2D" parent="TableBig"] +[node name="YSort" type="Node2D" parent="BottomApartment/TableBig"] position = Vector2(0, 18) -[node name="BoxCardboardSideways" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/TableBig"] + +[node name="BoxCardboardSideways" type="Sprite2D" parent="BottomApartment"] position = Vector2(55, 127) texture = ExtResource("47_jy22a") -[node name="YSort" type="Node2D" parent="BoxCardboardSideways"] +[node name="YSort" type="Node2D" parent="BottomApartment/BoxCardboardSideways"] position = Vector2(1, 10) -[node name="PlateCookies" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/BoxCardboardSideways"] + +[node name="PlateCookies" type="Sprite2D" parent="BottomApartment"] +z_index = -1 position = Vector2(113, 212) texture = ExtResource("48_jgxiy") -[node name="Package" type="Sprite2D" parent="."] +[node name="HallwayEntity" type="Node" parent="BottomApartment/PlateCookies"] + +[node name="Package" type="Sprite2D" parent="BottomApartment"] position = Vector2(106, 141) texture = ExtResource("18_fe7mm") -[node name="YSort" type="Node2D" parent="Package"] +[node name="YSort" type="Node2D" parent="BottomApartment/Package"] position = Vector2(1, 4) +[node name="HallwayEntity" type="Node" parent="BottomApartment/Package"] + +[node name="Points" type="Node2D" parent="."] + +[node name="AfterSleepSpawn" type="Node2D" parent="Points"] +position = Vector2(-144, -58) + +[node name="Point" type="Node" parent="Points/AfterSleepSpawn"] + +[node name="MeditationSpawn" type="Node2D" parent="Points"] +position = Vector2(25, -60) + +[node name="Point" type="Node" parent="Points/MeditationSpawn"] + +[node name="NewGameSpawn" type="Node2D" parent="Points"] +position = Vector2(-15, -15) + +[node name="Point" type="Node" parent="Points/NewGameSpawn"] + +[node name="InElevator" type="Node2D" parent="Points"] +position = Vector2(-192, 76) + +[node name="Point" type="Node" parent="Points/InElevator"] + [node name="FilterYellow" type="Sprite2D" parent="."] visible = false position = Vector2(0, 2) diff --git a/main_game_lib/src/state.rs b/main_game_lib/src/state.rs index 7d12f022..cea9409c 100644 --- a/main_game_lib/src/state.rs +++ b/main_game_lib/src/state.rs @@ -339,3 +339,12 @@ impl WhichTopDownScene { GlobalGameState::LeavingTopDownScene(self) } } + +impl WhichTopDownScene { + /// Returns snake case version of the scene name. + /// We use this name to load scene assets because the name matches names + /// of .ron and .tscn files. + pub fn snake_case(self) -> String { + untools::camel_to_snake(self.as_ref(), false) + } +} diff --git a/main_game_lib/src/top_down.rs b/main_game_lib/src/top_down.rs index 00161d53..b7d2ebb0 100644 --- a/main_game_lib/src/top_down.rs +++ b/main_game_lib/src/top_down.rs @@ -17,13 +17,12 @@ pub mod cameras; pub mod environmental_objects; pub mod inspect_and_interact; pub mod layout; -pub mod scene_configs; use actor::{emit_movement_events, BeginDialogEvent}; pub use actor::{npc, player::Player, Actor, ActorMovementEvent, ActorTarget}; use bevy::prelude::*; pub use inspect_and_interact::{InspectLabel, InspectLabelCategory}; -pub use layout::{TileKind, TileMap}; +pub use layout::{TileKind, TileMap, ZoneTileKind}; use leafwing_input_manager::plugin::InputManagerSystem; use self::inspect_and_interact::ChangeHighlightedInspectLabelEvent; @@ -217,18 +216,19 @@ impl bevy::app::Plugin for Plugin { use bevy_inspector_egui::quick::ResourceInspectorPlugin; use layout::map_maker::TileMapMakerToolbar as Toolbar; - app.register_type::() - .register_type::() - .register_type::() - .register_type::() + app.register_type::() .register_type::() + .register_type::() .register_type::() .register_type::() + .register_type::() + .register_type::() .register_type::() .register_type::() + .register_type::() .register_type::() - .register_type::() - .register_type::(); + .register_type::() + .register_type::(); app.add_plugins( ResourceInspectorPlugin::::new() diff --git a/main_game_lib/src/top_down/layout.rs b/main_game_lib/src/top_down/layout.rs index faa96ccf..a7c016e8 100644 --- a/main_game_lib/src/top_down/layout.rs +++ b/main_game_lib/src/top_down/layout.rs @@ -22,8 +22,6 @@ use serde::{Deserialize, Serialize}; use smallvec::SmallVec; use strum::IntoEnumIterator; -use super::scene_configs::ZoneTileKind; - /// Each scene adheres to the same layout definition. /// That's because the amount of space the character takes in the tile grid /// is constant and tailored to the square size. @@ -123,6 +121,70 @@ pub enum TileKind { Zone(ZoneTileKind), } +/// Named zones in the .ron files that are used in particular's scene logic to +/// achieve some behavior specific to that scene. +/// The zones can be re-used in multiple scenes. +#[derive( + Clone, + Copy, + Debug, + Default, + Deserialize, + Eq, + Hash, + Ord, + PartialEq, + PartialOrd, + Reflect, + Serialize, + strum::Display, + strum::EnumIter, + strum::EnumString, +)] +#[reflect(Default)] +#[allow(missing_docs)] +pub enum ZoneTileKind { + /// Arbitrarily the default value. + #[default] + Exit, + + Aisle1, + Aisle2, + Aisle3, + Aisle4, + + /// In interior scenes there might be multiple apartments. + /// This represents a second apartment in such scenes. + Apartment2, + Apartment2BathroomDoor, + Apartment2Door, + + BasementDoor, + Bed, + Building1Entrance, + ClinicEntrance, + ClinicWardEntrance, + CompoundEntrance, + Door, + Elevator, + Fridges, + FruitsAndVeggies, + GoodWater, + GoToDowntown, + Hallway, + MallEntrance, + Meditation, + PlantShopEntrance, + PlayerApartment, + PlayerDoor, + SewersEntrance, + Tea, + TowerEntrance, + TwinpeaksApartmentEntrance, + UpperApartmentDoor, + UpperApartmentWallHidden, +} + /// Useful for pathfinding to prefer some tiles over others. #[derive(Default, PartialEq, Eq, PartialOrd, Ord, Debug)] pub enum TileWalkCost { diff --git a/main_game_lib/src/top_down/scene_configs.rs b/main_game_lib/src/top_down/scene_configs.rs deleted file mode 100644 index 7e440829..00000000 --- a/main_game_lib/src/top_down/scene_configs.rs +++ /dev/null @@ -1,69 +0,0 @@ -//! Some per scene configurations for the top-down game that are useful to have -//! tightly coupled with the top down crate. - -use bevy::reflect::Reflect; -use serde::{Deserialize, Serialize}; - -use crate::WhichTopDownScene; - -impl WhichTopDownScene { - /// Returns snake case version of the scene name. - pub fn snake_case(self) -> String { - untools::camel_to_snake(self.as_ref(), false) - } -} - -/// TODO: clean up -#[derive( - Clone, - Copy, - Debug, - Deserialize, - Eq, - Hash, - Ord, - PartialEq, - PartialOrd, - Reflect, - Serialize, - strum::Display, - strum::EnumIter, - strum::EnumString, -)] -#[allow(missing_docs)] -pub enum ZoneTileKind { - Aisle1, - Aisle2, - Aisle3, - Aisle4, - BasementDoor, - Bed, - BottomLeftApartmentBathroomDoor, - BottomLeftApartmentDoor, - BottomLeftApartment, - BottomRightApartmentDoor, - BottomRightApartment, - Building1Entrance, - ClinicEntrance, - ClinicWardEntrance, - CompoundEntrance, - Door, - Elevator, - TowerEntrance, - Exit, - Fridges, - FruitsAndVeggies, - GoodWater, - GoToDowntown, - Hallway, - MallEntrance, - Meditation, - PlantShopEntrance, - PlayerApartment, - PlayerDoor, - SewersEntrance, - Tea, - TwinpeaksApartmentEntrance, - UpperApartmentDoor, - UpperApartmentWallHidden, -} diff --git a/scenes/top_down/src/building1_basement2.rs b/scenes/top_down/src/building1_basement2.rs index 64429639..83bcad10 100644 --- a/scenes/top_down/src/building1_basement2.rs +++ b/scenes/top_down/src/building1_basement2.rs @@ -3,9 +3,7 @@ use common_visuals::camera::render_layer; use main_game_lib::{ common_ext::QueryExt, cutscene::{enter_dark_door::EnterDarkDoor, in_cutscene, IntoCutscene}, - top_down::scene_configs::ZoneTileKind, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/building1_player_floor.rs b/scenes/top_down/src/building1_player_floor.rs index d7467c4d..3022e50f 100644 --- a/scenes/top_down/src/building1_player_floor.rs +++ b/scenes/top_down/src/building1_player_floor.rs @@ -21,11 +21,9 @@ use main_game_lib::{ ChangeHighlightedInspectLabelEventConsumer, SpawnLabelBgAndTextParams, LIGHT_RED, }, - scene_configs::ZoneTileKind, ActorMovementEvent, }, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{ self, movement_event_emitted, CharacterBundleBuilder, CharacterExt, @@ -256,23 +254,14 @@ impl<'a> TscnSpawner for Spawner<'a> { .build_and_insert_obstacle(self.tilemap); cmd.entity(who).insert(door); } - "BottomLeftApartmentDoor" => { + "Apartment2Door" => { cmd.entity(who).insert( - DoorBuilder::new(ZoneTileKind::BottomLeftApartmentDoor) - .build(), - ); - } - "BottomLeftApartmentBathroomDoor" => { - cmd.entity(who).insert( - DoorBuilder::new( - ZoneTileKind::BottomLeftApartmentBathroomDoor, - ) - .build(), + DoorBuilder::new(ZoneTileKind::Apartment2Door).build(), ); } - "BottomRightApartmentDoor" => { + "Apartment2BathroomDoor" => { cmd.entity(who).insert( - DoorBuilder::new(ZoneTileKind::BottomRightApartmentDoor) + DoorBuilder::new(ZoneTileKind::Apartment2BathroomDoor) .build(), ); } diff --git a/scenes/top_down/src/building1_player_floor/watch_entry_to_hallway.rs b/scenes/top_down/src/building1_player_floor/watch_entry_to_hallway.rs index b3ba096c..fd063454 100644 --- a/scenes/top_down/src/building1_player_floor/watch_entry_to_hallway.rs +++ b/scenes/top_down/src/building1_player_floor/watch_entry_to_hallway.rs @@ -1,7 +1,7 @@ use common_visuals::BeginInterpolationEvent; use main_game_lib::{ common_ext::QueryExt, - top_down::{actor::Who, scene_configs::ZoneTileKind, TileKind}, + top_down::{actor::Who, TileKind}, }; use top_down::{Actor, ActorMovementEvent, TileMap}; @@ -40,10 +40,7 @@ pub(super) fn system( Who { is_player: true, .. }, - zone: - TileKind::Zone( - Hallway | BottomLeftApartment | BottomRightApartment, - ), + zone: TileKind::Zone(Hallway | Apartment2), } => { on_player_entered_hallway(&mut lerp_event, &hallway_entities); } @@ -52,10 +49,7 @@ pub(super) fn system( Who { is_player: true, .. }, - zone: - TileKind::Zone( - Hallway | BottomLeftApartment | BottomRightApartment, - ), + zone: TileKind::Zone(Hallway | Apartment2), } => { on_player_left_hallway(&mut lerp_event, &hallway_entities); } @@ -66,10 +60,7 @@ pub(super) fn system( entity, .. }, - zone: - TileKind::Zone( - Hallway | BottomLeftApartment | BottomRightApartment, - ), + zone: TileKind::Zone(Hallway | Apartment2), } => { on_npc_entered_hallway( &tilemap, @@ -86,10 +77,7 @@ pub(super) fn system( entity, .. }, - zone: - TileKind::Zone( - Hallway | BottomLeftApartment | BottomRightApartment, - ), + zone: TileKind::Zone(Hallway | Apartment2), } => { on_npc_left_hallway(&mut cmd, &mut lerp_event, *entity); } diff --git a/scenes/top_down/src/clinic.rs b/scenes/top_down/src/clinic.rs index 31185459..b442e97b 100644 --- a/scenes/top_down/src/clinic.rs +++ b/scenes/top_down/src/clinic.rs @@ -1,12 +1,9 @@ use bevy::render::view::RenderLayers; use common_visuals::camera::render_layer; use main_game_lib::{ - cutscene::in_cutscene, - hud::notification::NotificationFifo, + cutscene::in_cutscene, hud::notification::NotificationFifo, player_stats::PlayerStats, - top_down::{ - environmental_objects::door::DoorBuilder, scene_configs::ZoneTileKind, - }, + top_down::environmental_objects::door::DoorBuilder, }; use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ diff --git a/scenes/top_down/src/clinic_ward.rs b/scenes/top_down/src/clinic_ward.rs index 67ea3179..f4ca6bbb 100644 --- a/scenes/top_down/src/clinic_ward.rs +++ b/scenes/top_down/src/clinic_ward.rs @@ -2,9 +2,8 @@ use bevy::render::view::RenderLayers; use common_visuals::camera::render_layer; use main_game_lib::{ cutscene::in_cutscene, hud::notification::NotificationFifo, - player_stats::PlayerStats, top_down::scene_configs::ZoneTileKind, + player_stats::PlayerStats, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/compound.rs b/scenes/top_down/src/compound.rs index f6a5d8fc..b70d6c07 100644 --- a/scenes/top_down/src/compound.rs +++ b/scenes/top_down/src/compound.rs @@ -6,9 +6,8 @@ use main_game_lib::{ cutscene::in_cutscene, hud::{daybar::UpdateDayBarEvent, notification::NotificationFifo}, player_stats::PlayerStats, - top_down::{layout::LAYOUT, scene_configs::ZoneTileKind}, + top_down::layout::LAYOUT, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/compound_tower.rs b/scenes/top_down/src/compound_tower.rs index bf7e7f6a..99ea9480 100644 --- a/scenes/top_down/src/compound_tower.rs +++ b/scenes/top_down/src/compound_tower.rs @@ -2,9 +2,8 @@ use bevy::render::view::RenderLayers; use common_visuals::camera::render_layer; use main_game_lib::{ cutscene::in_cutscene, hud::notification::NotificationFifo, - player_stats::PlayerStats, top_down::scene_configs::ZoneTileKind, + player_stats::PlayerStats, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/downtown.rs b/scenes/top_down/src/downtown.rs index 6a10cdfd..0c4e42b0 100644 --- a/scenes/top_down/src/downtown.rs +++ b/scenes/top_down/src/downtown.rs @@ -16,10 +16,8 @@ use main_game_lib::{ SpawnLabelBgAndTextParams, ZoneToInspectLabelEntity, LIGHT_RED, }, npc::behaviors::PatrolSequence, - scene_configs::ZoneTileKind, }, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, layout::LAYOUT, diff --git a/scenes/top_down/src/mall.rs b/scenes/top_down/src/mall.rs index fea67038..736271ef 100644 --- a/scenes/top_down/src/mall.rs +++ b/scenes/top_down/src/mall.rs @@ -7,12 +7,10 @@ use main_game_lib::{ hud::notification::NotificationFifo, player_stats::PlayerStats, top_down::{ - actor::BeginDialogEvent, layout::LAYOUT, - npc::behaviors::PatrolSequence, scene_configs::ZoneTileKind, + actor::BeginDialogEvent, layout::LAYOUT, npc::behaviors::PatrolSequence, }, }; use rand::prelude::SliceRandom; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/plant_shop.rs b/scenes/top_down/src/plant_shop.rs index 4ed39b15..92b84dec 100644 --- a/scenes/top_down/src/plant_shop.rs +++ b/scenes/top_down/src/plant_shop.rs @@ -2,9 +2,8 @@ use bevy::render::view::RenderLayers; use common_visuals::camera::render_layer; use main_game_lib::{ cutscene::in_cutscene, hud::notification::NotificationFifo, - player_stats::PlayerStats, top_down::scene_configs::ZoneTileKind, + player_stats::PlayerStats, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/prelude.rs b/scenes/top_down/src/prelude.rs index 8de0a68d..b5bd1504 100644 --- a/scenes/top_down/src/prelude.rs +++ b/scenes/top_down/src/prelude.rs @@ -9,8 +9,7 @@ pub(crate) use main_game_lib::{ prelude::*, top_down::{ actor::{self, movement_event_emitted, player::TakeAwayPlayerControl}, - scene_configs::ZoneTileKind, - TileKind, + TileKind, ZoneTileKind, }, }; pub(crate) use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; diff --git a/scenes/top_down/src/sewers.rs b/scenes/top_down/src/sewers.rs index 39a4cb11..e0b96905 100644 --- a/scenes/top_down/src/sewers.rs +++ b/scenes/top_down/src/sewers.rs @@ -2,9 +2,8 @@ use bevy::render::view::RenderLayers; use common_visuals::camera::render_layer; use main_game_lib::{ cutscene::in_cutscene, hud::notification::NotificationFifo, - player_stats::PlayerStats, top_down::scene_configs::ZoneTileKind, + player_stats::PlayerStats, }; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/scenes/top_down/src/twinpeaks_apartment.rs b/scenes/top_down/src/twinpeaks_apartment.rs index e3b863ad..76103800 100644 --- a/scenes/top_down/src/twinpeaks_apartment.rs +++ b/scenes/top_down/src/twinpeaks_apartment.rs @@ -1,10 +1,7 @@ use bevy::render::view::RenderLayers; use common_loading_screen::{LoadingScreenSettings, LoadingScreenState}; use common_visuals::camera::render_layer; -use main_game_lib::{ - cutscene::in_cutscene, top_down::scene_configs::ZoneTileKind, -}; -use rscn::{NodeName, TscnSpawner, TscnTree, TscnTreeHandle}; +use main_game_lib::cutscene::in_cutscene; use top_down::{ actor::{CharacterBundleBuilder, CharacterExt}, inspect_and_interact::ZoneToInspectLabelEntity, diff --git a/wiki/src/assets/scene-tile-graphs/building1_player_floor.svg b/wiki/src/assets/scene-tile-graphs/building1_player_floor.svg index 584deb7b..16bcda7f 100644 --- a/wiki/src/assets/scene-tile-graphs/building1_player_floor.svg +++ b/wiki/src/assets/scene-tile-graphs/building1_player_floor.svg @@ -4,200 +4,156 @@ - - + + graph_building1_player_floor - + -cluster_bottomleftapartment - +cluster_apartment2 + cluster_hallway - + cluster_playerapartment - + - + -bed - -bed +apartment2 + +apartment2 - + -bottomleftapartmentbathroomdoor - -bottomleftapartmentbathroomdoor +apartment2bathroomdoor + +apartment2bathroomdoor - - -bottomleftapartmentdoor - -bottomleftapartmentdoor + + +apartment2->apartment2bathroomdoor + + - - -bottomleftapartment - -bottomleftapartment + + +apartment2door + +apartment2door - + -bottomleftapartmentdoor->bottomleftapartment - - - +apartment2->apartment2door + + + - + hallway - -hallway + +hallway - + + +apartment2->hallway + + + + + + + -bottomleftapartmentdoor->hallway - - - +apartment2door->hallway + + + - - -bottomleftapartment->bottomleftapartmentbathroomdoor - - - - - -bottomrightapartment - -bottomrightapartment - - - -bottomleftapartment->bottomrightapartment - - - - - - - - -bottomleftapartment->hallway - - - - - - - - -bottomrightapartmentdoor - -bottomrightapartmentdoor - - - -bottomrightapartmentdoor->bottomrightapartment - - - - - - -bottomrightapartmentdoor->hallway - - - - - - -bottomrightapartment->hallway - - - - - + + +bed + +bed - + elevator - -elevator + +elevator hallway->elevator - - + + - + playerapartment - -playerapartment + +playerapartment - + hallway->playerapartment - - - + + + - + playerdoor - -playerdoor + +playerdoor - + hallway->playerdoor - - - + + + - + meditation - -meditation + +meditation playerapartment->bed - - + + playerapartment->meditation - - + + - + playerapartment->playerdoor - - - + + + - + tea - -tea + +tea playerapartment->tea - - + +