diff --git a/main_game/assets/audio/doorFFX.oga b/main_game/assets/audio/doorFFX.oga new file mode 100644 index 00000000..28600959 Binary files /dev/null and b/main_game/assets/audio/doorFFX.oga differ diff --git a/main_game/assets/audio/dramaticFFX.oga b/main_game/assets/audio/dramaticFFX.oga new file mode 100644 index 00000000..d2580085 Binary files /dev/null and b/main_game/assets/audio/dramaticFFX.oga differ diff --git a/main_game/assets/audio/elevator2FFX.oga b/main_game/assets/audio/elevator2FFX.oga new file mode 100644 index 00000000..3ca7e62e Binary files /dev/null and b/main_game/assets/audio/elevator2FFX.oga differ diff --git a/main_game/assets/audio/elevatorFFX.oga b/main_game/assets/audio/elevatorFFX.oga new file mode 100644 index 00000000..946ba123 Binary files /dev/null and b/main_game/assets/audio/elevatorFFX.oga differ diff --git a/main_game/assets/audio/failFFX.oga b/main_game/assets/audio/failFFX.oga new file mode 100644 index 00000000..7950b7c1 Binary files /dev/null and b/main_game/assets/audio/failFFX.oga differ diff --git a/main_game/assets/audio/ghostFFX.oga b/main_game/assets/audio/ghostFFX.oga new file mode 100644 index 00000000..ce180203 Binary files /dev/null and b/main_game/assets/audio/ghostFFX.oga differ diff --git a/main_game/assets/audio/oceanFFX.oga b/main_game/assets/audio/oceanFFX.oga new file mode 100644 index 00000000..4427be81 Binary files /dev/null and b/main_game/assets/audio/oceanFFX.oga differ diff --git a/main_game/assets/audio/sad_echo.oga b/main_game/assets/audio/sad_echo.oga new file mode 100644 index 00000000..a0122f9e Binary files /dev/null and b/main_game/assets/audio/sad_echo.oga differ diff --git a/main_game/assets/audio/shortmelody.oga b/main_game/assets/audio/shortmelody.oga new file mode 100644 index 00000000..ea1a433b Binary files /dev/null and b/main_game/assets/audio/shortmelody.oga differ diff --git a/main_game/assets/audio/tvFFX.oga b/main_game/assets/audio/tvFFX.oga new file mode 100644 index 00000000..a27adb4a Binary files /dev/null and b/main_game/assets/audio/tvFFX.oga differ diff --git a/main_game/assets/audio/walk_crunchyFFX.oga b/main_game/assets/audio/walk_crunchyFFX.oga new file mode 100644 index 00000000..872f9fce Binary files /dev/null and b/main_game/assets/audio/walk_crunchyFFX.oga differ diff --git a/main_game/assets/audio/walk_snowFFX.oga b/main_game/assets/audio/walk_snowFFX.oga new file mode 100644 index 00000000..55a74110 Binary files /dev/null and b/main_game/assets/audio/walk_snowFFX.oga differ diff --git a/main_game/assets/audio/xylophoneFFX.oga b/main_game/assets/audio/xylophoneFFX.oga new file mode 100644 index 00000000..f1e14be1 Binary files /dev/null and b/main_game/assets/audio/xylophoneFFX.oga differ diff --git a/main_game/assets/compound/barn_interior.png b/main_game/assets/compound/barn_interior.png new file mode 100644 index 00000000..3bbc5a25 Binary files /dev/null and b/main_game/assets/compound/barn_interior.png differ diff --git a/main_game/assets/compound/barn_interior2.png b/main_game/assets/compound/barn_interior2.png new file mode 100644 index 00000000..a10e9461 Binary files /dev/null and b/main_game/assets/compound/barn_interior2.png differ diff --git a/main_game/assets/compound/clothing_line.png b/main_game/assets/compound/clothing_line.png new file mode 100644 index 00000000..bcf88a0b Binary files /dev/null and b/main_game/assets/compound/clothing_line.png differ diff --git a/main_game/assets/compound/greenhouse_white.png b/main_game/assets/compound/greenhouse_white.png new file mode 100644 index 00000000..cab0c485 Binary files /dev/null and b/main_game/assets/compound/greenhouse_white.png differ diff --git a/main_game/assets/downtown/hanging_plants3.png b/main_game/assets/downtown/hanging_plants3.png index 4218126c..8620ed07 100644 Binary files a/main_game/assets/downtown/hanging_plants3.png and b/main_game/assets/downtown/hanging_plants3.png differ diff --git a/main_game/assets/downtown/hanging_plants4.png b/main_game/assets/downtown/hanging_plants4.png index 13a623d2..a6e9ce30 100644 Binary files a/main_game/assets/downtown/hanging_plants4.png and b/main_game/assets/downtown/hanging_plants4.png differ diff --git a/main_game/assets/downtown/house_big.png b/main_game/assets/downtown/house_big.png index aa1ec8dc..753679b2 100644 Binary files a/main_game/assets/downtown/house_big.png and b/main_game/assets/downtown/house_big.png differ diff --git a/main_game/assets/downtown/plain_trio.png b/main_game/assets/downtown/plain_trio.png index 25aa4815..0058a508 100644 Binary files a/main_game/assets/downtown/plain_trio.png and b/main_game/assets/downtown/plain_trio.png differ diff --git a/main_game/assets/downtown/tree.png b/main_game/assets/downtown/tree.png index 539cfb73..dd58c5ea 100644 Binary files a/main_game/assets/downtown/tree.png and b/main_game/assets/downtown/tree.png differ diff --git a/main_game/assets/environment/flipflops.png b/main_game/assets/environment/flipflops.png new file mode 100644 index 00000000..8913e86a Binary files /dev/null and b/main_game/assets/environment/flipflops.png differ diff --git a/main_game/assets/environment/sand_castle_atlas.png b/main_game/assets/environment/sand_castle_atlas.png new file mode 100644 index 00000000..cec70367 Binary files /dev/null and b/main_game/assets/environment/sand_castle_atlas.png differ diff --git a/main_game/assets/fonts/tiny_pixel.ttf b/main_game/assets/fonts/tiny_pixel.ttf index a27a65ac..8a2c52e9 100644 Binary files a/main_game/assets/fonts/tiny_pixel.ttf and b/main_game/assets/fonts/tiny_pixel.ttf differ diff --git a/main_game/assets/maps/mall.ron b/main_game/assets/maps/mall.ron index 4b259c73..ce692add 100644 --- a/main_game/assets/maps/mall.ron +++ b/main_game/assets/maps/mall.ron @@ -1,32 +1,5 @@ ( squares: { - (x: -93, y: -39): [Wall], - (x: -92, y: -39): [Wall], - (x: -91, y: -39): [Wall], - (x: -91, y: -38): [Wall], - (x: -91, y: -37): [Wall], - (x: -91, y: -36): [Wall], - (x: -91, y: -35): [Wall], - (x: -91, y: -34): [Wall], - (x: -91, y: -33): [Wall], - (x: -91, y: -32): [Wall], - (x: -91, y: -31): [Wall], - (x: -91, y: -30): [Wall], - (x: -91, y: -29): [Wall], - (x: -91, y: -28): [Wall], - (x: -91, y: -27): [Wall], - (x: -91, y: -26): [Wall], - (x: -91, y: -25): [Wall], - (x: -91, y: -24): [Wall], - (x: -91, y: -23): [Wall], - (x: -91, y: -22): [Wall], - (x: -91, y: -21): [Wall], - (x: -91, y: -20): [Wall], - (x: -91, y: -19): [Wall], - (x: -91, y: -18): [Wall], - (x: -91, y: -17): [Wall], - (x: -91, y: -16): [Wall], - (x: -91, y: -15): [Wall], (x: -91, y: -14): [Wall], (x: -91, y: -13): [Wall], (x: -91, y: -12): [Wall], @@ -36,21 +9,6 @@ (x: -91, y: -8): [Wall], (x: -91, y: -7): [Wall], (x: -91, y: -6): [Wall], - (x: -91, y: -5): [Wall], - (x: -91, y: -4): [Wall], - (x: -91, y: -3): [Wall], - (x: -91, y: -2): [Wall], - (x: -91, y: -1): [Wall], - (x: -91, y: 0): [Wall], - (x: -91, y: 1): [Wall], - (x: -91, y: 2): [Wall], - (x: -91, y: 3): [Wall], - (x: -91, y: 4): [Wall], - (x: -91, y: 5): [Wall], - (x: -91, y: 6): [Wall], - (x: -91, y: 7): [Wall], - (x: -91, y: 8): [Wall], - (x: -91, y: 9): [Wall], (x: -91, y: 10): [Wall], (x: -91, y: 11): [Wall], (x: -91, y: 12): [Wall], @@ -70,539 +28,48 @@ (x: -91, y: 26): [Wall], (x: -91, y: 27): [Wall], (x: -91, y: 28): [Wall], - (x: -90, y: -39): [Wall], - (x: -90, y: -22): [Wall], - (x: -90, y: -21): [Wall], - (x: -90, y: -19): [Wall], - (x: -90, y: -17): [Wall], - (x: -90, y: -16): [Wall], - (x: -90, y: 23): [Wall], - (x: -90, y: 24): [Wall], (x: -90, y: 28): [Wall], - (x: -89, y: -39): [Wall], - (x: -89, y: -22): [Wall], - (x: -89, y: -21): [Wall], - (x: -89, y: -19): [Wall], - (x: -89, y: -17): [Wall], - (x: -89, y: -16): [Wall], - (x: -89, y: -3): [Wall], - (x: -89, y: -2): [Wall], - (x: -89, y: -1): [Wall], - (x: -89, y: 0): [Wall], - (x: -89, y: 1): [Wall], - (x: -89, y: 2): [Wall], - (x: -89, y: 3): [Wall], - (x: -89, y: 4): [Wall], - (x: -89, y: 5): [Wall], - (x: -89, y: 6): [Wall], - (x: -89, y: 23): [Wall], - (x: -89, y: 24): [Wall], (x: -89, y: 28): [Wall], - (x: -88, y: -39): [Wall], - (x: -88, y: -22): [Wall], - (x: -88, y: -21): [Wall], - (x: -88, y: -19): [Wall], - (x: -88, y: -17): [Wall], - (x: -88, y: -16): [Wall], - (x: -88, y: -3): [Wall], - (x: -88, y: -2): [Wall], - (x: -88, y: -1): [Wall], - (x: -88, y: 0): [Wall], - (x: -88, y: 1): [Wall], - (x: -88, y: 2): [Wall], - (x: -88, y: 3): [Wall], - (x: -88, y: 4): [Wall], - (x: -88, y: 5): [Wall], - (x: -88, y: 6): [Wall], - (x: -88, y: 23): [Wall], - (x: -88, y: 24): [Wall], (x: -88, y: 28): [Wall], - (x: -87, y: -39): [Wall], - (x: -87, y: -22): [Wall], - (x: -87, y: -21): [Wall], - (x: -87, y: -19): [Wall], - (x: -87, y: -17): [Wall], - (x: -87, y: -16): [Wall], - (x: -87, y: -3): [Wall], - (x: -87, y: -2): [Wall], - (x: -87, y: -1): [Wall], - (x: -87, y: 0): [Wall], - (x: -87, y: 1): [Wall], - (x: -87, y: 2): [Wall], - (x: -87, y: 3): [Wall], - (x: -87, y: 4): [Wall], - (x: -87, y: 5): [Wall], - (x: -87, y: 6): [Wall], - (x: -87, y: 23): [Wall], - (x: -87, y: 24): [Wall], (x: -87, y: 28): [Wall], - (x: -86, y: -39): [Wall], - (x: -86, y: -23): [Wall], - (x: -86, y: -22): [Wall], - (x: -86, y: -21): [Wall], - (x: -86, y: -19): [Wall], - (x: -86, y: -17): [Wall], - (x: -86, y: -16): [Wall], - (x: -86, y: -3): [Wall], - (x: -86, y: -2): [Wall], - (x: -86, y: -1): [Wall], - (x: -86, y: 0): [Wall], - (x: -86, y: 1): [Wall], - (x: -86, y: 2): [Wall], - (x: -86, y: 3): [Wall], - (x: -86, y: 4): [Wall], - (x: -86, y: 5): [Wall], - (x: -86, y: 6): [Wall], - (x: -86, y: 23): [Wall], - (x: -86, y: 24): [Wall], (x: -86, y: 28): [Wall], - (x: -85, y: -39): [Wall], - (x: -85, y: -24): [Wall], - (x: -85, y: -23): [Wall], - (x: -85, y: -22): [Wall], - (x: -85, y: -21): [Wall], - (x: -85, y: -19): [Wall], - (x: -85, y: -17): [Wall], - (x: -85, y: -16): [Wall], - (x: -85, y: -3): [Wall], - (x: -85, y: -2): [Wall], - (x: -85, y: -1): [Wall], - (x: -85, y: 0): [Wall], - (x: -85, y: 1): [Wall], - (x: -85, y: 2): [Wall], - (x: -85, y: 3): [Wall], - (x: -85, y: 4): [Wall], - (x: -85, y: 5): [Wall], - (x: -85, y: 6): [Wall], - (x: -85, y: 23): [Wall], - (x: -85, y: 24): [Wall], (x: -85, y: 28): [Wall], - (x: -84, y: -39): [Wall], - (x: -84, y: -25): [Wall], - (x: -84, y: -24): [Wall], - (x: -84, y: -23): [Wall], - (x: -84, y: -21): [Wall], - (x: -84, y: -19): [Wall], - (x: -84, y: -17): [Wall], - (x: -84, y: -16): [Wall], - (x: -84, y: -3): [Wall], - (x: -84, y: -2): [Wall], - (x: -84, y: -1): [Wall], - (x: -84, y: 0): [Wall], - (x: -84, y: 1): [Wall], - (x: -84, y: 2): [Wall], - (x: -84, y: 3): [Wall], - (x: -84, y: 4): [Wall], - (x: -84, y: 5): [Wall], - (x: -84, y: 6): [Wall], - (x: -84, y: 23): [Wall], - (x: -84, y: 24): [Wall], (x: -84, y: 28): [Wall], - (x: -83, y: -39): [Wall], - (x: -83, y: -38): [Wall], - (x: -83, y: -37): [Wall], - (x: -83, y: -36): [Wall], - (x: -83, y: -35): [Wall], - (x: -83, y: -34): [Wall], - (x: -83, y: -33): [Wall], - (x: -83, y: -32): [Wall], - (x: -83, y: -31): [Wall], - (x: -83, y: -30): [Wall], - (x: -83, y: -29): [Wall], - (x: -83, y: -28): [Wall], - (x: -83, y: -27): [Wall], - (x: -83, y: -26): [Wall], - (x: -83, y: -25): [Wall], - (x: -83, y: -24): [Wall], - (x: -83, y: -23): [Wall], - (x: -83, y: -22): [Wall], - (x: -83, y: -21): [Wall], - (x: -83, y: -19): [Wall], - (x: -83, y: -17): [Wall], - (x: -83, y: -16): [Wall], - (x: -83, y: -3): [Wall], - (x: -83, y: -2): [Wall], - (x: -83, y: -1): [Wall], - (x: -83, y: 0): [Wall], - (x: -83, y: 1): [Wall], - (x: -83, y: 2): [Wall], - (x: -83, y: 3): [Wall], - (x: -83, y: 4): [Wall], - (x: -83, y: 5): [Wall], - (x: -83, y: 6): [Wall], - (x: -83, y: 23): [Wall], - (x: -83, y: 24): [Wall], - (x: -83, y: 25): [Wall], - (x: -83, y: 26): [Wall], - (x: -83, y: 27): [Wall], (x: -83, y: 28): [Wall], - (x: -82, y: -39): [Wall], - (x: -82, y: -26): [Wall], - (x: -82, y: -25): [Wall], - (x: -82, y: -24): [Wall], - (x: -82, y: -23): [Wall], - (x: -82, y: -22): [Wall], - (x: -82, y: -21): [Wall], - (x: -82, y: -19): [Wall], - (x: -82, y: -17): [Wall], - (x: -82, y: -16): [Wall], - (x: -82, y: -3): [Wall], - (x: -82, y: -2): [Wall], - (x: -82, y: -1): [Wall], - (x: -82, y: 0): [Wall], - (x: -82, y: 1): [Wall], - (x: -82, y: 2): [Wall], - (x: -82, y: 3): [Wall], - (x: -82, y: 4): [Wall], - (x: -82, y: 5): [Wall], - (x: -82, y: 6): [Wall], (x: -82, y: 28): [Wall], - (x: -81, y: -39): [Wall], - (x: -81, y: -25): [Wall], - (x: -81, y: -24): [Wall], - (x: -81, y: -23): [Wall], - (x: -81, y: -22): [Wall], - (x: -81, y: -21): [Wall], - (x: -81, y: -19): [Wall], - (x: -81, y: -17): [Wall], - (x: -81, y: -16): [Wall], - (x: -81, y: -3): [Wall], - (x: -81, y: -2): [Wall], - (x: -81, y: -1): [Wall], - (x: -81, y: 0): [Wall], - (x: -81, y: 1): [Wall], - (x: -81, y: 2): [Wall], - (x: -81, y: 3): [Wall], - (x: -81, y: 4): [Wall], - (x: -81, y: 5): [Wall], - (x: -81, y: 6): [Wall], - (x: -81, y: 16): [Wall], - (x: -81, y: 17): [Wall], - (x: -81, y: 18): [Wall], - (x: -81, y: 19): [Wall], - (x: -81, y: 20): [Wall], (x: -81, y: 28): [Wall], - (x: -80, y: -39): [Wall], - (x: -80, y: -25): [Wall], - (x: -80, y: -24): [Wall], - (x: -80, y: -23): [Wall], - (x: -80, y: -22): [Wall], - (x: -80, y: -21): [Wall], - (x: -80, y: -19): [Wall], - (x: -80, y: -17): [Wall], - (x: -80, y: -16): [Wall], - (x: -80, y: -3): [Wall], - (x: -80, y: -2): [Wall], - (x: -80, y: -1): [Wall], - (x: -80, y: 0): [Wall], - (x: -80, y: 1): [Wall], - (x: -80, y: 2): [Wall], - (x: -80, y: 3): [Wall], - (x: -80, y: 4): [Wall], - (x: -80, y: 5): [Wall], - (x: -80, y: 6): [Wall], - (x: -80, y: 16): [Wall], - (x: -80, y: 17): [Wall], - (x: -80, y: 18): [Wall], - (x: -80, y: 19): [Wall], - (x: -80, y: 20): [Wall], (x: -80, y: 28): [Wall], - (x: -79, y: -39): [Wall], - (x: -79, y: -25): [Wall], - (x: -79, y: -24): [Wall], - (x: -79, y: -23): [Wall], - (x: -79, y: -22): [Wall], - (x: -79, y: -21): [Wall], - (x: -79, y: -19): [Wall], - (x: -79, y: -17): [Wall], - (x: -79, y: -16): [Wall], - (x: -79, y: -3): [Wall], - (x: -79, y: -2): [Wall], - (x: -79, y: -1): [Wall], - (x: -79, y: 0): [Wall], - (x: -79, y: 1): [Wall], - (x: -79, y: 2): [Wall], - (x: -79, y: 3): [Wall], - (x: -79, y: 4): [Wall], - (x: -79, y: 5): [Wall], - (x: -79, y: 6): [Wall], - (x: -79, y: 16): [Wall], - (x: -79, y: 17): [Wall], - (x: -79, y: 18): [Wall], - (x: -79, y: 19): [Wall], - (x: -79, y: 20): [Wall], (x: -79, y: 28): [Wall], - (x: -78, y: -39): [Wall], - (x: -78, y: -25): [Wall], - (x: -78, y: -24): [Wall], - (x: -78, y: -23): [Wall], - (x: -78, y: -22): [Wall], - (x: -78, y: -21): [Wall], - (x: -78, y: -19): [Wall], - (x: -78, y: -17): [Wall], - (x: -78, y: -16): [Wall], - (x: -78, y: 16): [Wall], - (x: -78, y: 17): [Wall], - (x: -78, y: 18): [Wall], - (x: -78, y: 19): [Wall], - (x: -78, y: 20): [Wall], (x: -78, y: 28): [Wall], - (x: -77, y: -39): [Wall], - (x: -77, y: -25): [Wall], - (x: -77, y: -24): [Wall], - (x: -77, y: -23): [Wall], - (x: -77, y: -22): [Wall], - (x: -77, y: -21): [Wall], - (x: -77, y: -19): [Wall], - (x: -77, y: -17): [Wall], - (x: -77, y: -16): [Wall], - (x: -77, y: 16): [Wall], - (x: -77, y: 17): [Wall], - (x: -77, y: 18): [Wall], - (x: -77, y: 19): [Wall], - (x: -77, y: 20): [Wall], (x: -77, y: 28): [Wall], - (x: -76, y: -39): [Wall], - (x: -76, y: -25): [Wall], - (x: -76, y: -24): [Wall], - (x: -76, y: -21): [Wall], - (x: -76, y: -19): [Wall], - (x: -76, y: -17): [Wall], - (x: -76, y: -16): [Wall], - (x: -76, y: 16): [Wall], - (x: -76, y: 17): [Wall], - (x: -76, y: 18): [Wall], - (x: -76, y: 19): [Wall], - (x: -76, y: 20): [Wall], (x: -76, y: 28): [Wall], - (x: -75, y: -39): [Wall], - (x: -75, y: -25): [Wall], - (x: -75, y: -24): [Wall], - (x: -75, y: -23): [Wall], - (x: -75, y: -22): [Wall], - (x: -75, y: -21): [Wall], - (x: -75, y: -20): [Wall], - (x: -75, y: -19): [Wall], - (x: -75, y: -17): [Wall], - (x: -75, y: -16): [Wall], - (x: -75, y: 16): [Wall], - (x: -75, y: 17): [Wall], - (x: -75, y: 18): [Wall], - (x: -75, y: 19): [Wall], - (x: -75, y: 20): [Wall], (x: -75, y: 28): [Wall], - (x: -74, y: -39): [Wall], - (x: -74, y: -25): [Wall], - (x: -74, y: -24): [Wall], - (x: -74, y: -23): [Wall], - (x: -74, y: -22): [Wall], - (x: -74, y: -21): [Wall], - (x: -74, y: -20): [Wall], - (x: -74, y: -17): [Wall], - (x: -74, y: 16): [Wall], - (x: -74, y: 17): [Wall], - (x: -74, y: 18): [Wall], - (x: -74, y: 19): [Wall], - (x: -74, y: 20): [Wall], (x: -74, y: 28): [Wall], - (x: -73, y: -39): [Wall], - (x: -73, y: -25): [Wall], - (x: -73, y: -24): [Wall], - (x: -73, y: -23): [Wall], - (x: -73, y: -22): [Wall], - (x: -73, y: -21): [Wall], - (x: -73, y: -17): [Wall], - (x: -73, y: 16): [Wall], - (x: -73, y: 17): [Wall], - (x: -73, y: 18): [Wall], - (x: -73, y: 19): [Wall], - (x: -73, y: 20): [Wall], (x: -73, y: 28): [Wall], - (x: -72, y: -39): [Wall], - (x: -72, y: -25): [Wall], - (x: -72, y: -24): [Wall], - (x: -72, y: -22): [Wall], - (x: -72, y: -21): [Wall], - (x: -72, y: -20): [Wall], - (x: -72, y: -19): [Wall], - (x: -72, y: -18): [Wall], - (x: -72, y: 16): [Wall], - (x: -72, y: 17): [Wall], - (x: -72, y: 18): [Wall], - (x: -72, y: 19): [Wall], - (x: -72, y: 20): [Wall], (x: -72, y: 28): [Wall], - (x: -71, y: -39): [Wall], - (x: -71, y: -25): [Wall], - (x: -71, y: -24): [Wall], - (x: -71, y: -21): [Wall], - (x: -71, y: -20): [Wall], - (x: -71, y: 16): [Wall], - (x: -71, y: 17): [Wall], - (x: -71, y: 18): [Wall], - (x: -71, y: 19): [Wall], - (x: -71, y: 20): [Wall], (x: -71, y: 28): [Wall], - (x: -70, y: -39): [Wall], - (x: -70, y: -25): [Wall], - (x: -70, y: -24): [Wall], - (x: -70, y: -21): [Wall], - (x: -70, y: 16): [Wall], - (x: -70, y: 17): [Wall], - (x: -70, y: 18): [Wall], - (x: -70, y: 19): [Wall], - (x: -70, y: 20): [Wall], (x: -70, y: 28): [Wall], - (x: -69, y: -39): [Wall], - (x: -69, y: -25): [Wall], - (x: -69, y: -24): [Wall], - (x: -69, y: -23): [Wall], - (x: -69, y: -22): [Wall], - (x: -69, y: -21): [Wall], - (x: -69, y: 16): [Wall], - (x: -69, y: 17): [Wall], - (x: -69, y: 18): [Wall], - (x: -69, y: 19): [Wall], - (x: -69, y: 20): [Wall], (x: -69, y: 28): [Wall], - (x: -68, y: -39): [Wall], - (x: -68, y: -25): [Wall], - (x: -68, y: -24): [Wall], - (x: -68, y: -23): [Wall], - (x: -68, y: -22): [Wall], - (x: -68, y: -21): [Wall], - (x: -68, y: 16): [Wall], - (x: -68, y: 17): [Wall], - (x: -68, y: 18): [Wall], - (x: -68, y: 19): [Wall], - (x: -68, y: 20): [Wall], (x: -68, y: 28): [Wall], - (x: -67, y: -39): [Wall], - (x: -67, y: -25): [Wall], - (x: -67, y: -24): [Wall], - (x: -67, y: -23): [Wall], - (x: -67, y: -22): [Wall], - (x: -67, y: -21): [Wall], - (x: -67, y: 16): [Wall], - (x: -67, y: 17): [Wall], - (x: -67, y: 18): [Wall], - (x: -67, y: 19): [Wall], - (x: -67, y: 20): [Wall], (x: -67, y: 28): [Wall], - (x: -66, y: -39): [Wall], - (x: -66, y: -25): [Wall], - (x: -66, y: -24): [Wall], - (x: -66, y: -23): [Wall], - (x: -66, y: -22): [Wall], - (x: -66, y: -21): [Wall], - (x: -66, y: 16): [Wall], - (x: -66, y: 17): [Wall], - (x: -66, y: 18): [Wall], - (x: -66, y: 19): [Wall], - (x: -66, y: 20): [Wall], (x: -66, y: 28): [Wall], - (x: -65, y: -39): [Wall], - (x: -65, y: -25): [Wall], - (x: -65, y: -24): [Wall], - (x: -65, y: -23): [Wall], - (x: -65, y: -22): [Wall], - (x: -65, y: -21): [Wall], - (x: -65, y: 16): [Wall], - (x: -65, y: 17): [Wall], - (x: -65, y: 18): [Wall], - (x: -65, y: 19): [Wall], - (x: -65, y: 20): [Wall], (x: -65, y: 28): [Wall], - (x: -64, y: -39): [Wall], - (x: -64, y: -24): [Wall], - (x: -64, y: -23): [Wall], - (x: -64, y: -22): [Wall], - (x: -64, y: -21): [Wall], - (x: -64, y: 16): [Wall], - (x: -64, y: 17): [Wall], - (x: -64, y: 18): [Wall], - (x: -64, y: 19): [Wall], - (x: -64, y: 20): [Wall], (x: -64, y: 28): [Wall], - (x: -63, y: -39): [Wall], - (x: -63, y: 16): [Wall], - (x: -63, y: 17): [Wall], - (x: -63, y: 18): [Wall], - (x: -63, y: 19): [Wall], - (x: -63, y: 20): [Wall], (x: -63, y: 28): [Wall], - (x: -62, y: -39): [Wall], - (x: -62, y: 16): [Wall], - (x: -62, y: 17): [Wall], - (x: -62, y: 18): [Wall], - (x: -62, y: 19): [Wall], - (x: -62, y: 20): [Wall], (x: -62, y: 28): [Wall], - (x: -61, y: -39): [Wall], - (x: -61, y: 16): [Wall], - (x: -61, y: 17): [Wall], - (x: -61, y: 18): [Wall], - (x: -61, y: 19): [Wall], - (x: -61, y: 20): [Wall], (x: -61, y: 28): [Wall], - (x: -60, y: -39): [Wall], - (x: -60, y: 16): [Wall], - (x: -60, y: 17): [Wall], - (x: -60, y: 18): [Wall], - (x: -60, y: 19): [Wall], - (x: -60, y: 20): [Wall], (x: -60, y: 28): [Wall], - (x: -59, y: -39): [Wall], - (x: -59, y: 16): [Wall], - (x: -59, y: 17): [Wall], - (x: -59, y: 18): [Wall], - (x: -59, y: 19): [Wall], - (x: -59, y: 20): [Wall], (x: -59, y: 28): [Wall], - (x: -58, y: -39): [Wall], - (x: -58, y: 16): [Wall], - (x: -58, y: 17): [Wall], - (x: -58, y: 18): [Wall], - (x: -58, y: 19): [Wall], - (x: -58, y: 20): [Wall], (x: -58, y: 28): [Wall], - (x: -57, y: -39): [Wall], - (x: -57, y: 16): [Wall], - (x: -57, y: 17): [Wall], - (x: -57, y: 18): [Wall], - (x: -57, y: 19): [Wall], - (x: -57, y: 20): [Wall], (x: -57, y: 28): [Wall], - (x: -56, y: -39): [Wall], (x: -56, y: 28): [Wall], - (x: -55, y: -39): [Wall], (x: -55, y: 28): [Wall], - (x: -54, y: -39): [Wall], (x: -54, y: 28): [Wall], - (x: -53, y: -39): [Wall], (x: -53, y: 28): [Wall], - (x: -52, y: -39): [Wall], (x: -52, y: 28): [Wall], - (x: -51, y: -39): [Wall], (x: -51, y: 28): [Wall], - (x: -50, y: -39): [Wall], (x: -50, y: 28): [Wall], - (x: -49, y: -39): [Wall], (x: -49, y: 28): [Wall], - (x: -48, y: -39): [Wall], - (x: -48, y: -29): [Wall], - (x: -48, y: -28): [Wall], - (x: -48, y: -27): [Wall], - (x: -48, y: -26): [Wall], - (x: -48, y: -25): [Wall], - (x: -48, y: -24): [Wall], - (x: -48, y: -23): [Wall], - (x: -48, y: -22): [Wall], - (x: -48, y: -21): [Wall], - (x: -48, y: -20): [Wall], - (x: -48, y: -19): [Wall], - (x: -48, y: -18): [Wall], - (x: -48, y: -17): [Wall], (x: -48, y: -16): [Wall], (x: -48, y: -15): [Wall], (x: -48, y: -14): [Wall], @@ -648,23 +115,6 @@ (x: -48, y: 26): [Wall], (x: -48, y: 27): [Wall], (x: -48, y: 28): [Wall], - (x: -47, y: -39): [Wall], - (x: -47, y: -29): [Wall], - (x: -47, y: -28): [Wall], - (x: -47, y: -27): [Wall], - (x: -47, y: -26): [Wall], - (x: -47, y: -25): [Wall], - (x: -47, y: -24): [Wall], - (x: -46, y: -40): [Wall], - (x: -46, y: -39): [Wall], - (x: -46, y: -29): [Wall], - (x: -46, y: -24): [Wall], - (x: -46, y: -22): [Wall], - (x: -46, y: -21): [Wall], - (x: -46, y: -20): [Wall], - (x: -46, y: -19): [Wall], - (x: -46, y: -18): [Wall], - (x: -46, y: -17): [Wall], (x: -46, y: -16): [Wall], (x: -46, y: -15): [Wall], (x: -46, y: -14): [Wall], @@ -707,16 +157,6 @@ (x: -46, y: 23): [Wall], (x: -46, y: 24): [Wall], (x: -46, y: 25): [Wall], - (x: -45, y: -40): [Wall], - (x: -45, y: -39): [Wall], - (x: -45, y: -29): [Wall], - (x: -45, y: -24): [Wall], - (x: -45, y: -22): [Wall], - (x: -45, y: -21): [Wall], - (x: -45, y: -20): [Wall], - (x: -45, y: -19): [Wall], - (x: -45, y: -18): [Wall], - (x: -45, y: -17): [Local(Aisle1)], (x: -45, y: -16): [Local(Aisle1)], (x: -45, y: -15): [Local(Aisle1)], (x: -45, y: -14): [Local(Aisle1)], @@ -759,16 +199,6 @@ (x: -45, y: 23): [Wall], (x: -45, y: 24): [Wall], (x: -45, y: 25): [Wall], - (x: -44, y: -40): [Wall], - (x: -44, y: -39): [Wall], - (x: -44, y: -29): [Wall], - (x: -44, y: -24): [Wall], - (x: -44, y: -22): [Wall], - (x: -44, y: -21): [Wall], - (x: -44, y: -20): [Wall], - (x: -44, y: -19): [Wall], - (x: -44, y: -18): [Local(Aisle1)], - (x: -44, y: -17): [Local(Aisle1)], (x: -44, y: -16): [Local(Aisle1)], (x: -44, y: -15): [Local(Aisle1)], (x: -44, y: -14): [Local(Aisle1)], @@ -811,16 +241,9 @@ (x: -44, y: 23): [Wall], (x: -44, y: 24): [Wall], (x: -44, y: 25): [Wall], - (x: -43, y: -40): [Wall], - (x: -43, y: -39): [Wall], - (x: -43, y: -29): [Wall], - (x: -43, y: -24): [Wall], - (x: -43, y: -22): [Wall], - (x: -43, y: -21): [Wall], - (x: -43, y: -20): [Wall], - (x: -43, y: -19): [Local(Aisle1), Trail], - (x: -43, y: -18): [Local(Aisle1), Trail], - (x: -43, y: -17): [Local(Aisle1), Trail], + (x: -43, y: -19): [Empty, Trail], + (x: -43, y: -18): [Empty, Trail], + (x: -43, y: -17): [Empty, Trail], (x: -43, y: -16): [Local(Aisle1), Trail], (x: -43, y: -15): [Local(Aisle1), Trail], (x: -43, y: -14): [Local(Aisle1), Trail], @@ -863,16 +286,7 @@ (x: -43, y: 23): [Local(Aisle1)], (x: -43, y: 24): [Wall], (x: -43, y: 25): [Wall], - (x: -42, y: -40): [Wall], - (x: -42, y: -39): [Wall], - (x: -42, y: -29): [Wall], - (x: -42, y: -24): [Wall], - (x: -42, y: -22): [Wall], - (x: -42, y: -21): [Wall], - (x: -42, y: -20): [Local(Aisle1)], - (x: -42, y: -19): [Local(Aisle1), Trail], - (x: -42, y: -18): [Local(Aisle1)], - (x: -42, y: -17): [Local(Aisle1)], + (x: -42, y: -19): [Empty, Trail], (x: -42, y: -16): [Local(Aisle1)], (x: -42, y: -15): [Local(Aisle1)], (x: -42, y: -14): [Local(Aisle1)], @@ -915,17 +329,7 @@ (x: -42, y: 23): [Local(Aisle1)], (x: -42, y: 24): [Local(Aisle1)], (x: -42, y: 25): [Wall], - (x: -41, y: -40): [Wall], - (x: -41, y: -39): [Wall], - (x: -41, y: -29): [Wall], - (x: -41, y: -24): [Wall], - (x: -41, y: -23): [Wall], - (x: -41, y: -22): [Wall], - (x: -41, y: -21): [Local(Aisle1)], - (x: -41, y: -20): [Local(Aisle1)], - (x: -41, y: -19): [Local(Aisle1), Trail], - (x: -41, y: -18): [Local(Aisle1)], - (x: -41, y: -17): [Local(Aisle1)], + (x: -41, y: -19): [Empty, Trail], (x: -41, y: -16): [Local(Aisle1)], (x: -41, y: -15): [Local(Aisle1)], (x: -41, y: -14): [Wall], @@ -968,15 +372,7 @@ (x: -41, y: 23): [Local(Aisle1)], (x: -41, y: 24): [Local(Aisle1)], (x: -41, y: 25): [Wall], - (x: -40, y: -40): [Wall], - (x: -40, y: -39): [Wall], - (x: -40, y: -29): [Wall], - (x: -40, y: -28): [Wall], - (x: -40, y: -24): [Wall], - (x: -40, y: -23): [Wall], - (x: -40, y: -21): [Local(Aisle1)], - (x: -40, y: -20): [Local(Aisle1)], - (x: -40, y: -19): [Local(Aisle1), Trail], + (x: -40, y: -19): [Empty, Trail], (x: -40, y: -18): [Local(Aisle1)], (x: -40, y: -17): [Local(Aisle1)], (x: -40, y: -16): [Local(Aisle1)], @@ -1020,17 +416,7 @@ (x: -40, y: 23): [Local(Aisle1)], (x: -40, y: 24): [Local(Aisle1)], (x: -40, y: 25): [Wall], - (x: -39, y: -40): [Wall], - (x: -39, y: -39): [Wall], - (x: -39, y: -29): [Wall], - (x: -39, y: -28): [Wall], - (x: -39, y: -27): [Wall], - (x: -39, y: -26): [Wall], - (x: -39, y: -25): [Wall], - (x: -39, y: -24): [Wall], - (x: -39, y: -21): [Local(Aisle1)], - (x: -39, y: -20): [Local(Aisle1)], - (x: -39, y: -19): [Local(Aisle1), Trail], + (x: -39, y: -19): [Empty, Trail], (x: -39, y: -18): [Local(Aisle1)], (x: -39, y: -17): [Local(Aisle1)], (x: -39, y: -16): [Wall], @@ -1046,12 +432,6 @@ (x: -39, y: 23): [Local(Aisle1)], (x: -39, y: 24): [Local(Aisle1)], (x: -39, y: 25): [Wall], - (x: -38, y: -40): [Wall], - (x: -38, y: -39): [Wall], - (x: -38, y: -29): [Wall], - (x: -38, y: -27): [Wall], - (x: -38, y: -26): [Wall], - (x: -38, y: -25): [Wall], (x: -38, y: -21): [Local(Aisle1)], (x: -38, y: -20): [Local(Aisle1)], (x: -38, y: -19): [Local(Aisle1), Trail], @@ -1070,10 +450,6 @@ (x: -38, y: 23): [Local(Aisle1)], (x: -38, y: 24): [Local(Aisle1)], (x: -38, y: 25): [Wall], - (x: -37, y: -40): [Wall], - (x: -37, y: -39): [Wall], - (x: -37, y: -29): [Wall], - (x: -37, y: -25): [Wall], (x: -37, y: -21): [Local(Aisle1)], (x: -37, y: -20): [Local(Aisle1)], (x: -37, y: -19): [Local(Aisle1), Trail], @@ -1092,10 +468,6 @@ (x: -37, y: 23): [Local(Aisle1)], (x: -37, y: 24): [Local(Aisle1)], (x: -37, y: 25): [Wall], - (x: -36, y: -40): [Wall], - (x: -36, y: -39): [Wall], - (x: -36, y: -29): [Wall], - (x: -36, y: -25): [Wall], (x: -36, y: -21): [Local(Aisle1)], (x: -36, y: -20): [Local(Aisle1)], (x: -36, y: -19): [Local(Aisle1), Trail], @@ -1114,10 +486,6 @@ (x: -36, y: 23): [Local(Aisle1)], (x: -36, y: 24): [Local(Aisle1)], (x: -36, y: 25): [Wall], - (x: -35, y: -40): [Wall], - (x: -35, y: -39): [Wall], - (x: -35, y: -29): [Wall], - (x: -35, y: -25): [Wall], (x: -35, y: -21): [Local(Aisle1)], (x: -35, y: -20): [Local(Aisle1)], (x: -35, y: -19): [Local(Aisle1), Trail], @@ -1133,10 +501,6 @@ (x: -35, y: 20): [Local(Aisle2)], (x: -35, y: 21): [Empty, Trail], (x: -35, y: 25): [Wall], - (x: -34, y: -40): [Wall], - (x: -34, y: -39): [Wall], - (x: -34, y: -29): [Wall], - (x: -34, y: -25): [Wall], (x: -34, y: -21): [Local(Aisle1)], (x: -34, y: -20): [Local(Aisle1)], (x: -34, y: -19): [Local(Aisle1), Trail], @@ -1152,10 +516,6 @@ (x: -34, y: 20): [Local(Aisle2)], (x: -34, y: 21): [Empty, Trail], (x: -34, y: 25): [Wall], - (x: -33, y: -40): [Wall], - (x: -33, y: -39): [Wall], - (x: -33, y: -29): [Wall], - (x: -33, y: -25): [Wall], (x: -33, y: -19): [Local(Aisle2), Trail], (x: -33, y: -18): [Local(Aisle2)], (x: -33, y: -17): [Local(Aisle2)], @@ -1169,13 +529,6 @@ (x: -33, y: 20): [Local(Aisle2)], (x: -33, y: 21): [Empty, Trail], (x: -33, y: 25): [Wall], - (x: -32, y: -40): [Wall], - (x: -32, y: -39): [Wall], - (x: -32, y: -29): [Wall], - (x: -32, y: -28): [Wall], - (x: -32, y: -27): [Wall], - (x: -32, y: -26): [Wall], - (x: -32, y: -25): [Wall], (x: -32, y: -19): [Local(Aisle2), Trail], (x: -32, y: -18): [Local(Aisle2)], (x: -32, y: -17): [Local(Aisle2)], @@ -1189,12 +542,6 @@ (x: -32, y: 20): [Local(Aisle2)], (x: -32, y: 21): [Empty, Trail], (x: -32, y: 25): [Wall], - (x: -31, y: -40): [Wall], - (x: -31, y: -39): [Wall], - (x: -31, y: -29): [Wall], - (x: -31, y: -28): [Wall], - (x: -31, y: -27): [Wall], - (x: -31, y: -26): [Wall], (x: -31, y: -19): [Local(Aisle2), Trail], (x: -31, y: -18): [Local(Aisle2)], (x: -31, y: -17): [Local(Aisle2)], @@ -1208,12 +555,6 @@ (x: -31, y: 20): [Local(Aisle2)], (x: -31, y: 21): [Empty, Trail], (x: -31, y: 25): [Wall], - (x: -30, y: -40): [Wall], - (x: -30, y: -39): [Wall], - (x: -30, y: -29): [Wall], - (x: -30, y: -28): [Wall], - (x: -30, y: -27): [Wall], - (x: -30, y: -26): [Wall], (x: -30, y: -19): [Local(Aisle2), Trail], (x: -30, y: -18): [Local(Aisle2)], (x: -30, y: -17): [Local(Aisle2)], @@ -1227,12 +568,6 @@ (x: -30, y: 20): [Local(Aisle2)], (x: -30, y: 21): [Empty, Trail], (x: -30, y: 25): [Wall], - (x: -29, y: -40): [Wall], - (x: -29, y: -39): [Wall], - (x: -29, y: -29): [Wall], - (x: -29, y: -28): [Wall], - (x: -29, y: -27): [Wall], - (x: -29, y: -26): [Wall], (x: -29, y: -19): [Local(Aisle2), Trail], (x: -29, y: -18): [Local(Aisle2)], (x: -29, y: -17): [Local(Aisle2)], @@ -1246,12 +581,6 @@ (x: -29, y: 20): [Local(Aisle2)], (x: -29, y: 21): [Empty, Trail], (x: -29, y: 25): [Wall], - (x: -28, y: -40): [Wall], - (x: -28, y: -39): [Wall], - (x: -28, y: -29): [Wall], - (x: -28, y: -28): [Wall], - (x: -28, y: -27): [Wall], - (x: -28, y: -26): [Wall], (x: -28, y: -19): [Local(Aisle2), Trail], (x: -28, y: -18): [Local(Aisle2)], (x: -28, y: -17): [Local(Aisle2)], @@ -1265,12 +594,6 @@ (x: -28, y: 20): [Local(Aisle2)], (x: -28, y: 21): [Empty, Trail], (x: -28, y: 25): [Wall], - (x: -27, y: -40): [Wall], - (x: -27, y: -39): [Wall], - (x: -27, y: -29): [Wall], - (x: -27, y: -28): [Wall], - (x: -27, y: -27): [Wall], - (x: -27, y: -26): [Wall], (x: -27, y: -19): [Local(Aisle2), Trail], (x: -27, y: -18): [Local(Aisle2)], (x: -27, y: -17): [Local(Aisle2)], @@ -1316,12 +639,6 @@ (x: -27, y: 23): [Local(GoodWater)], (x: -27, y: 24): [Local(GoodWater)], (x: -27, y: 25): [Wall], - (x: -26, y: -40): [Wall], - (x: -26, y: -39): [Wall], - (x: -26, y: -29): [Wall], - (x: -26, y: -28): [Wall], - (x: -26, y: -27): [Wall], - (x: -26, y: -26): [Wall], (x: -26, y: -19): [Local(Aisle2), Trail], (x: -26, y: -18): [Local(Aisle2)], (x: -26, y: -17): [Local(Aisle2)], @@ -1367,12 +684,6 @@ (x: -26, y: 23): [Local(GoodWater)], (x: -26, y: 24): [Local(GoodWater)], (x: -26, y: 25): [Wall], - (x: -25, y: -40): [Wall], - (x: -25, y: -39): [Wall], - (x: -25, y: -29): [Wall], - (x: -25, y: -28): [Wall], - (x: -25, y: -27): [Wall], - (x: -25, y: -26): [Wall], (x: -25, y: -19): [Local(Aisle2), Trail], (x: -25, y: -18): [Local(Aisle2)], (x: -25, y: -17): [Local(Aisle2)], @@ -1418,12 +729,6 @@ (x: -25, y: 23): [Local(GoodWater)], (x: -25, y: 24): [Local(GoodWater)], (x: -25, y: 25): [Wall], - (x: -24, y: -40): [Wall], - (x: -24, y: -39): [Wall], - (x: -24, y: -29): [Wall], - (x: -24, y: -28): [Wall], - (x: -24, y: -27): [Wall], - (x: -24, y: -26): [Wall], (x: -24, y: -19): [Local(Aisle2), Trail], (x: -24, y: -18): [Local(Aisle2)], (x: -24, y: -17): [Local(Aisle2)], @@ -1469,12 +774,6 @@ (x: -24, y: 23): [Local(GoodWater)], (x: -24, y: 24): [Local(GoodWater)], (x: -24, y: 25): [Wall], - (x: -23, y: -40): [Wall], - (x: -23, y: -39): [Wall], - (x: -23, y: -29): [Wall], - (x: -23, y: -28): [Wall], - (x: -23, y: -27): [Wall], - (x: -23, y: -26): [Wall], (x: -23, y: -19): [Local(Aisle2), Trail], (x: -23, y: -18): [Local(Aisle2)], (x: -23, y: -17): [Local(Aisle2)], @@ -1520,12 +819,6 @@ (x: -23, y: 23): [Local(GoodWater)], (x: -23, y: 24): [Local(GoodWater)], (x: -23, y: 25): [Wall], - (x: -22, y: -40): [Wall], - (x: -22, y: -39): [Wall], - (x: -22, y: -29): [Wall], - (x: -22, y: -28): [Wall], - (x: -22, y: -27): [Wall], - (x: -22, y: -26): [Wall], (x: -22, y: -19): [Local(Aisle2), Trail], (x: -22, y: -18): [Local(Aisle2), Trail], (x: -22, y: -17): [Local(Aisle2), Trail], @@ -1571,12 +864,6 @@ (x: -22, y: 23): [Local(GoodWater)], (x: -22, y: 24): [Local(GoodWater)], (x: -22, y: 25): [Wall], - (x: -21, y: -40): [Wall], - (x: -21, y: -39): [Wall], - (x: -21, y: -29): [Wall], - (x: -21, y: -28): [Wall], - (x: -21, y: -27): [Wall], - (x: -21, y: -26): [Wall], (x: -21, y: -19): [Local(Aisle2), Trail], (x: -21, y: -18): [Local(Aisle2)], (x: -21, y: -17): [Local(Aisle2)], @@ -1622,12 +909,6 @@ (x: -21, y: 23): [Local(GoodWater)], (x: -21, y: 24): [Local(GoodWater)], (x: -21, y: 25): [Wall], - (x: -20, y: -40): [Wall], - (x: -20, y: -39): [Wall], - (x: -20, y: -29): [Wall], - (x: -20, y: -28): [Wall], - (x: -20, y: -27): [Wall], - (x: -20, y: -26): [Wall], (x: -20, y: -19): [Local(Aisle2), Trail], (x: -20, y: -18): [Local(Aisle2)], (x: -20, y: -17): [Local(Aisle2)], @@ -1673,12 +954,6 @@ (x: -20, y: 23): [Local(GoodWater)], (x: -20, y: 24): [Local(GoodWater)], (x: -20, y: 25): [Wall], - (x: -19, y: -40): [Wall], - (x: -19, y: -39): [Wall], - (x: -19, y: -29): [Wall], - (x: -19, y: -28): [Wall], - (x: -19, y: -27): [Wall], - (x: -19, y: -26): [Wall], (x: -19, y: -19): [Local(Aisle2), Trail], (x: -19, y: -18): [Local(Aisle2)], (x: -19, y: -17): [Local(Aisle2)], @@ -1724,12 +999,6 @@ (x: -19, y: 23): [Local(GoodWater)], (x: -19, y: 24): [Local(GoodWater)], (x: -19, y: 25): [Wall], - (x: -18, y: -40): [Wall], - (x: -18, y: -39): [Wall], - (x: -18, y: -29): [Wall], - (x: -18, y: -28): [Wall], - (x: -18, y: -27): [Wall], - (x: -18, y: -26): [Wall], (x: -18, y: -19): [Local(Aisle2), Trail], (x: -18, y: -18): [Local(Aisle2)], (x: -18, y: -17): [Local(Aisle2)], @@ -1775,12 +1044,6 @@ (x: -18, y: 23): [Local(GoodWater)], (x: -18, y: 24): [Local(GoodWater)], (x: -18, y: 25): [Wall], - (x: -17, y: -40): [Wall], - (x: -17, y: -39): [Wall], - (x: -17, y: -29): [Wall], - (x: -17, y: -28): [Wall], - (x: -17, y: -27): [Wall], - (x: -17, y: -26): [Wall], (x: -17, y: -19): [Local(Aisle2), Trail], (x: -17, y: -18): [Local(Aisle2)], (x: -17, y: -17): [Local(Aisle2)], @@ -1826,10 +1089,6 @@ (x: -17, y: 23): [Local(Fridges)], (x: -17, y: 24): [Local(Fridges)], (x: -17, y: 25): [Wall], - (x: -16, y: -40): [Wall], - (x: -16, y: -39): [Wall], - (x: -16, y: -28): [Wall], - (x: -16, y: -27): [Wall], (x: -16, y: -19): [Local(Aisle2), Trail], (x: -16, y: -18): [Local(Aisle2)], (x: -16, y: -17): [Local(Aisle2)], @@ -1875,8 +1134,6 @@ (x: -16, y: 23): [Local(Fridges)], (x: -16, y: 24): [Local(Fridges)], (x: -16, y: 25): [Wall], - (x: -15, y: -40): [Wall], - (x: -15, y: -39): [Wall], (x: -15, y: -19): [Local(Aisle2), Trail], (x: -15, y: -18): [Local(Aisle2)], (x: -15, y: -17): [Local(Aisle2)], @@ -1922,8 +1179,6 @@ (x: -15, y: 23): [Local(Fridges)], (x: -15, y: 24): [Local(Fridges)], (x: -15, y: 25): [Wall], - (x: -14, y: -40): [Wall], - (x: -14, y: -39): [Wall], (x: -14, y: -19): [Local(Aisle2), Trail], (x: -14, y: -18): [Local(Aisle2)], (x: -14, y: -17): [Local(Aisle2)], @@ -1940,8 +1195,6 @@ (x: -14, y: 23): [Local(Fridges)], (x: -14, y: 24): [Local(Fridges)], (x: -14, y: 25): [Wall], - (x: -13, y: -40): [Wall], - (x: -13, y: -39): [Wall], (x: -13, y: -19): [Local(Aisle2), Trail], (x: -13, y: -18): [Local(Aisle2)], (x: -13, y: -17): [Wall], @@ -1958,8 +1211,6 @@ (x: -13, y: 23): [Local(Fridges)], (x: -13, y: 24): [Local(Fridges)], (x: -13, y: 25): [Wall], - (x: -12, y: -40): [Wall], - (x: -12, y: -39): [Wall], (x: -12, y: -19): [Local(Aisle2), Trail], (x: -12, y: -18): [Local(Aisle2)], (x: -12, y: -17): [Wall], @@ -1976,8 +1227,6 @@ (x: -12, y: 23): [Local(Fridges)], (x: -12, y: 24): [Local(Fridges)], (x: -12, y: 25): [Wall], - (x: -11, y: -40): [Wall], - (x: -11, y: -39): [Wall], (x: -11, y: -19): [Local(Aisle2), Trail], (x: -11, y: -18): [Local(Aisle2)], (x: -11, y: -17): [Wall], @@ -1994,8 +1243,6 @@ (x: -11, y: 23): [Local(Fridges)], (x: -11, y: 24): [Local(Fridges)], (x: -11, y: 25): [Wall], - (x: -10, y: -40): [Wall], - (x: -10, y: -39): [Wall], (x: -10, y: -19): [Local(Aisle2), Trail], (x: -10, y: -18): [Local(Aisle2)], (x: -10, y: -17): [Wall], @@ -2012,8 +1259,6 @@ (x: -10, y: 23): [Local(Fridges)], (x: -10, y: 24): [Local(Fridges)], (x: -10, y: 25): [Wall], - (x: -9, y: -40): [Wall], - (x: -9, y: -39): [Wall], (x: -9, y: -19): [Local(Aisle2), Trail], (x: -9, y: -18): [Local(Aisle2)], (x: -9, y: -17): [Wall], @@ -2030,8 +1275,6 @@ (x: -9, y: 23): [Local(Fridges)], (x: -9, y: 24): [Local(Fridges)], (x: -9, y: 25): [Wall], - (x: -8, y: -40): [Wall], - (x: -8, y: -39): [Wall], (x: -8, y: -19): [Empty, Trail], (x: -8, y: -18): [Local(Aisle3)], (x: -8, y: -17): [Wall], @@ -2048,8 +1291,6 @@ (x: -8, y: 23): [Local(Fridges)], (x: -8, y: 24): [Local(Fridges)], (x: -8, y: 25): [Wall], - (x: -7, y: -40): [Wall], - (x: -7, y: -39): [Wall], (x: -7, y: -19): [Empty, Trail], (x: -7, y: -18): [Local(Aisle3)], (x: -7, y: -17): [Wall], @@ -2066,8 +1307,6 @@ (x: -7, y: 23): [Local(Fridges)], (x: -7, y: 24): [Local(Fridges)], (x: -7, y: 25): [Wall], - (x: -6, y: -40): [Wall], - (x: -6, y: -39): [Wall], (x: -6, y: -19): [Empty, Trail], (x: -6, y: -18): [Local(Aisle3)], (x: -6, y: -17): [Wall], @@ -2084,8 +1323,6 @@ (x: -6, y: 23): [Local(Fridges)], (x: -6, y: 24): [Local(Fridges)], (x: -6, y: 25): [Wall], - (x: -5, y: -40): [Wall], - (x: -5, y: -39): [Wall], (x: -5, y: -19): [Empty, Trail], (x: -5, y: -18): [Local(Aisle3)], (x: -5, y: -17): [Wall], @@ -2102,8 +1339,6 @@ (x: -5, y: 23): [Local(Fridges)], (x: -5, y: 24): [Local(Fridges)], (x: -5, y: 25): [Wall], - (x: -4, y: -40): [Wall], - (x: -4, y: -39): [Wall], (x: -4, y: -19): [Empty, Trail], (x: -4, y: -18): [Local(Aisle3)], (x: -4, y: -17): [Wall], @@ -2120,8 +1355,6 @@ (x: -4, y: 23): [Local(Fridges)], (x: -4, y: 24): [Local(Fridges)], (x: -4, y: 25): [Wall], - (x: -3, y: -40): [Wall], - (x: -3, y: -39): [Wall], (x: -3, y: -19): [Empty, Trail], (x: -3, y: -18): [Local(Aisle3)], (x: -3, y: -17): [Local(Aisle3)], @@ -2138,8 +1371,6 @@ (x: -3, y: 23): [Local(Fridges)], (x: -3, y: 24): [Local(Fridges)], (x: -3, y: 25): [Wall], - (x: -2, y: -40): [Wall], - (x: -2, y: -39): [Wall], (x: -2, y: -19): [Empty, Trail], (x: -2, y: -18): [Local(Aisle3)], (x: -2, y: -17): [Local(Aisle3)], @@ -2185,8 +1416,6 @@ (x: -2, y: 23): [Local(Fridges)], (x: -2, y: 24): [Local(Fridges)], (x: -2, y: 25): [Wall], - (x: -1, y: -40): [Wall], - (x: -1, y: -39): [Wall], (x: -1, y: -19): [Empty, Trail], (x: -1, y: -18): [Local(Aisle3)], (x: -1, y: -17): [Local(Aisle3)], @@ -2232,8 +1461,6 @@ (x: -1, y: 23): [Local(Fridges)], (x: -1, y: 24): [Local(Fridges)], (x: -1, y: 25): [Wall], - (x: 0, y: -40): [Wall], - (x: 0, y: -39): [Wall], (x: 0, y: -19): [Empty, Trail], (x: 0, y: -18): [Local(Aisle3)], (x: 0, y: -17): [Local(Aisle3)], @@ -2279,8 +1506,6 @@ (x: 0, y: 23): [Local(Fridges)], (x: 0, y: 24): [Local(Fridges)], (x: 0, y: 25): [Wall], - (x: 1, y: -40): [Wall], - (x: 1, y: -39): [Wall], (x: 1, y: -19): [Empty, Trail], (x: 1, y: -18): [Local(Aisle3)], (x: 1, y: -17): [Local(Aisle3)], @@ -2326,8 +1551,6 @@ (x: 1, y: 23): [Local(Fridges)], (x: 1, y: 24): [Local(Fridges)], (x: 1, y: 25): [Wall], - (x: 2, y: -40): [Wall], - (x: 2, y: -39): [Wall], (x: 2, y: -19): [Empty, Trail], (x: 2, y: -18): [Local(Aisle3)], (x: 2, y: -17): [Local(Aisle3)], @@ -2373,8 +1596,6 @@ (x: 2, y: 23): [Local(Fridges)], (x: 2, y: 24): [Local(Fridges)], (x: 2, y: 25): [Wall], - (x: 3, y: -40): [Wall], - (x: 3, y: -39): [Wall], (x: 3, y: -19): [Empty, Trail], (x: 3, y: -18): [Local(Aisle3), Trail], (x: 3, y: -17): [Local(Aisle3), Trail], @@ -2420,8 +1641,6 @@ (x: 3, y: 23): [Local(Fridges)], (x: 3, y: 24): [Local(Fridges)], (x: 3, y: 25): [Wall], - (x: 4, y: -40): [Wall], - (x: 4, y: -39): [Wall], (x: 4, y: -19): [Empty, Trail], (x: 4, y: -18): [Local(Aisle3)], (x: 4, y: -17): [Local(Aisle3)], @@ -2467,8 +1686,6 @@ (x: 4, y: 23): [Local(Fridges)], (x: 4, y: 24): [Local(Fridges)], (x: 4, y: 25): [Wall], - (x: 5, y: -40): [Wall], - (x: 5, y: -39): [Wall], (x: 5, y: -19): [Empty, Trail], (x: 5, y: -18): [Local(Aisle3)], (x: 5, y: -17): [Local(Aisle3)], @@ -2514,8 +1731,6 @@ (x: 5, y: 23): [Local(Fridges)], (x: 5, y: 24): [Local(Fridges)], (x: 5, y: 25): [Wall], - (x: 6, y: -40): [Wall], - (x: 6, y: -39): [Wall], (x: 6, y: -19): [Empty, Trail], (x: 6, y: -18): [Local(Aisle3)], (x: 6, y: -17): [Local(Aisle3)], @@ -2561,8 +1776,6 @@ (x: 6, y: 23): [Local(Fridges)], (x: 6, y: 24): [Local(Fridges)], (x: 6, y: 25): [Wall], - (x: 7, y: -40): [Wall], - (x: 7, y: -39): [Wall], (x: 7, y: -19): [Empty, Trail], (x: 7, y: -18): [Local(Aisle3)], (x: 7, y: -17): [Local(Aisle3)], @@ -2608,8 +1821,6 @@ (x: 7, y: 23): [Local(Fridges)], (x: 7, y: 24): [Local(Fridges)], (x: 7, y: 25): [Wall], - (x: 8, y: -40): [Wall], - (x: 8, y: -39): [Wall], (x: 8, y: -19): [Empty, Trail], (x: 8, y: -18): [Local(Aisle3)], (x: 8, y: -17): [Local(Aisle3)], @@ -2655,8 +1866,6 @@ (x: 8, y: 23): [Local(Fridges)], (x: 8, y: 24): [Local(Fridges)], (x: 8, y: 25): [Wall], - (x: 9, y: -40): [Wall], - (x: 9, y: -39): [Wall], (x: 9, y: -19): [Empty, Trail], (x: 9, y: -18): [Local(Aisle3)], (x: 9, y: -17): [Local(Aisle3)], @@ -2702,8 +1911,6 @@ (x: 9, y: 23): [Local(Fridges)], (x: 9, y: 24): [Local(Fridges)], (x: 9, y: 25): [Wall], - (x: 10, y: -40): [Wall], - (x: 10, y: -39): [Wall], (x: 10, y: -19): [Empty, Trail], (x: 10, y: -18): [Local(Aisle3)], (x: 10, y: -17): [Local(Aisle3)], @@ -2720,8 +1927,6 @@ (x: 10, y: 23): [Local(Fridges)], (x: 10, y: 24): [Local(Fridges)], (x: 10, y: 25): [Wall], - (x: 11, y: -40): [Wall], - (x: 11, y: -39): [Wall], (x: 11, y: -19): [Empty, Trail], (x: 11, y: -18): [Local(Aisle3)], (x: 11, y: -17): [Local(Aisle3)], @@ -2738,8 +1943,6 @@ (x: 11, y: 23): [Local(Fridges)], (x: 11, y: 24): [Local(Fridges)], (x: 11, y: 25): [Wall], - (x: 12, y: -40): [Wall], - (x: 12, y: -39): [Wall], (x: 12, y: -19): [Empty, Trail], (x: 12, y: -18): [Local(Aisle3)], (x: 12, y: -17): [Local(Aisle3)], @@ -2756,8 +1959,6 @@ (x: 12, y: 23): [Local(Fridges)], (x: 12, y: 24): [Local(Fridges)], (x: 12, y: 25): [Wall], - (x: 13, y: -40): [Wall], - (x: 13, y: -39): [Wall], (x: 13, y: -19): [Empty, Trail], (x: 13, y: -18): [Local(Aisle3)], (x: 13, y: -17): [Local(Aisle3)], @@ -2774,8 +1975,6 @@ (x: 13, y: 23): [Local(Fridges)], (x: 13, y: 24): [Local(Fridges)], (x: 13, y: 25): [Wall], - (x: 14, y: -40): [Wall], - (x: 14, y: -39): [Wall], (x: 14, y: -19): [Empty, Trail], (x: 14, y: -18): [Local(Aisle3)], (x: 14, y: -17): [Local(Aisle3)], @@ -2792,11 +1991,7 @@ (x: 14, y: 23): [Local(Fridges)], (x: 14, y: 24): [Local(Fridges)], (x: 14, y: 25): [Wall], - (x: 15, y: -40): [Wall], - (x: 15, y: -39): [Wall], (x: 15, y: -19): [Empty, Trail], - (x: 15, y: -18): [Local(Aisle3)], - (x: 15, y: -17): [Local(Aisle3)], (x: 15, y: -16): [Wall], (x: 15, y: -15): [Wall], (x: 15, y: -14): [Wall], @@ -2810,11 +2005,7 @@ (x: 15, y: 23): [Local(Fridges)], (x: 15, y: 24): [Local(Fridges)], (x: 15, y: 25): [Wall], - (x: 16, y: -40): [Wall], - (x: 16, y: -39): [Wall], (x: 16, y: -19): [Empty, Trail], - (x: 16, y: -18): [Local(Aisle3)], - (x: 16, y: -17): [Local(Aisle3)], (x: 16, y: -16): [Wall], (x: 16, y: -15): [Wall], (x: 16, y: -14): [Wall], @@ -2828,11 +2019,7 @@ (x: 16, y: 23): [Local(Fridges)], (x: 16, y: 24): [Local(Fridges)], (x: 16, y: 25): [Wall], - (x: 17, y: -40): [Wall], - (x: 17, y: -39): [Wall], (x: 17, y: -19): [Empty, Trail], - (x: 17, y: -18): [Local(Aisle4)], - (x: 17, y: -17): [Local(Aisle4)], (x: 17, y: -16): [Wall], (x: 17, y: -15): [Wall], (x: 17, y: -14): [Wall], @@ -2846,11 +2033,7 @@ (x: 17, y: 23): [Local(Fridges)], (x: 17, y: 24): [Local(Fridges)], (x: 17, y: 25): [Wall], - (x: 18, y: -40): [Wall], - (x: 18, y: -39): [Wall], (x: 18, y: -19): [Empty, Trail], - (x: 18, y: -18): [Local(Aisle4)], - (x: 18, y: -17): [Local(Aisle4)], (x: 18, y: -16): [Wall], (x: 18, y: -15): [Wall], (x: 18, y: -14): [Wall], @@ -2864,11 +2047,7 @@ (x: 18, y: 23): [Local(Fridges)], (x: 18, y: 24): [Local(Fridges)], (x: 18, y: 25): [Wall], - (x: 19, y: -40): [Wall], - (x: 19, y: -39): [Wall], (x: 19, y: -19): [Empty, Trail], - (x: 19, y: -18): [Local(Aisle4)], - (x: 19, y: -17): [Local(Aisle4)], (x: 19, y: -16): [Wall], (x: 19, y: -15): [Wall], (x: 19, y: -14): [Wall], @@ -2882,15 +2061,7 @@ (x: 19, y: 23): [Local(Fridges)], (x: 19, y: 24): [Local(Fridges)], (x: 19, y: 25): [Wall], - (x: 20, y: -40): [Wall], - (x: 20, y: -39): [Wall], - (x: 20, y: -29): [Wall], - (x: 20, y: -28): [Wall], - (x: 20, y: -27): [Wall], - (x: 20, y: -26): [Wall], (x: 20, y: -19): [Empty, Trail], - (x: 20, y: -18): [Local(Aisle4)], - (x: 20, y: -17): [Local(Aisle4)], (x: 20, y: -16): [Wall], (x: 20, y: -15): [Wall], (x: 20, y: -14): [Wall], @@ -2904,17 +2075,7 @@ (x: 20, y: 23): [Local(Fridges)], (x: 20, y: 24): [Local(Fridges)], (x: 20, y: 25): [Wall], - (x: 21, y: -40): [Wall], - (x: 21, y: -39): [Wall], - (x: 21, y: -30): [Wall], - (x: 21, y: -29): [Wall], - (x: 21, y: -28): [Wall], - (x: 21, y: -27): [Wall], - (x: 21, y: -26): [Wall], - (x: 21, y: -25): [Wall], (x: 21, y: -19): [Empty, Trail], - (x: 21, y: -18): [Local(Aisle4)], - (x: 21, y: -17): [Local(Aisle4)], (x: 21, y: -16): [Local(Aisle4)], (x: 21, y: -15): [Wall], (x: 21, y: -14): [Wall], @@ -2957,19 +2118,7 @@ (x: 21, y: 23): [Local(Fridges)], (x: 21, y: 24): [Local(Fridges)], (x: 21, y: 25): [Wall], - (x: 22, y: -40): [Wall], - (x: 22, y: -39): [Wall], - (x: 22, y: -31): [Wall], - (x: 22, y: -30): [Wall], - (x: 22, y: -29): [Wall], - (x: 22, y: -28): [Wall], - (x: 22, y: -27): [Wall], - (x: 22, y: -26): [Wall], - (x: 22, y: -25): [Wall], - (x: 22, y: -24): [Wall], (x: 22, y: -19): [Empty, Trail], - (x: 22, y: -18): [Local(Aisle4)], - (x: 22, y: -17): [Local(Aisle4)], (x: 22, y: -16): [Local(Aisle4)], (x: 22, y: -15): [Local(Aisle4)], (x: 22, y: -14): [Wall], @@ -3012,16 +2161,7 @@ (x: 22, y: 23): [Local(Fridges)], (x: 22, y: 24): [Local(Fridges)], (x: 22, y: 25): [Wall], - (x: 23, y: -40): [Wall], - (x: 23, y: -39): [Wall], - (x: 23, y: -32): [Wall], - (x: 23, y: -31): [Wall], - (x: 23, y: -25): [Wall], - (x: 23, y: -24): [Wall], - (x: 23, y: -23): [Wall], (x: 23, y: -19): [Empty, Trail], - (x: 23, y: -18): [Local(Aisle4)], - (x: 23, y: -17): [Local(Aisle4)], (x: 23, y: -16): [Local(Aisle4)], (x: 23, y: -15): [Local(Aisle4)], (x: 23, y: -14): [Local(Aisle4)], @@ -3064,17 +2204,9 @@ (x: 23, y: 23): [Local(Fridges)], (x: 23, y: 24): [Local(Fridges)], (x: 23, y: 25): [Wall], - (x: 24, y: -40): [Wall], - (x: 24, y: -39): [Wall], - (x: 24, y: -33): [Wall], - (x: 24, y: -32): [Wall], - (x: 24, y: -31): [Wall], - (x: 24, y: -25): [Wall], - (x: 24, y: -23): [Wall], - (x: 24, y: -22): [Wall], (x: 24, y: -19): [Empty, Trail], - (x: 24, y: -18): [Local(Aisle4), Trail], - (x: 24, y: -17): [Local(Aisle4), Trail], + (x: 24, y: -18): [Empty, Trail], + (x: 24, y: -17): [Empty, Trail], (x: 24, y: -16): [Local(Aisle4), Trail], (x: 24, y: -15): [Local(Aisle4), Trail], (x: 24, y: -14): [Local(Aisle4), Trail], @@ -3117,15 +2249,6 @@ (x: 24, y: 23): [Local(Fridges)], (x: 24, y: 24): [Local(Fridges)], (x: 24, y: 25): [Wall], - (x: 25, y: -40): [Wall], - (x: 25, y: -39): [Wall], - (x: 25, y: -34): [Wall], - (x: 25, y: -33): [Wall], - (x: 25, y: -25): [Wall], - (x: 25, y: -22): [Wall], - (x: 25, y: -21): [Wall], - (x: 25, y: -18): [Local(Aisle4)], - (x: 25, y: -17): [Local(Aisle4)], (x: 25, y: -16): [Local(Aisle4)], (x: 25, y: -15): [Local(Aisle4)], (x: 25, y: -14): [Local(Aisle4)], @@ -3168,20 +2291,6 @@ (x: 25, y: 23): [Local(Fridges)], (x: 25, y: 24): [Local(Fridges)], (x: 25, y: 25): [Wall], - (x: 26, y: -40): [Wall], - (x: 26, y: -39): [Wall], - (x: 26, y: -34): [Wall], - (x: 26, y: -33): [Wall], - (x: 26, y: -25): [Wall], - (x: 26, y: -24): [Wall], - (x: 26, y: -21): [Wall], - (x: 26, y: -20): [Wall], - (x: 26, y: -18): [Local(Aisle4)], - (x: 26, y: -17): [Local(Aisle4)], - (x: 26, y: -16): [Local(Aisle4)], - (x: 26, y: -15): [Local(Aisle4)], - (x: 26, y: -14): [Local(Aisle4)], - (x: 26, y: -13): [Local(Aisle4)], (x: 26, y: -12): [Local(Aisle4)], (x: 26, y: -11): [Local(Aisle4)], (x: 26, y: -10): [Local(Aisle4)], @@ -3220,21 +2329,6 @@ (x: 26, y: 23): [Local(Fridges)], (x: 26, y: 24): [Local(Fridges)], (x: 26, y: 25): [Wall], - (x: 27, y: -40): [Wall], - (x: 27, y: -39): [Wall], - (x: 27, y: -34): [Wall], - (x: 27, y: -33): [Wall], - (x: 27, y: -25): [Wall], - (x: 27, y: -24): [Wall], - (x: 27, y: -23): [Wall], - (x: 27, y: -20): [Wall], - (x: 27, y: -19): [Wall], - (x: 27, y: -18): [Local(Aisle4)], - (x: 27, y: -17): [Local(Aisle4)], - (x: 27, y: -16): [Local(Aisle4)], - (x: 27, y: -15): [Local(Aisle4)], - (x: 27, y: -14): [Local(Aisle4)], - (x: 27, y: -13): [Local(Aisle4)], (x: 27, y: -12): [Local(Aisle4)], (x: 27, y: -11): [Local(Aisle4)], (x: 27, y: -10): [Local(Aisle4)], @@ -3273,23 +2367,6 @@ (x: 27, y: 23): [Local(Fridges)], (x: 27, y: 24): [Local(Fridges)], (x: 27, y: 25): [Wall], - (x: 28, y: -40): [Wall], - (x: 28, y: -39): [Wall], - (x: 28, y: -34): [Wall], - (x: 28, y: -33): [Wall], - (x: 28, y: -25): [Wall], - (x: 28, y: -24): [Wall], - (x: 28, y: -23): [Wall], - (x: 28, y: -22): [Wall], - (x: 28, y: -21): [Wall], - (x: 28, y: -20): [Wall], - (x: 28, y: -19): [Wall], - (x: 28, y: -18): [Wall], - (x: 28, y: -17): [Wall], - (x: 28, y: -16): [Wall], - (x: 28, y: -15): [Wall], - (x: 28, y: -14): [Wall], - (x: 28, y: -13): [Local(Aisle4)], (x: 28, y: -12): [Local(Aisle4)], (x: 28, y: -11): [Local(Aisle4)], (x: 28, y: -10): [Local(Aisle4)], @@ -3329,24 +2406,6 @@ (x: 28, y: 24): [Local(Fridges)], (x: 28, y: 25): [Wall], (x: 28, y: 26): [Wall], - (x: 29, y: -40): [Wall], - (x: 29, y: -39): [Wall], - (x: 29, y: -34): [Wall], - (x: 29, y: -33): [Wall], - (x: 29, y: -25): [Wall], - (x: 29, y: -24): [Wall], - (x: 29, y: -23): [Wall], - (x: 29, y: -22): [Wall], - (x: 29, y: -21): [Wall], - (x: 29, y: -20): [Wall], - (x: 29, y: -19): [Wall], - (x: 29, y: -18): [Wall], - (x: 29, y: -17): [Wall], - (x: 29, y: -16): [Wall], - (x: 29, y: -15): [Wall], - (x: 29, y: -14): [Wall], - (x: 29, y: -13): [Wall], - (x: 29, y: -12): [Local(Aisle4)], (x: 29, y: -11): [Local(Aisle4)], (x: 29, y: -10): [Local(Aisle4)], (x: 29, y: -9): [Local(Aisle4)], @@ -3386,29 +2445,6 @@ (x: 29, y: 25): [Local(Fridges)], (x: 29, y: 26): [Wall], (x: 29, y: 27): [Wall], - (x: 30, y: -40): [Wall], - (x: 30, y: -39): [Wall], - (x: 30, y: -34): [Wall], - (x: 30, y: -33): [Wall], - (x: 30, y: -30): [Wall], - (x: 30, y: -29): [Wall], - (x: 30, y: -28): [Wall], - (x: 30, y: -27): [Wall], - (x: 30, y: -26): [Wall], - (x: 30, y: -25): [Wall], - (x: 30, y: -24): [Wall], - (x: 30, y: -23): [Wall], - (x: 30, y: -22): [Wall], - (x: 30, y: -21): [Wall], - (x: 30, y: -20): [Wall], - (x: 30, y: -19): [Wall], - (x: 30, y: -18): [Wall], - (x: 30, y: -17): [Wall], - (x: 30, y: -16): [Wall], - (x: 30, y: -15): [Wall], - (x: 30, y: -14): [Wall], - (x: 30, y: -13): [Wall], - (x: 30, y: -12): [Local(FruitsAndVeggies)], (x: 30, y: -11): [Local(FruitsAndVeggies)], (x: 30, y: -10): [Local(FruitsAndVeggies)], (x: 30, y: -9): [Local(FruitsAndVeggies)], @@ -3448,30 +2484,6 @@ (x: 30, y: 25): [Local(FruitsAndVeggies)], (x: 30, y: 27): [Wall], (x: 30, y: 28): [Wall], - (x: 31, y: -40): [Wall], - (x: 31, y: -39): [Wall], - (x: 31, y: -33): [Wall], - (x: 31, y: -32): [Wall], - (x: 31, y: -31): [Wall], - (x: 31, y: -30): [Wall], - (x: 31, y: -29): [Wall], - (x: 31, y: -28): [Wall], - (x: 31, y: -27): [Wall], - (x: 31, y: -26): [Wall], - (x: 31, y: -25): [Wall], - (x: 31, y: -24): [Wall], - (x: 31, y: -23): [Wall], - (x: 31, y: -22): [Wall], - (x: 31, y: -21): [Wall], - (x: 31, y: -20): [Wall], - (x: 31, y: -19): [Wall], - (x: 31, y: -18): [Wall], - (x: 31, y: -17): [Wall], - (x: 31, y: -16): [Wall], - (x: 31, y: -15): [Wall], - (x: 31, y: -14): [Wall], - (x: 31, y: -13): [Wall], - (x: 31, y: -12): [Local(FruitsAndVeggies)], (x: 31, y: -11): [Local(FruitsAndVeggies)], (x: 31, y: -10): [Local(FruitsAndVeggies)], (x: 31, y: -9): [Local(FruitsAndVeggies)], @@ -3510,18 +2522,6 @@ (x: 31, y: 24): [Local(FruitsAndVeggies)], (x: 31, y: 25): [Local(FruitsAndVeggies)], (x: 31, y: 28): [Wall], - (x: 32, y: -40): [Wall], - (x: 32, y: -39): [Wall], - (x: 32, y: -21): [Wall], - (x: 32, y: -20): [Wall], - (x: 32, y: -19): [Wall], - (x: 32, y: -18): [Wall], - (x: 32, y: -17): [Wall], - (x: 32, y: -16): [Wall], - (x: 32, y: -15): [Wall], - (x: 32, y: -14): [Wall], - (x: 32, y: -13): [Wall], - (x: 32, y: -12): [Local(FruitsAndVeggies)], (x: 32, y: -11): [Local(FruitsAndVeggies)], (x: 32, y: -10): [Local(FruitsAndVeggies)], (x: 32, y: -9): [Local(FruitsAndVeggies)], @@ -3560,17 +2560,6 @@ (x: 32, y: 24): [Local(FruitsAndVeggies)], (x: 32, y: 25): [Local(FruitsAndVeggies)], (x: 32, y: 28): [Wall], - (x: 33, y: -40): [Wall], - (x: 33, y: -39): [Wall], - (x: 33, y: -20): [Wall], - (x: 33, y: -19): [Wall], - (x: 33, y: -18): [Wall], - (x: 33, y: -17): [Wall], - (x: 33, y: -16): [Wall], - (x: 33, y: -15): [Wall], - (x: 33, y: -14): [Wall], - (x: 33, y: -13): [Wall], - (x: 33, y: -12): [Local(FruitsAndVeggies)], (x: 33, y: -11): [Local(FruitsAndVeggies)], (x: 33, y: -10): [Local(FruitsAndVeggies)], (x: 33, y: -9): [Local(FruitsAndVeggies)], @@ -3609,16 +2598,6 @@ (x: 33, y: 24): [Local(FruitsAndVeggies)], (x: 33, y: 25): [Local(FruitsAndVeggies)], (x: 33, y: 28): [Wall], - (x: 34, y: -40): [Wall], - (x: 34, y: -39): [Wall], - (x: 34, y: -19): [Wall], - (x: 34, y: -18): [Wall], - (x: 34, y: -17): [Wall], - (x: 34, y: -16): [Wall], - (x: 34, y: -15): [Wall], - (x: 34, y: -14): [Wall], - (x: 34, y: -13): [Wall], - (x: 34, y: -12): [Local(FruitsAndVeggies)], (x: 34, y: -11): [Local(FruitsAndVeggies)], (x: 34, y: -10): [Local(FruitsAndVeggies)], (x: 34, y: -9): [Local(FruitsAndVeggies)], @@ -3657,15 +2636,6 @@ (x: 34, y: 24): [Local(FruitsAndVeggies)], (x: 34, y: 25): [Local(FruitsAndVeggies)], (x: 34, y: 28): [Wall], - (x: 35, y: -40): [Wall], - (x: 35, y: -39): [Wall], - (x: 35, y: -18): [Wall], - (x: 35, y: -17): [Wall], - (x: 35, y: -16): [Wall], - (x: 35, y: -15): [Wall], - (x: 35, y: -14): [Wall], - (x: 35, y: -13): [Wall], - (x: 35, y: -12): [Local(FruitsAndVeggies)], (x: 35, y: -11): [Local(FruitsAndVeggies)], (x: 35, y: -10): [Local(FruitsAndVeggies)], (x: 35, y: -9): [Local(FruitsAndVeggies)], @@ -3704,12 +2674,6 @@ (x: 35, y: 24): [Local(FruitsAndVeggies)], (x: 35, y: 25): [Local(FruitsAndVeggies)], (x: 35, y: 28): [Wall], - (x: 36, y: -40): [Wall], - (x: 36, y: -39): [Wall], - (x: 36, y: -18): [Wall], - (x: 36, y: -17): [Wall], - (x: 36, y: -13): [Wall], - (x: 36, y: -12): [Local(FruitsAndVeggies)], (x: 36, y: -11): [Local(FruitsAndVeggies)], (x: 36, y: -10): [Local(FruitsAndVeggies)], (x: 36, y: -9): [Local(FruitsAndVeggies)], @@ -3748,12 +2712,6 @@ (x: 36, y: 24): [Local(FruitsAndVeggies)], (x: 36, y: 25): [Local(FruitsAndVeggies)], (x: 36, y: 28): [Wall], - (x: 37, y: -40): [Wall], - (x: 37, y: -39): [Wall], - (x: 37, y: -18): [Wall], - (x: 37, y: -17): [Wall], - (x: 37, y: -13): [Wall], - (x: 37, y: -12): [Local(FruitsAndVeggies)], (x: 37, y: -11): [Local(FruitsAndVeggies)], (x: 37, y: -10): [Local(FruitsAndVeggies)], (x: 37, y: -9): [Local(FruitsAndVeggies)], @@ -3793,12 +2751,6 @@ (x: 37, y: 25): [Local(FruitsAndVeggies)], (x: 37, y: 27): [Wall], (x: 37, y: 28): [Wall], - (x: 38, y: -40): [Wall], - (x: 38, y: -39): [Wall], - (x: 38, y: -18): [Wall], - (x: 38, y: -17): [Wall], - (x: 38, y: -13): [Wall], - (x: 38, y: -12): [Local(FruitsAndVeggies)], (x: 38, y: -11): [Local(FruitsAndVeggies)], (x: 38, y: -10): [Local(FruitsAndVeggies)], (x: 38, y: -9): [Local(FruitsAndVeggies)], @@ -3839,12 +2791,6 @@ (x: 38, y: 26): [Wall], (x: 38, y: 27): [Wall], (x: 38, y: 28): [Wall], - (x: 39, y: -40): [Wall], - (x: 39, y: -39): [Wall], - (x: 39, y: -18): [Wall], - (x: 39, y: -17): [Wall], - (x: 39, y: -13): [Wall], - (x: 39, y: -12): [Local(FruitsAndVeggies)], (x: 39, y: -11): [Local(FruitsAndVeggies)], (x: 39, y: -10): [Local(FruitsAndVeggies)], (x: 39, y: -9): [Local(FruitsAndVeggies)], @@ -3883,12 +2829,6 @@ (x: 39, y: 24): [Local(FruitsAndVeggies)], (x: 39, y: 25): [Wall], (x: 39, y: 26): [Wall], - (x: 40, y: -40): [Wall], - (x: 40, y: -39): [Wall], - (x: 40, y: -18): [Wall], - (x: 40, y: -17): [Wall], - (x: 40, y: -13): [Wall], - (x: 40, y: -12): [Local(FruitsAndVeggies)], (x: 40, y: -11): [Local(FruitsAndVeggies)], (x: 40, y: -10): [Local(FruitsAndVeggies)], (x: 40, y: -9): [Local(FruitsAndVeggies)], @@ -3926,12 +2866,6 @@ (x: 40, y: 23): [Local(FruitsAndVeggies)], (x: 40, y: 24): [Local(FruitsAndVeggies)], (x: 40, y: 25): [Wall], - (x: 41, y: -40): [Wall], - (x: 41, y: -39): [Wall], - (x: 41, y: -18): [Wall], - (x: 41, y: -17): [Wall], - (x: 41, y: -13): [Wall], - (x: 41, y: -12): [Local(FruitsAndVeggies)], (x: 41, y: -11): [Local(FruitsAndVeggies)], (x: 41, y: -10): [Local(FruitsAndVeggies)], (x: 41, y: -9): [Local(FruitsAndVeggies)], @@ -3969,12 +2903,6 @@ (x: 41, y: 23): [Local(FruitsAndVeggies)], (x: 41, y: 24): [Local(FruitsAndVeggies)], (x: 41, y: 25): [Wall], - (x: 42, y: -40): [Wall], - (x: 42, y: -39): [Wall], - (x: 42, y: -18): [Wall], - (x: 42, y: -17): [Wall], - (x: 42, y: -13): [Wall], - (x: 42, y: -12): [Local(FruitsAndVeggies)], (x: 42, y: -11): [Local(FruitsAndVeggies)], (x: 42, y: -10): [Local(FruitsAndVeggies)], (x: 42, y: -9): [Local(FruitsAndVeggies)], @@ -4012,12 +2940,6 @@ (x: 42, y: 23): [Local(FruitsAndVeggies)], (x: 42, y: 24): [Local(FruitsAndVeggies)], (x: 42, y: 25): [Wall], - (x: 43, y: -40): [Wall], - (x: 43, y: -39): [Wall], - (x: 43, y: -18): [Wall], - (x: 43, y: -17): [Wall], - (x: 43, y: -13): [Wall], - (x: 43, y: -12): [Local(FruitsAndVeggies)], (x: 43, y: -11): [Local(FruitsAndVeggies)], (x: 43, y: -10): [Local(FruitsAndVeggies)], (x: 43, y: -9): [Local(FruitsAndVeggies)], @@ -4055,12 +2977,6 @@ (x: 43, y: 23): [Local(FruitsAndVeggies)], (x: 43, y: 24): [Local(FruitsAndVeggies)], (x: 43, y: 25): [Wall], - (x: 44, y: -40): [Wall], - (x: 44, y: -39): [Wall], - (x: 44, y: -18): [Wall], - (x: 44, y: -17): [Wall], - (x: 44, y: -13): [Wall], - (x: 44, y: -12): [Local(FruitsAndVeggies)], (x: 44, y: -11): [Local(FruitsAndVeggies)], (x: 44, y: -10): [Local(FruitsAndVeggies)], (x: 44, y: -9): [Local(FruitsAndVeggies)], @@ -4098,12 +3014,6 @@ (x: 44, y: 23): [Local(FruitsAndVeggies)], (x: 44, y: 24): [Local(FruitsAndVeggies)], (x: 44, y: 25): [Wall], - (x: 45, y: -40): [Wall], - (x: 45, y: -39): [Wall], - (x: 45, y: -18): [Wall], - (x: 45, y: -17): [Wall], - (x: 45, y: -13): [Wall], - (x: 45, y: -12): [Local(FruitsAndVeggies)], (x: 45, y: -11): [Local(FruitsAndVeggies)], (x: 45, y: -10): [Local(FruitsAndVeggies)], (x: 45, y: -9): [Local(FruitsAndVeggies)], @@ -4141,21 +3051,6 @@ (x: 45, y: 23): [Local(FruitsAndVeggies)], (x: 45, y: 24): [Local(FruitsAndVeggies)], (x: 45, y: 25): [Wall], - (x: 46, y: -40): [Wall], - (x: 46, y: -39): [Wall], - (x: 46, y: -38): [Local(ExitZone)], - (x: 46, y: -37): [Local(ExitZone)], - (x: 46, y: -36): [Local(ExitZone)], - (x: 46, y: -35): [Local(ExitZone)], - (x: 46, y: -34): [Local(ExitZone)], - (x: 46, y: -33): [Local(ExitZone)], - (x: 46, y: -32): [Local(ExitZone)], - (x: 46, y: -31): [Local(ExitZone)], - (x: 46, y: -30): [Local(ExitZone)], - (x: 46, y: -18): [Wall], - (x: 46, y: -17): [Wall], - (x: 46, y: -13): [Wall], - (x: 46, y: -12): [Local(FruitsAndVeggies)], (x: 46, y: -11): [Local(FruitsAndVeggies)], (x: 46, y: -10): [Local(FruitsAndVeggies)], (x: 46, y: -9): [Local(FruitsAndVeggies)], @@ -4193,21 +3088,6 @@ (x: 46, y: 23): [Local(FruitsAndVeggies)], (x: 46, y: 24): [Local(FruitsAndVeggies)], (x: 46, y: 25): [Wall], - (x: 47, y: -40): [Wall], - (x: 47, y: -39): [Wall], - (x: 47, y: -38): [Local(ExitZone)], - (x: 47, y: -37): [Local(ExitZone)], - (x: 47, y: -36): [Local(ExitZone)], - (x: 47, y: -35): [Local(ExitZone)], - (x: 47, y: -34): [Local(ExitZone)], - (x: 47, y: -33): [Local(ExitZone)], - (x: 47, y: -32): [Local(ExitZone)], - (x: 47, y: -31): [Local(ExitZone)], - (x: 47, y: -30): [Local(ExitZone)], - (x: 47, y: -18): [Wall], - (x: 47, y: -17): [Wall], - (x: 47, y: -13): [Wall], - (x: 47, y: -12): [Local(FruitsAndVeggies)], (x: 47, y: -11): [Local(FruitsAndVeggies)], (x: 47, y: -10): [Local(FruitsAndVeggies)], (x: 47, y: -9): [Local(FruitsAndVeggies)], @@ -4245,21 +3125,6 @@ (x: 47, y: 23): [Local(FruitsAndVeggies)], (x: 47, y: 24): [Local(FruitsAndVeggies)], (x: 47, y: 25): [Wall], - (x: 48, y: -40): [Wall], - (x: 48, y: -39): [Wall], - (x: 48, y: -38): [Local(ExitZone)], - (x: 48, y: -37): [Local(ExitZone)], - (x: 48, y: -36): [Local(ExitZone)], - (x: 48, y: -35): [Local(ExitZone)], - (x: 48, y: -34): [Local(ExitZone)], - (x: 48, y: -33): [Local(ExitZone)], - (x: 48, y: -32): [Local(ExitZone)], - (x: 48, y: -31): [Local(ExitZone)], - (x: 48, y: -30): [Local(ExitZone)], - (x: 48, y: -18): [Wall], - (x: 48, y: -17): [Wall], - (x: 48, y: -13): [Wall], - (x: 48, y: -12): [Local(FruitsAndVeggies)], (x: 48, y: -11): [Local(FruitsAndVeggies)], (x: 48, y: -10): [Local(FruitsAndVeggies)], (x: 48, y: -9): [Local(FruitsAndVeggies)], @@ -4297,21 +3162,6 @@ (x: 48, y: 23): [Local(FruitsAndVeggies)], (x: 48, y: 24): [Local(FruitsAndVeggies)], (x: 48, y: 25): [Wall], - (x: 49, y: -40): [Wall], - (x: 49, y: -39): [Wall], - (x: 49, y: -38): [Local(ExitZone)], - (x: 49, y: -37): [Local(ExitZone)], - (x: 49, y: -36): [Local(ExitZone)], - (x: 49, y: -35): [Local(ExitZone)], - (x: 49, y: -34): [Local(ExitZone)], - (x: 49, y: -33): [Local(ExitZone)], - (x: 49, y: -32): [Local(ExitZone)], - (x: 49, y: -31): [Local(ExitZone)], - (x: 49, y: -30): [Local(ExitZone)], - (x: 49, y: -18): [Wall], - (x: 49, y: -17): [Wall], - (x: 49, y: -13): [Wall], - (x: 49, y: -12): [Local(FruitsAndVeggies)], (x: 49, y: -11): [Local(FruitsAndVeggies)], (x: 49, y: -10): [Local(FruitsAndVeggies)], (x: 49, y: -9): [Local(FruitsAndVeggies)], @@ -4349,21 +3199,6 @@ (x: 49, y: 23): [Local(FruitsAndVeggies)], (x: 49, y: 24): [Local(FruitsAndVeggies)], (x: 49, y: 25): [Wall], - (x: 50, y: -40): [Wall], - (x: 50, y: -39): [Wall], - (x: 50, y: -38): [Local(ExitZone)], - (x: 50, y: -37): [Local(ExitZone)], - (x: 50, y: -36): [Local(ExitZone)], - (x: 50, y: -35): [Local(ExitZone)], - (x: 50, y: -34): [Local(ExitZone)], - (x: 50, y: -33): [Local(ExitZone)], - (x: 50, y: -32): [Local(ExitZone)], - (x: 50, y: -31): [Local(ExitZone)], - (x: 50, y: -30): [Local(ExitZone)], - (x: 50, y: -18): [Wall], - (x: 50, y: -17): [Wall], - (x: 50, y: -13): [Wall], - (x: 50, y: -12): [Local(FruitsAndVeggies)], (x: 50, y: -11): [Local(FruitsAndVeggies)], (x: 50, y: -10): [Local(FruitsAndVeggies)], (x: 50, y: -9): [Local(FruitsAndVeggies)], @@ -4401,21 +3236,6 @@ (x: 50, y: 23): [Local(FruitsAndVeggies)], (x: 50, y: 24): [Local(FruitsAndVeggies)], (x: 50, y: 25): [Wall], - (x: 51, y: -40): [Wall], - (x: 51, y: -39): [Wall], - (x: 51, y: -38): [Local(ExitZone)], - (x: 51, y: -37): [Local(ExitZone)], - (x: 51, y: -36): [Local(ExitZone)], - (x: 51, y: -35): [Local(ExitZone)], - (x: 51, y: -34): [Local(ExitZone)], - (x: 51, y: -33): [Local(ExitZone)], - (x: 51, y: -32): [Local(ExitZone)], - (x: 51, y: -31): [Local(ExitZone)], - (x: 51, y: -30): [Local(ExitZone)], - (x: 51, y: -18): [Wall], - (x: 51, y: -17): [Wall], - (x: 51, y: -13): [Wall], - (x: 51, y: -12): [Local(FruitsAndVeggies)], (x: 51, y: -11): [Local(FruitsAndVeggies)], (x: 51, y: -10): [Local(FruitsAndVeggies)], (x: 51, y: -9): [Local(FruitsAndVeggies)], @@ -4453,21 +3273,6 @@ (x: 51, y: 23): [Local(FruitsAndVeggies)], (x: 51, y: 24): [Local(FruitsAndVeggies)], (x: 51, y: 25): [Wall], - (x: 52, y: -40): [Wall], - (x: 52, y: -39): [Wall], - (x: 52, y: -38): [Local(ExitZone)], - (x: 52, y: -37): [Local(ExitZone)], - (x: 52, y: -36): [Local(ExitZone)], - (x: 52, y: -35): [Local(ExitZone)], - (x: 52, y: -34): [Local(ExitZone)], - (x: 52, y: -33): [Local(ExitZone)], - (x: 52, y: -32): [Local(ExitZone)], - (x: 52, y: -31): [Local(ExitZone)], - (x: 52, y: -30): [Local(ExitZone)], - (x: 52, y: -18): [Wall], - (x: 52, y: -17): [Wall], - (x: 52, y: -13): [Wall], - (x: 52, y: -12): [Local(FruitsAndVeggies)], (x: 52, y: -11): [Local(FruitsAndVeggies)], (x: 52, y: -10): [Local(FruitsAndVeggies)], (x: 52, y: -9): [Local(FruitsAndVeggies)], @@ -4505,21 +3310,6 @@ (x: 52, y: 23): [Local(FruitsAndVeggies)], (x: 52, y: 24): [Local(FruitsAndVeggies)], (x: 52, y: 25): [Wall], - (x: 53, y: -40): [Wall], - (x: 53, y: -39): [Wall], - (x: 53, y: -38): [Local(ExitZone)], - (x: 53, y: -37): [Local(ExitZone)], - (x: 53, y: -36): [Local(ExitZone)], - (x: 53, y: -35): [Local(ExitZone)], - (x: 53, y: -34): [Local(ExitZone)], - (x: 53, y: -33): [Local(ExitZone)], - (x: 53, y: -32): [Local(ExitZone)], - (x: 53, y: -31): [Local(ExitZone)], - (x: 53, y: -30): [Local(ExitZone)], - (x: 53, y: -18): [Wall], - (x: 53, y: -17): [Wall], - (x: 53, y: -13): [Wall], - (x: 53, y: -12): [Local(FruitsAndVeggies)], (x: 53, y: -11): [Local(FruitsAndVeggies)], (x: 53, y: -10): [Local(FruitsAndVeggies)], (x: 53, y: -9): [Local(FruitsAndVeggies)], @@ -4557,21 +3347,6 @@ (x: 53, y: 23): [Local(FruitsAndVeggies)], (x: 53, y: 24): [Local(FruitsAndVeggies)], (x: 53, y: 25): [Wall], - (x: 54, y: -40): [Wall], - (x: 54, y: -39): [Wall], - (x: 54, y: -38): [Local(ExitZone)], - (x: 54, y: -37): [Local(ExitZone)], - (x: 54, y: -36): [Local(ExitZone)], - (x: 54, y: -35): [Local(ExitZone)], - (x: 54, y: -34): [Local(ExitZone)], - (x: 54, y: -33): [Local(ExitZone)], - (x: 54, y: -32): [Local(ExitZone)], - (x: 54, y: -31): [Local(ExitZone)], - (x: 54, y: -30): [Local(ExitZone)], - (x: 54, y: -18): [Wall], - (x: 54, y: -17): [Wall], - (x: 54, y: -13): [Wall], - (x: 54, y: -12): [Local(FruitsAndVeggies)], (x: 54, y: -11): [Local(FruitsAndVeggies)], (x: 54, y: -10): [Local(FruitsAndVeggies)], (x: 54, y: -9): [Local(FruitsAndVeggies)], @@ -4609,21 +3384,6 @@ (x: 54, y: 23): [Local(FruitsAndVeggies)], (x: 54, y: 24): [Local(FruitsAndVeggies)], (x: 54, y: 25): [Wall], - (x: 55, y: -40): [Wall], - (x: 55, y: -39): [Wall], - (x: 55, y: -38): [Local(ExitZone)], - (x: 55, y: -37): [Local(ExitZone)], - (x: 55, y: -36): [Local(ExitZone)], - (x: 55, y: -35): [Local(ExitZone)], - (x: 55, y: -34): [Local(ExitZone)], - (x: 55, y: -33): [Local(ExitZone)], - (x: 55, y: -32): [Local(ExitZone)], - (x: 55, y: -31): [Local(ExitZone)], - (x: 55, y: -30): [Local(ExitZone)], - (x: 55, y: -18): [Wall], - (x: 55, y: -17): [Wall], - (x: 55, y: -13): [Wall], - (x: 55, y: -12): [Local(FruitsAndVeggies)], (x: 55, y: -11): [Local(FruitsAndVeggies)], (x: 55, y: -10): [Local(FruitsAndVeggies)], (x: 55, y: -9): [Local(FruitsAndVeggies)], @@ -4661,21 +3421,6 @@ (x: 55, y: 23): [Local(FruitsAndVeggies)], (x: 55, y: 24): [Local(FruitsAndVeggies)], (x: 55, y: 25): [Wall], - (x: 56, y: -40): [Wall], - (x: 56, y: -39): [Wall], - (x: 56, y: -38): [Local(ExitZone)], - (x: 56, y: -37): [Local(ExitZone)], - (x: 56, y: -36): [Local(ExitZone)], - (x: 56, y: -35): [Local(ExitZone)], - (x: 56, y: -34): [Local(ExitZone)], - (x: 56, y: -33): [Local(ExitZone)], - (x: 56, y: -32): [Local(ExitZone)], - (x: 56, y: -31): [Local(ExitZone)], - (x: 56, y: -30): [Local(ExitZone)], - (x: 56, y: -18): [Wall], - (x: 56, y: -17): [Wall], - (x: 56, y: -13): [Wall], - (x: 56, y: -12): [Local(FruitsAndVeggies)], (x: 56, y: -11): [Local(FruitsAndVeggies)], (x: 56, y: -10): [Local(FruitsAndVeggies)], (x: 56, y: -9): [Local(FruitsAndVeggies)], @@ -4713,21 +3458,6 @@ (x: 56, y: 23): [Local(FruitsAndVeggies)], (x: 56, y: 24): [Local(FruitsAndVeggies)], (x: 56, y: 25): [Wall], - (x: 57, y: -40): [Wall], - (x: 57, y: -39): [Wall], - (x: 57, y: -38): [Local(ExitZone)], - (x: 57, y: -37): [Local(ExitZone)], - (x: 57, y: -36): [Local(ExitZone)], - (x: 57, y: -35): [Local(ExitZone)], - (x: 57, y: -34): [Local(ExitZone)], - (x: 57, y: -33): [Local(ExitZone)], - (x: 57, y: -32): [Local(ExitZone)], - (x: 57, y: -31): [Local(ExitZone)], - (x: 57, y: -30): [Local(ExitZone)], - (x: 57, y: -18): [Wall], - (x: 57, y: -17): [Wall], - (x: 57, y: -13): [Wall], - (x: 57, y: -12): [Local(FruitsAndVeggies)], (x: 57, y: -11): [Local(FruitsAndVeggies)], (x: 57, y: -10): [Local(FruitsAndVeggies)], (x: 57, y: -9): [Local(FruitsAndVeggies)], @@ -4765,21 +3495,6 @@ (x: 57, y: 23): [Local(FruitsAndVeggies)], (x: 57, y: 24): [Local(FruitsAndVeggies)], (x: 57, y: 25): [Wall], - (x: 58, y: -40): [Wall], - (x: 58, y: -39): [Wall], - (x: 58, y: -38): [Local(ExitZone)], - (x: 58, y: -37): [Local(ExitZone)], - (x: 58, y: -36): [Local(ExitZone)], - (x: 58, y: -35): [Local(ExitZone)], - (x: 58, y: -34): [Local(ExitZone)], - (x: 58, y: -33): [Local(ExitZone)], - (x: 58, y: -32): [Local(ExitZone)], - (x: 58, y: -31): [Local(ExitZone)], - (x: 58, y: -30): [Local(ExitZone)], - (x: 58, y: -18): [Wall], - (x: 58, y: -17): [Wall], - (x: 58, y: -13): [Wall], - (x: 58, y: -12): [Local(FruitsAndVeggies)], (x: 58, y: -11): [Local(FruitsAndVeggies)], (x: 58, y: -10): [Local(FruitsAndVeggies)], (x: 58, y: -9): [Local(FruitsAndVeggies)], @@ -4817,21 +3532,6 @@ (x: 58, y: 23): [Local(FruitsAndVeggies)], (x: 58, y: 24): [Local(FruitsAndVeggies)], (x: 58, y: 25): [Wall], - (x: 59, y: -40): [Wall], - (x: 59, y: -39): [Wall], - (x: 59, y: -38): [Local(ExitZone)], - (x: 59, y: -37): [Local(ExitZone)], - (x: 59, y: -36): [Local(ExitZone)], - (x: 59, y: -35): [Local(ExitZone)], - (x: 59, y: -34): [Local(ExitZone)], - (x: 59, y: -33): [Local(ExitZone)], - (x: 59, y: -32): [Local(ExitZone)], - (x: 59, y: -31): [Local(ExitZone)], - (x: 59, y: -30): [Local(ExitZone)], - (x: 59, y: -18): [Wall], - (x: 59, y: -17): [Wall], - (x: 59, y: -13): [Wall], - (x: 59, y: -12): [Local(FruitsAndVeggies)], (x: 59, y: -11): [Local(FruitsAndVeggies)], (x: 59, y: -10): [Local(FruitsAndVeggies)], (x: 59, y: -9): [Local(FruitsAndVeggies)], @@ -4869,21 +3569,6 @@ (x: 59, y: 23): [Local(FruitsAndVeggies)], (x: 59, y: 24): [Local(FruitsAndVeggies)], (x: 59, y: 25): [Wall], - (x: 60, y: -40): [Wall], - (x: 60, y: -39): [Wall], - (x: 60, y: -38): [Local(ExitZone)], - (x: 60, y: -37): [Local(ExitZone)], - (x: 60, y: -36): [Local(ExitZone)], - (x: 60, y: -35): [Local(ExitZone)], - (x: 60, y: -34): [Local(ExitZone)], - (x: 60, y: -33): [Local(ExitZone)], - (x: 60, y: -32): [Local(ExitZone)], - (x: 60, y: -31): [Local(ExitZone)], - (x: 60, y: -30): [Local(ExitZone)], - (x: 60, y: -18): [Wall], - (x: 60, y: -17): [Wall], - (x: 60, y: -13): [Wall], - (x: 60, y: -12): [Local(FruitsAndVeggies)], (x: 60, y: -11): [Local(FruitsAndVeggies)], (x: 60, y: -10): [Local(FruitsAndVeggies)], (x: 60, y: -9): [Local(FruitsAndVeggies)], @@ -4921,21 +3606,6 @@ (x: 60, y: 23): [Local(FruitsAndVeggies)], (x: 60, y: 24): [Local(FruitsAndVeggies)], (x: 60, y: 25): [Wall], - (x: 61, y: -40): [Wall], - (x: 61, y: -39): [Wall], - (x: 61, y: -38): [Local(ExitZone)], - (x: 61, y: -37): [Local(ExitZone)], - (x: 61, y: -36): [Local(ExitZone)], - (x: 61, y: -35): [Local(ExitZone)], - (x: 61, y: -34): [Local(ExitZone)], - (x: 61, y: -33): [Local(ExitZone)], - (x: 61, y: -32): [Local(ExitZone)], - (x: 61, y: -31): [Local(ExitZone)], - (x: 61, y: -30): [Local(ExitZone)], - (x: 61, y: -18): [Wall], - (x: 61, y: -17): [Wall], - (x: 61, y: -13): [Wall], - (x: 61, y: -12): [Local(FruitsAndVeggies)], (x: 61, y: -11): [Local(FruitsAndVeggies)], (x: 61, y: -10): [Local(FruitsAndVeggies)], (x: 61, y: -9): [Local(FruitsAndVeggies)], @@ -4973,25 +3643,6 @@ (x: 61, y: 23): [Local(FruitsAndVeggies)], (x: 61, y: 24): [Local(FruitsAndVeggies)], (x: 61, y: 25): [Wall], - (x: 62, y: -40): [Wall], - (x: 62, y: -39): [Wall], - (x: 62, y: -38): [Local(ExitZone)], - (x: 62, y: -37): [Local(ExitZone)], - (x: 62, y: -36): [Local(ExitZone)], - (x: 62, y: -35): [Local(ExitZone)], - (x: 62, y: -34): [Local(ExitZone)], - (x: 62, y: -33): [Local(ExitZone)], - (x: 62, y: -32): [Local(ExitZone)], - (x: 62, y: -31): [Local(ExitZone)], - (x: 62, y: -30): [Local(ExitZone)], - (x: 62, y: -18): [Wall], - (x: 62, y: -17): [Wall], - (x: 62, y: -13): [Wall], - (x: 62, y: -12): [Local(FruitsAndVeggies)], - (x: 62, y: -11): [Local(FruitsAndVeggies)], - (x: 62, y: -10): [Local(FruitsAndVeggies)], - (x: 62, y: -9): [Local(FruitsAndVeggies)], - (x: 62, y: -8): [Local(FruitsAndVeggies)], (x: 62, y: -7): [Local(FruitsAndVeggies)], (x: 62, y: -6): [Local(FruitsAndVeggies)], (x: 62, y: -5): [Local(FruitsAndVeggies)], @@ -5025,16 +3676,6 @@ (x: 62, y: 23): [Local(FruitsAndVeggies)], (x: 62, y: 24): [Local(FruitsAndVeggies)], (x: 62, y: 25): [Wall], - (x: 63, y: -40): [Wall], - (x: 63, y: -39): [Wall], - (x: 63, y: -18): [Wall], - (x: 63, y: -17): [Wall], - (x: 63, y: -13): [Wall], - (x: 63, y: -12): [Local(FruitsAndVeggies)], - (x: 63, y: -11): [Local(FruitsAndVeggies)], - (x: 63, y: -10): [Local(FruitsAndVeggies)], - (x: 63, y: -9): [Local(FruitsAndVeggies)], - (x: 63, y: -8): [Local(FruitsAndVeggies)], (x: 63, y: -7): [Local(FruitsAndVeggies)], (x: 63, y: -6): [Local(FruitsAndVeggies)], (x: 63, y: -5): [Local(FruitsAndVeggies)], @@ -5068,16 +3709,6 @@ (x: 63, y: 23): [Local(FruitsAndVeggies)], (x: 63, y: 24): [Wall], (x: 63, y: 25): [Wall], - (x: 64, y: -40): [Wall], - (x: 64, y: -39): [Wall], - (x: 64, y: -18): [Wall], - (x: 64, y: -17): [Wall], - (x: 64, y: -13): [Wall], - (x: 64, y: -12): [Local(FruitsAndVeggies)], - (x: 64, y: -11): [Local(FruitsAndVeggies)], - (x: 64, y: -10): [Local(FruitsAndVeggies)], - (x: 64, y: -9): [Local(FruitsAndVeggies)], - (x: 64, y: -8): [Local(FruitsAndVeggies)], (x: 64, y: -7): [Local(FruitsAndVeggies)], (x: 64, y: -6): [Local(FruitsAndVeggies)], (x: 64, y: -5): [Local(FruitsAndVeggies)], @@ -5111,11 +3742,6 @@ (x: 64, y: 23): [Wall], (x: 64, y: 24): [Wall], (x: 64, y: 25): [Wall], - (x: 65, y: -40): [Wall], - (x: 65, y: -39): [Wall], - (x: 65, y: -18): [Wall], - (x: 65, y: -17): [Wall], - (x: 65, y: -13): [Wall], (x: 65, y: -7): [Wall], (x: 65, y: -6): [Wall], (x: 65, y: -5): [Wall], @@ -5148,91 +3774,6 @@ (x: 65, y: 22): [Wall], (x: 65, y: 23): [Wall], (x: 65, y: 25): [Wall], - (x: 66, y: -40): [Wall], - (x: 66, y: -39): [Wall], - (x: 66, y: -18): [Wall], - (x: 66, y: -17): [Wall], - (x: 66, y: -13): [Wall], - (x: 66, y: -8): [Wall], (x: 66, y: -7): [Wall], - (x: 67, y: -40): [Wall], - (x: 67, y: -39): [Wall], - (x: 67, y: -18): [Wall], - (x: 67, y: -17): [Wall], - (x: 67, y: -13): [Wall], - (x: 67, y: -9): [Wall], - (x: 67, y: -8): [Wall], - (x: 68, y: -40): [Wall], - (x: 68, y: -39): [Wall], - (x: 68, y: -18): [Wall], - (x: 68, y: -17): [Wall], - (x: 68, y: -13): [Wall], - (x: 68, y: -9): [Wall], - (x: 69, y: -40): [Wall], - (x: 69, y: -39): [Wall], - (x: 69, y: -18): [Wall], - (x: 69, y: -17): [Wall], - (x: 69, y: -13): [Wall], - (x: 69, y: -9): [Wall], - (x: 70, y: -40): [Wall], - (x: 70, y: -39): [Wall], - (x: 70, y: -18): [Wall], - (x: 70, y: -17): [Wall], - (x: 70, y: -13): [Wall], - (x: 70, y: -9): [Wall], - (x: 71, y: -40): [Wall], - (x: 71, y: -39): [Wall], - (x: 71, y: -18): [Wall], - (x: 71, y: -17): [Wall], - (x: 71, y: -13): [Wall], - (x: 71, y: -9): [Wall], - (x: 72, y: -40): [Wall], - (x: 72, y: -39): [Wall], - (x: 72, y: -18): [Wall], - (x: 72, y: -17): [Wall], - (x: 72, y: -13): [Wall], - (x: 72, y: -12): [Wall], - (x: 72, y: -10): [Wall], - (x: 72, y: -9): [Wall], - (x: 73, y: -40): [Wall], - (x: 73, y: -39): [Wall], - (x: 73, y: -38): [Wall], - (x: 73, y: -37): [Wall], - (x: 73, y: -36): [Wall], - (x: 73, y: -35): [Wall], - (x: 73, y: -34): [Wall], - (x: 73, y: -33): [Wall], - (x: 73, y: -32): [Wall], - (x: 73, y: -31): [Wall], - (x: 73, y: -30): [Wall], - (x: 73, y: -29): [Wall], - (x: 73, y: -28): [Wall], - (x: 73, y: -27): [Wall], - (x: 73, y: -26): [Wall], - (x: 73, y: -25): [Wall], - (x: 73, y: -24): [Wall], - (x: 73, y: -23): [Wall], - (x: 73, y: -22): [Wall], - (x: 73, y: -21): [Wall], - (x: 73, y: -20): [Wall], - (x: 73, y: -19): [Wall], - (x: 73, y: -18): [Wall], - (x: 73, y: -17): [Wall], - (x: 73, y: -13): [Wall], - (x: 73, y: -12): [Wall], - (x: 73, y: -11): [Wall], - (x: 73, y: -10): [Wall], - (x: 73, y: -9): [Wall], - (x: 74, y: -40): [Wall], - (x: 74, y: -39): [Wall], - (x: 74, y: -18): [Wall], - (x: 74, y: -17): [Wall], - (x: 74, y: -13): [Wall], - (x: 74, y: -9): [Wall], - (x: 75, y: -40): [Wall], - (x: 75, y: -39): [Wall], - (x: 75, y: -18): [Wall], - (x: 75, y: -17): [Wall], - (x: 75, y: -13): [Wall], }, ) \ No newline at end of file diff --git a/main_game/assets/misc/emoji_atlas.png b/main_game/assets/misc/emoji_atlas.png index 47003316..afe404af 100644 Binary files a/main_game/assets/misc/emoji_atlas.png and b/main_game/assets/misc/emoji_atlas.png differ diff --git a/main_game/assets/residential/indoors/calendar2.png b/main_game/assets/residential/indoors/calendar2.png new file mode 100644 index 00000000..5836ea90 Binary files /dev/null and b/main_game/assets/residential/indoors/calendar2.png differ diff --git a/main_game/assets/residential/indoors/plant_pink.png b/main_game/assets/residential/indoors/plant_pink.png new file mode 100644 index 00000000..03974c16 Binary files /dev/null and b/main_game/assets/residential/indoors/plant_pink.png differ diff --git a/main_game/assets/residential/indoors/plant_yellow.png b/main_game/assets/residential/indoors/plant_yellow.png new file mode 100644 index 00000000..1d6eaf5a Binary files /dev/null and b/main_game/assets/residential/indoors/plant_yellow.png differ diff --git a/main_game/assets/residential/indoors/shelf.png b/main_game/assets/residential/indoors/shelf.png index 1e879d22..a8f9ce2c 100644 Binary files a/main_game/assets/residential/indoors/shelf.png and b/main_game/assets/residential/indoors/shelf.png differ diff --git a/main_game/assets/residential/indoors/shelf_wide.png b/main_game/assets/residential/indoors/shelf_wide.png index 4c3b5d31..6aab0f33 100644 Binary files a/main_game/assets/residential/indoors/shelf_wide.png and b/main_game/assets/residential/indoors/shelf_wide.png differ diff --git a/main_game/assets/residential/indoors/wall_fish.png b/main_game/assets/residential/indoors/wall_fish.png new file mode 100644 index 00000000..363551f9 Binary files /dev/null and b/main_game/assets/residential/indoors/wall_fish.png differ diff --git a/main_game/assets/residential/indoors/wall_fish2.png b/main_game/assets/residential/indoors/wall_fish2.png new file mode 100644 index 00000000..105761dc Binary files /dev/null and b/main_game/assets/residential/indoors/wall_fish2.png differ diff --git a/main_game/assets/scenes/barn.tscn b/main_game/assets/scenes/barn.tscn new file mode 100644 index 00000000..a81157d7 --- /dev/null +++ b/main_game/assets/scenes/barn.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=3 format=3 uid="uid://dajava8pv8ysd"] + +[ext_resource type="Texture2D" uid="uid://bo4wq2i0bkr8c" path="res://assets/compound/barn_interior.png" id="1_2glsl"] +[ext_resource type="Texture2D" uid="uid://dhbfxi5fhc2uf" path="res://assets/residential/indoors/wall_fish2.png" id="2_ukrpc"] + +[node name="Node2D" type="Node2D"] + +[node name="BarnInterior" type="Sprite2D" parent="."] +position = Vector2(-23, 14) +texture = ExtResource("1_2glsl") + +[node name="WallFish3" type="Sprite2D" parent="."] +position = Vector2(74, -60) +texture = ExtResource("2_ukrpc") diff --git a/main_game/assets/scenes/compound.tscn b/main_game/assets/scenes/compound.tscn index 8b5dd966..fbc1453a 100644 --- a/main_game/assets/scenes/compound.tscn +++ b/main_game/assets/scenes/compound.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=3 uid="uid://cfuxf3w4hro7y"] +[gd_scene load_steps=31 format=3 uid="uid://cfuxf3w4hro7y"] [ext_resource type="Texture2D" uid="uid://58ji12gkirbl" path="res://assets/compound/compound_bg.png" id="1_ubi6a"] [ext_resource type="Texture2D" uid="uid://cfg13e2oo8f38" path="res://assets/downtown/fence_stone.png" id="2_0w2gu"] @@ -28,6 +28,8 @@ [ext_resource type="Texture2D" uid="uid://befj4fdhgdkwi" path="res://assets/environment/mushroom3.png" id="26_kl1iv"] [ext_resource type="Texture2D" uid="uid://oroa0xkc4ok0" path="res://assets/downtown/hanging_plants2.png" id="27_sx323"] [ext_resource type="Texture2D" uid="uid://bxw8mq2ynsea7" path="res://assets/compound/greenhouse.png" id="28_aojpr"] +[ext_resource type="Texture2D" uid="uid://c2qvs82sxkb4t" path="res://assets/compound/greenhouse_white.png" id="29_2ov1p"] +[ext_resource type="Texture2D" uid="uid://boqfud81ek7xo" path="res://assets/compound/clothing_line.png" id="30_nuyol"] [node name="Compound" type="Node2D"] @@ -312,7 +314,7 @@ texture = ExtResource("3_slirt") position = Vector2(5, 73) [node name="Jehlicnan" type="Sprite2D" parent="AroundBarn"] -position = Vector2(79, 223) +position = Vector2(79, 225) texture = ExtResource("4_codlm") [node name="YSort" type="Node2D" parent="AroundBarn/Jehlicnan"] @@ -478,3 +480,14 @@ texture = ExtResource("28_aojpr") [node name="YSort" type="Node2D" parent="Greenhouse"] position = Vector2(0, 89) + +[node name="GreenhouseWhite" type="Sprite2D" parent="."] +position = Vector2(-965, 102) +texture = ExtResource("29_2ov1p") + +[node name="YSort" type="Node2D" parent="GreenhouseWhite"] +position = Vector2(0, 89) + +[node name="ClothingLine" type="Sprite2D" parent="."] +position = Vector2(-25, 273) +texture = ExtResource("30_nuyol") diff --git a/main_game/assets/scenes/compound_tower.tscn b/main_game/assets/scenes/compound_tower.tscn index 88c9a321..a60fef15 100644 --- a/main_game/assets/scenes/compound_tower.tscn +++ b/main_game/assets/scenes/compound_tower.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://bi775uudi3uy8"] +[gd_scene load_steps=14 format=3 uid="uid://bi775uudi3uy8"] [ext_resource type="Texture2D" uid="uid://cy7cwfigylkyd" path="res://assets/compound/tower_inside.png" id="1_pwn7c"] [ext_resource type="Texture2D" uid="uid://c81eqm7duppl4" path="res://assets/residential/indoors/wall_mirror.png" id="2_av753"] @@ -8,6 +8,8 @@ [ext_resource type="Texture2D" uid="uid://c6g7tke0jjcmg" path="res://assets/residential/indoors/side_table3.png" id="6_seuah"] [ext_resource type="Texture2D" uid="uid://h03jwe4lr73k" path="res://assets/residential/indoors/tissues.png" id="7_66ihp"] [ext_resource type="Texture2D" uid="uid://c4phqysbg8s3" path="res://assets/residential/indoors/oven.png" id="9_i02jj"] +[ext_resource type="Texture2D" uid="uid://b0opuxwhdm2ht" path="res://assets/residential/indoors/wall_fish.png" id="9_splu5"] +[ext_resource type="Texture2D" uid="uid://ce2di0d1v7c3w" path="res://assets/residential/indoors/calendar2.png" id="10_m3ass"] [sub_resource type="AtlasTexture" id="AtlasTexture_q04iu"] atlas = ExtResource("9_i02jj") @@ -39,7 +41,7 @@ position = Vector2(-29, 16) texture = ExtResource("1_pwn7c") [node name="WallMirror" type="Sprite2D" parent="TowerBg"] -position = Vector2(22, -76) +position = Vector2(21, -78) texture = ExtResource("2_av753") [node name="FrontWallRight" type="Sprite2D" parent="."] @@ -78,6 +80,8 @@ position = Vector2(-11, 13) [node name="Stove" type="AnimatedSprite2D" parent="."] position = Vector2(-90, -11) sprite_frames = SubResource("SpriteFrames_jc6xg") +frame = 1 +frame_progress = 0.610486 [node name="YSort" type="Node2D" parent="Stove"] position = Vector2(13, 29) @@ -94,3 +98,11 @@ metadata/zone = "ExitZone" metadata/action = "ExitScene" metadata/label = "Exit" metadata/category = "Default" + +[node name="WallFish" type="Sprite2D" parent="."] +position = Vector2(-67, -38) +texture = ExtResource("9_splu5") + +[node name="Calendar2" type="Sprite2D" parent="."] +position = Vector2(67, -37) +texture = ExtResource("10_m3ass") diff --git a/main_game/assets/scenes/downtown.tscn b/main_game/assets/scenes/downtown.tscn index b1df6d43..9c0e09a8 100644 --- a/main_game/assets/scenes/downtown.tscn +++ b/main_game/assets/scenes/downtown.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=197 format=3 uid="uid://dtow2k2vgk8kg"] +[gd_scene load_steps=208 format=3 uid="uid://dtow2k2vgk8kg"] [ext_resource type="Texture2D" uid="uid://5dhtpbjd5ool" path="res://assets/downtown/bg.png" id="1_ac7tb"] [ext_resource type="Texture2D" uid="uid://kkt2uh6il68y" path="res://assets/downtown/ac_atlas.png" id="2_vxd7e"] @@ -56,6 +56,7 @@ [ext_resource type="Texture2D" uid="uid://bchlvd31glw75" path="res://assets/environment/mushroom.png" id="50_ubqu6"] [ext_resource type="Texture2D" uid="uid://kbiswlluoks" path="res://assets/downtown/plain_trio.png" id="52_ri67k"] [ext_resource type="Texture2D" uid="uid://d15ns425ghlje" path="res://assets/environment/beach_chair.png" id="54_3y7cj"] +[ext_resource type="Texture2D" uid="uid://c8ry8rl5hxv1q" path="res://assets/downtown/house_big.png" id="54_b44kc"] [ext_resource type="Texture2D" uid="uid://cembili6qtat2" path="res://assets/environment/beach_chair_blue.png" id="54_c8hw3"] [ext_resource type="Texture2D" uid="uid://du62a8okal6bm" path="res://assets/environment/umbrella.png" id="56_tmimn"] [ext_resource type="Texture2D" uid="uid://8y26sm5ugw5o" path="res://assets/downtown/electric_antenna.png" id="57_cjxct"] @@ -98,6 +99,8 @@ [ext_resource type="Texture2D" uid="uid://dkdeafwvf6f5h" path="res://assets/downtown/watterfall_atlas.png" id="103_uywo5"] [ext_resource type="Texture2D" uid="uid://60ugx27a137v" path="res://assets/downtown/wall_stone_fence_vertical.png" id="103_vkery"] [ext_resource type="Texture2D" uid="uid://bjgm5fviny1y5" path="res://assets/environment/rock_atlas.png" id="105_ebl5n"] +[ext_resource type="Texture2D" uid="uid://pwifle8ahh0t" path="res://assets/environment/sand_castle_atlas.png" id="105_y3ny0"] +[ext_resource type="Texture2D" uid="uid://np0excjbnmpb" path="res://assets/environment/wave_atlas.png" id="106_k1x1h"] [ext_resource type="Texture2D" uid="uid://dkfxoywhhxmth" path="res://assets/environment/rock_atlas2.png" id="106_p6rmm"] [ext_resource type="Texture2D" uid="uid://dfpdrfyab8lnf" path="res://assets/environment/stain1.png" id="107_6vnka"] [ext_resource type="Texture2D" uid="uid://dlfp1v8h2fqb6" path="res://assets/downtown/building_abandoned.png" id="109_bu4df"] @@ -121,6 +124,7 @@ [ext_resource type="Texture2D" uid="uid://b3cvi5c0kohk7" path="res://assets/food/food_cointainer.png" id="117_swtnr"] [ext_resource type="Texture2D" uid="uid://flmsi8faj5jk" path="res://assets/downtown/electric_antenna2.png" id="119_j4h0q"] [ext_resource type="Texture2D" uid="uid://1r1hvvyh00iu" path="res://assets/downtown/hanging_plants3.png" id="121_nkue0"] +[ext_resource type="Texture2D" uid="uid://d3lmwm3dvtbtv" path="res://assets/environment/flipflops.png" id="125_hos4p"] [sub_resource type="AtlasTexture" id="AtlasTexture_wx86m"] atlas = ExtResource("4_fu7bc") @@ -367,6 +371,57 @@ animations = [{ "speed": 2.0 }] +[sub_resource type="AtlasTexture" id="AtlasTexture_wnvun"] +atlas = ExtResource("105_y3ny0") +region = Rect2(0, 0, 28, 36) + +[sub_resource type="AtlasTexture" id="AtlasTexture_miq6o"] +atlas = ExtResource("105_y3ny0") +region = Rect2(28, 0, 28, 36) + +[sub_resource type="SpriteFrames" id="SpriteFrames_lveak"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_wnvun") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_miq6o") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="AtlasTexture" id="AtlasTexture_k288e"] +atlas = ExtResource("106_k1x1h") +region = Rect2(0, 0, 131, 45) + +[sub_resource type="AtlasTexture" id="AtlasTexture_h0j3x"] +atlas = ExtResource("106_k1x1h") +region = Rect2(131, 0, 131, 45) + +[sub_resource type="AtlasTexture" id="AtlasTexture_58k3m"] +atlas = ExtResource("106_k1x1h") +region = Rect2(262, 0, 131, 45) + +[sub_resource type="SpriteFrames" id="SpriteFrames_0721s"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_k288e") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_h0j3x") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_58k3m") +}], +"loop": true, +"name": &"default", +"speed": 3.0 +}] + [sub_resource type="AtlasTexture" id="AtlasTexture_8vkgk"] atlas = ExtResource("98_4wrme") region = Rect2(0, 0, 26, 54) @@ -686,7 +741,7 @@ position = Vector2(233, 477) texture = ExtResource("1_ac7tb") [node name="VendingMachine" type="AnimatedSprite2D" parent="DowntownBg"] -position = Vector2(698, 477) +position = Vector2(670, 476.5) sprite_frames = SubResource("SpriteFrames_2ei51") [node name="YSort" type="Node2D" parent="DowntownBg/VendingMachine"] @@ -1348,11 +1403,16 @@ frame_progress = 0.781913 position = Vector2(-1, -68) [node name="Block3Root" type="Node2D" parent="."] +position = Vector2(0, -12) [node name="PlainTrio" type="Sprite2D" parent="Block3Root"] position = Vector2(1282, 324) texture = ExtResource("52_ri67k") +[node name="HouseBig" type="Sprite2D" parent="Block3Root/PlainTrio"] +position = Vector2(78.5, 0.5) +texture = ExtResource("54_b44kc") + [node name="YSort" type="Node2D" parent="Block3Root/PlainTrio"] position = Vector2(-1, 102) @@ -1370,6 +1430,13 @@ frame_progress = 1.0 [node name="YSort" type="Node2D" parent="Block3Root/PlainTrio/AcAtlas"] position = Vector2(0, 16) +[node name="PottedBush3" type="Sprite2D" parent="Block3Root/PlainTrio"] +position = Vector2(117, 93) +texture = ExtResource("113_wa5al") + +[node name="YSort" type="Node2D" parent="Block3Root/PlainTrio/PottedBush3"] +position = Vector2(1, 16) + [node name="Block2Root" type="Node2D" parent="."] [node name="HousePlantshoptrio" type="Sprite2D" parent="Block2Root"] @@ -5552,7 +5619,7 @@ position = Vector2(123, -102) texture = ExtResource("119_j4h0q") [node name="BinBag2" type="Sprite2D" parent="ShoreRoot"] -position = Vector2(903, 965) +position = Vector2(875, 964.5) texture = ExtResource("37_kbqnk") [node name="BeachStairs4" type="Sprite2D" parent="ShoreRoot"] @@ -5635,6 +5702,24 @@ z_index = -3 position = Vector2(233, 1408) texture = ExtResource("96_h5ain") +[node name="sandcastle" type="AnimatedSprite2D" parent="ShoreRoot/BeachFront"] +position = Vector2(-790, -197) +sprite_frames = SubResource("SpriteFrames_lveak") +autoplay = "default" +frame_progress = 0.988922 + +[node name="wave" type="AnimatedSprite2D" parent="ShoreRoot/BeachFront"] +position = Vector2(84, -135) +sprite_frames = SubResource("SpriteFrames_0721s") +autoplay = "default" +frame_progress = 0.999287 + +[node name="wave2" type="AnimatedSprite2D" parent="ShoreRoot/BeachFront"] +position = Vector2(206, -152) +sprite_frames = SubResource("SpriteFrames_0721s") +autoplay = "default" +frame_progress = 0.29839 + [node name="Manhole" type="Sprite2D" parent="."] z_index = -1 position = Vector2(-780, 412) @@ -10687,11 +10772,6 @@ z_index = -6 position = Vector2(852, 576) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1210" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(876, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1211" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(852, 612) @@ -10702,16 +10782,6 @@ z_index = -6 position = Vector2(876, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1213" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(900, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1214" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(924, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1215" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(900, 612) @@ -10722,16 +10792,6 @@ z_index = -6 position = Vector2(924, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1217" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(948, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1218" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(972, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1219" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(948, 612) @@ -10742,16 +10802,6 @@ z_index = -6 position = Vector2(972, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1221" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(996, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1222" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1020, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1223" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(996, 612) @@ -10762,16 +10812,6 @@ z_index = -6 position = Vector2(1020, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1225" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1044, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1226" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1068, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1227" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(1044, 612) @@ -10782,16 +10822,6 @@ z_index = -6 position = Vector2(1068, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1229" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1092, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1230" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1116, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1231" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(1092, 612) @@ -10802,16 +10832,6 @@ z_index = -6 position = Vector2(1116, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1233" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1140, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1234" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1164, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1235" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(1140, 612) @@ -10822,16 +10842,6 @@ z_index = -6 position = Vector2(1164, 612) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1237" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1188, 576) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1238" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1212, 576) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1239" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(1188, 612) @@ -13497,21 +13507,11 @@ z_index = -6 position = Vector2(1038, 396) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1380" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1134, 432) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1384" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(1230, 432) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1385" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(1158, 432) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1387" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(1014, 432) @@ -13587,31 +13587,6 @@ z_index = -6 position = Vector2(852, 396) texture = ExtResource("82_65uwp") -[node name="Dlazdicky1289" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(924, 432) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1290" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(948, 432) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1291" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(876, 432) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1292" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(900, 432) -texture = ExtResource("82_65uwp") - -[node name="Dlazdicky1293" type="Sprite2D" parent="dlazdickyRoot"] -z_index = -6 -position = Vector2(972, 432) -texture = ExtResource("82_65uwp") - [node name="Dlazdicky1294" type="Sprite2D" parent="dlazdickyRoot"] z_index = -6 position = Vector2(996, 432) @@ -13925,7 +13900,7 @@ sprite_frames = SubResource("SpriteFrames_lnl2b") position = Vector2(0, 11) [node name="BinGreen4" type="AnimatedSprite2D" parent="."] -position = Vector2(1086, 425) +position = Vector2(1086, 410.5) sprite_frames = SubResource("SpriteFrames_03ayo") [node name="YSort" type="Node2D" parent="BinGreen4"] @@ -14013,13 +13988,6 @@ texture = ExtResource("112_j7024") position = Vector2(924, -219) texture = ExtResource("113_wa5al") -[node name="PottedBush3" type="Sprite2D" parent="."] -position = Vector2(1399, 417) -texture = ExtResource("113_wa5al") - -[node name="YSort" type="Node2D" parent="PottedBush3"] -position = Vector2(1, 16) - [node name="PottedBush4" type="Sprite2D" parent="."] position = Vector2(717, 953) texture = ExtResource("113_wa5al") @@ -14097,21 +14065,21 @@ position = Vector2(254.5, -396.5) texture = ExtResource("119_j4h0q") [node name="PottedBush5" type="Sprite2D" parent="."] -position = Vector2(355, 401) +position = Vector2(355, 400) texture = ExtResource("113_wa5al") [node name="YSort" type="Node2D" parent="PottedBush5"] position = Vector2(1, 15) [node name="PottedBush6" type="Sprite2D" parent="."] -position = Vector2(325, 93) +position = Vector2(325, 92) texture = ExtResource("113_wa5al") [node name="YSort" type="Node2D" parent="PottedBush6"] position = Vector2(1, 15) [node name="ElectricPole6" type="Sprite2D" parent="."] -position = Vector2(1064, 374) +position = Vector2(1064, 359.5) texture = ExtResource("114_6se48") [node name="YSort" type="Node2D" parent="ElectricPole6"] @@ -14123,3 +14091,14 @@ texture = ExtResource("114_6se48") [node name="YSort" type="Node2D" parent="ElectricPole7"] position = Vector2(1, 65) + +[node name="ElectricPole8" type="Sprite2D" parent="."] +position = Vector2(52, 924) +texture = ExtResource("114_6se48") + +[node name="YSort" type="Node2D" parent="ElectricPole8"] +position = Vector2(1, 65) + +[node name="Flipflops" type="Sprite2D" parent="."] +position = Vector2(-241, 1269) +texture = ExtResource("125_hos4p") diff --git a/main_game/assets/scenes/plant_shop.tscn b/main_game/assets/scenes/plant_shop.tscn index 757813ad..05c56d9c 100644 --- a/main_game/assets/scenes/plant_shop.tscn +++ b/main_game/assets/scenes/plant_shop.tscn @@ -1,51 +1,53 @@ -[gd_scene load_steps=41 format=3 uid="uid://dek7ps022pco7"] - -[ext_resource type="Texture2D" uid="uid://y85joqp8cjui" path="res://assets/downtown/plantshop_bg.png" id="1_bruju"] -[ext_resource type="Texture2D" uid="uid://cve0p1fj5bjp3" path="res://assets/downtown/recycle_bin.png" id="2_gim71"] -[ext_resource type="Texture2D" uid="uid://dhaf0k2asaokq" path="res://assets/residential/indoors/kasa.png" id="3_7v53w"] -[ext_resource type="Texture2D" uid="uid://cmpcrhxx5t7as" path="res://assets/downtown/potted_bush.png" id="6_uoc65"] -[ext_resource type="Texture2D" uid="uid://d2vp7noe41pcw" path="res://assets/downtown/fire_ex.png" id="7_2xqcs"] -[ext_resource type="Texture2D" uid="uid://n7a6tiu6ldos" path="res://assets/residential/indoors/shelf.png" id="8_52cf7"] -[ext_resource type="Texture2D" uid="uid://b8hs5svb3tnxq" path="res://assets/residential/indoors/plant2.png" id="9_5sdla"] -[ext_resource type="Texture2D" uid="uid://bivyqy838wdmo" path="res://assets/residential/indoors/plant3.png" id="10_ejop8"] -[ext_resource type="Texture2D" uid="uid://bbfjt8xxpma87" path="res://assets/environment/cactus.png" id="10_n7jia"] -[ext_resource type="Texture2D" uid="uid://c07goj3d4hpxn" path="res://assets/residential/indoors/plant1.png" id="11_xm18b"] -[ext_resource type="Texture2D" uid="uid://f3fdi3udqdyk" path="res://assets/residential/indoors/plant1_pink.png" id="12_8vj2d"] -[ext_resource type="Texture2D" uid="uid://bkhrbsy2krgi3" path="res://assets/residential/indoors/counter_wide.png" id="13_f2gnt"] -[ext_resource type="Texture2D" uid="uid://c1dw7702bh2v4" path="res://assets/residential/indoors/plantshop_painting.png" id="13_fsohl"] -[ext_resource type="Texture2D" uid="uid://dwdxmv6sakwvv" path="res://assets/residential/indoors/shelf_wide.png" id="14_afqnm"] -[ext_resource type="Texture2D" uid="uid://em4ccqpcl5lf" path="res://assets/residential/indoors/counter_wide_purple.png" id="15_c65y4"] -[ext_resource type="Texture2D" uid="uid://6hbgcmhcpcc2" path="res://assets/environment/seedlings.png" id="17_5kiyl"] -[ext_resource type="Texture2D" uid="uid://bkv7f7wxjfce5" path="res://assets/residential/indoors/cupboard2.png" id="17_xg3n8"] -[ext_resource type="Texture2D" uid="uid://bm2mbjo28hf6p" path="res://assets/residential/indoors/sign_seedling.png" id="18_mulg4"] -[ext_resource type="Texture2D" uid="uid://d12k76fyavn8r" path="res://assets/environment/box_cardboard_sideways.png" id="20_ewfv5"] -[ext_resource type="Texture2D" uid="uid://binrcblg113cg" path="res://assets/downtown/sipek.png" id="21_7cf1p"] -[ext_resource type="Texture2D" uid="uid://ctld20njtutkn" path="res://assets/residential/indoors/plant4.png" id="23_6cdwa"] -[ext_resource type="Texture2D" uid="uid://djmvsrpel7581" path="res://assets/downtown/hanging_plants.png" id="24_0wcvj"] -[ext_resource type="Texture2D" uid="uid://b4a3whtmf6xdw" path="res://assets/residential/indoors/bonsai1.png" id="25_5xd81"] -[ext_resource type="Texture2D" uid="uid://cg8d5fjpqggrn" path="res://assets/residential/indoors/bonsai2.png" id="26_kqran"] -[ext_resource type="Texture2D" uid="uid://b14mlmbyhohro" path="res://assets/residential/indoors/plant_price_white.png" id="27_rp2pe"] -[ext_resource type="Texture2D" uid="uid://071uthjg3rjk" path="res://assets/residential/indoors/scissors.png" id="28_inwkg"] -[ext_resource type="Texture2D" uid="uid://bsonlbmrwtun4" path="res://assets/residential/indoors/cactus1.png" id="29_4bhrk"] -[ext_resource type="Texture2D" uid="uid://5egjodqauotm" path="res://assets/residential/indoors/room_light_big.png" id="29_huixs"] -[ext_resource type="Texture2D" uid="uid://ditvesqsh354d" path="res://assets/residential/indoors/room_light_wide.png" id="29_ngqf5"] -[ext_resource type="Texture2D" uid="uid://cgw4pux24k3id" path="res://assets/residential/indoors/room_light_wide_down.png" id="30_5faay"] -[ext_resource type="Texture2D" uid="uid://b3cy4yxplws8u" path="res://assets/residential/indoors/certificat.png" id="31_kyslc"] -[ext_resource type="Texture2D" uid="uid://ds4y5uncew47s" path="res://assets/residential/indoors/chair_wood.png" id="32_t16ue"] -[ext_resource type="Texture2D" uid="uid://biuvbns76bhli" path="res://assets/residential/indoors/clinic_cart.png" id="33_h6ewb"] -[ext_resource type="Texture2D" uid="uid://bx3yun47ioafw" path="res://assets/residential/indoors/shelf_back.png" id="34_mpg0u"] -[ext_resource type="Texture2D" uid="uid://yeropcrtoym5" path="res://assets/environment/seedlings_small.png" id="35_apwcw"] -[ext_resource type="Texture2D" uid="uid://gct2bhm8l4y4" path="res://assets/environment/seedlings_smallb.png" id="36_m5ifd"] -[ext_resource type="Texture2D" uid="uid://yae5xc8l5bk3" path="res://assets/residential/indoors/plant_bigger.png" id="37_qj5jv"] -[ext_resource type="Texture2D" uid="uid://dy22d0k768xwt" path="res://assets/residential/indoors/plant_sunflower.png" id="38_wlwqc"] -[ext_resource type="Texture2D" uid="uid://laiof2djlcoc" path="res://assets/residential/indoors/plant_biggest.png" id="39_l3lyd"] -[ext_resource type="Texture2D" uid="uid://ccpux3rqyc01t" path="res://assets/downtown/bamboo_rooftop.png" id="40_2ygpf"] +[gd_scene load_steps=43 format=3 uid="uid://dek7ps022pco7"] + +[ext_resource type="Texture2D" uid="uid://cuwfijdxd5o6e" path="res://assets/downtown/plantshop_bg.png" id="1_bruju"] +[ext_resource type="Texture2D" uid="uid://wm712yivg1yb" path="res://assets/downtown/recycle_bin.png" id="2_gim71"] +[ext_resource type="Texture2D" uid="uid://bag78oh6iy4yh" path="res://assets/residential/indoors/kasa.png" id="3_7v53w"] +[ext_resource type="Texture2D" uid="uid://vi408ocivnm8" path="res://assets/downtown/potted_bush.png" id="6_uoc65"] +[ext_resource type="Texture2D" uid="uid://bgxjf52tb71jx" path="res://assets/downtown/fire_ex.png" id="7_2xqcs"] +[ext_resource type="Texture2D" uid="uid://bgv1impipgm0p" path="res://assets/residential/indoors/shelf.png" id="8_52cf7"] +[ext_resource type="Texture2D" uid="uid://bho6n0f1kb4ht" path="res://assets/residential/indoors/plant2.png" id="9_5sdla"] +[ext_resource type="Texture2D" uid="uid://cx1anpuh8m73i" path="res://assets/residential/indoors/plant3.png" id="10_ejop8"] +[ext_resource type="Texture2D" uid="uid://cxnemcxvsavu6" path="res://assets/environment/cactus.png" id="10_n7jia"] +[ext_resource type="Texture2D" uid="uid://dllv17eqka03" path="res://assets/residential/indoors/plant1.png" id="11_xm18b"] +[ext_resource type="Texture2D" uid="uid://cs5pj38x4vmfy" path="res://assets/residential/indoors/plant1_pink.png" id="12_8vj2d"] +[ext_resource type="Texture2D" uid="uid://bi7l7wb13e4l" path="res://assets/residential/indoors/counter_wide.png" id="13_f2gnt"] +[ext_resource type="Texture2D" uid="uid://dlrv2rk4xwdyl" path="res://assets/residential/indoors/plantshop_painting.png" id="13_fsohl"] +[ext_resource type="Texture2D" uid="uid://rxfvanvsd4y4" path="res://assets/residential/indoors/shelf_wide.png" id="14_afqnm"] +[ext_resource type="Texture2D" uid="uid://coxsyjnhe0ufo" path="res://assets/residential/indoors/counter_wide_purple.png" id="15_c65y4"] +[ext_resource type="Texture2D" uid="uid://b3pe71sg16njb" path="res://assets/environment/seedlings.png" id="17_5kiyl"] +[ext_resource type="Texture2D" uid="uid://c7dracayybs03" path="res://assets/residential/indoors/cupboard2.png" id="17_xg3n8"] +[ext_resource type="Texture2D" uid="uid://dhya6w35c6spd" path="res://assets/residential/indoors/sign_seedling.png" id="18_mulg4"] +[ext_resource type="Texture2D" uid="uid://dolvlk268uyvh" path="res://assets/environment/box_cardboard_sideways.png" id="20_ewfv5"] +[ext_resource type="Texture2D" uid="uid://rubffqe3yvyi" path="res://assets/downtown/sipek.png" id="21_7cf1p"] +[ext_resource type="Texture2D" uid="uid://d0ak2v7256r7w" path="res://assets/residential/indoors/plant4.png" id="23_6cdwa"] +[ext_resource type="Texture2D" uid="uid://be61pdsfo8tko" path="res://assets/downtown/hanging_plants.png" id="24_0wcvj"] +[ext_resource type="Texture2D" uid="uid://dq46d6wb2l4eg" path="res://assets/residential/indoors/bonsai1.png" id="25_5xd81"] +[ext_resource type="Texture2D" uid="uid://77d0n3ppbwcc" path="res://assets/residential/indoors/bonsai2.png" id="26_kqran"] +[ext_resource type="Texture2D" uid="uid://dbwp845fyhv7c" path="res://assets/residential/indoors/plant_price_white.png" id="27_rp2pe"] +[ext_resource type="Texture2D" uid="uid://csgnkc4cpkonu" path="res://assets/residential/indoors/scissors.png" id="28_inwkg"] +[ext_resource type="Texture2D" uid="uid://b6vfhqu2lc543" path="res://assets/residential/indoors/cactus1.png" id="29_4bhrk"] +[ext_resource type="Texture2D" uid="uid://cljme4611al1d" path="res://assets/residential/indoors/room_light_big.png" id="29_huixs"] +[ext_resource type="Texture2D" uid="uid://dysm1ioskcay3" path="res://assets/residential/indoors/room_light_wide.png" id="29_ngqf5"] +[ext_resource type="Texture2D" uid="uid://ldhrjdf1mu13" path="res://assets/residential/indoors/room_light_wide_down.png" id="30_5faay"] +[ext_resource type="Texture2D" uid="uid://cccfvt6xb1rki" path="res://assets/residential/indoors/certificat.png" id="31_kyslc"] +[ext_resource type="Texture2D" uid="uid://cd5s8so082dss" path="res://assets/residential/indoors/chair_wood.png" id="32_t16ue"] +[ext_resource type="Texture2D" uid="uid://nlp1ta0hrg1h" path="res://assets/residential/indoors/clinic_cart.png" id="33_h6ewb"] +[ext_resource type="Texture2D" uid="uid://6x6hfb02k1ib" path="res://assets/residential/indoors/shelf_back.png" id="34_mpg0u"] +[ext_resource type="Texture2D" uid="uid://bvi7uobsh7rtd" path="res://assets/environment/seedlings_small.png" id="35_apwcw"] +[ext_resource type="Texture2D" uid="uid://v05rbwih8g8g" path="res://assets/environment/seedlings_smallb.png" id="36_m5ifd"] +[ext_resource type="Texture2D" uid="uid://jw4hbt7rbkk8" path="res://assets/residential/indoors/plant_bigger.png" id="37_qj5jv"] +[ext_resource type="Texture2D" uid="uid://cylmq0eecvfb0" path="res://assets/residential/indoors/plant_sunflower.png" id="38_wlwqc"] +[ext_resource type="Texture2D" uid="uid://vruek7636g4p" path="res://assets/residential/indoors/plant_biggest.png" id="39_l3lyd"] +[ext_resource type="Texture2D" uid="uid://rjhnkkan4j1y" path="res://assets/downtown/bamboo_rooftop.png" id="40_2ygpf"] +[ext_resource type="Texture2D" uid="uid://k2np3by6tq5r" path="res://assets/residential/indoors/plant_yellow.png" id="41_ia3bp"] +[ext_resource type="Texture2D" uid="uid://bhjno2fr6j6yr" path="res://assets/residential/indoors/plant_pink.png" id="42_v4ulx"] [node name="PlantShop" type="Node2D"] [node name="PlantshopBg" type="Sprite2D" parent="."] z_index = -3 -position = Vector2(0, 30) +position = Vector2(0, 29) texture = ExtResource("1_bruju") [node name="RecycleBin" type="Sprite2D" parent="."] @@ -67,57 +69,57 @@ texture = ExtResource("7_2xqcs") [node name="Shelf" type="Sprite2D" parent="."] z_index = -1 -position = Vector2(29, -85.5) +position = Vector2(31, -87.5) texture = ExtResource("8_52cf7") [node name="Plant2" type="Sprite2D" parent="Shelf"] z_index = 1 -position = Vector2(-17, -27) +position = Vector2(-17, -29) texture = ExtResource("9_5sdla") [node name="Plant3" type="Sprite2D" parent="Shelf"] -position = Vector2(-30, 7) +position = Vector2(-30, 6) texture = ExtResource("10_ejop8") [node name="Plant5" type="Sprite2D" parent="Shelf"] -position = Vector2(-19, 7) +position = Vector2(-19, 6) texture = ExtResource("10_ejop8") flip_h = true [node name="Plant1" type="Sprite2D" parent="Shelf"] -position = Vector2(10, -36) +position = Vector2(6, -38) texture = ExtResource("11_xm18b") [node name="Plant1Pink" type="Sprite2D" parent="Shelf"] -position = Vector2(19, -35.5) +position = Vector2(15, -38.5) texture = ExtResource("12_8vj2d") [node name="Plant1Pink2" type="Sprite2D" parent="Shelf"] -position = Vector2(27, -35.5) +position = Vector2(24, -38.5) texture = ExtResource("12_8vj2d") [node name="Plant4" type="Sprite2D" parent="Shelf"] -position = Vector2(-30, 21) +position = Vector2(-30, 22) texture = ExtResource("10_ejop8") [node name="Cactus2" type="Sprite2D" parent="Shelf"] -position = Vector2(-5, 22) +position = Vector2(-5, 23) texture = ExtResource("10_n7jia") [node name="Bonsai3" type="Sprite2D" parent="Shelf"] -position = Vector2(7, -13.25) +position = Vector2(7, -16.25) texture = ExtResource("25_5xd81") [node name="Bonsai2" type="Sprite2D" parent="Shelf"] -position = Vector2(-21, -13.5) +position = Vector2(-21, -16.5) texture = ExtResource("26_kqran") [node name="Cactus3" type="Sprite2D" parent="Shelf"] -position = Vector2(19, 20.5) +position = Vector2(19, 21.5) texture = ExtResource("29_4bhrk") [node name="Cactus4" type="Sprite2D" parent="Shelf"] -position = Vector2(29, 20.5) +position = Vector2(29, 21.5) texture = ExtResource("29_4bhrk") [node name="PlantshopPainting" type="Sprite2D" parent="."] @@ -132,23 +134,23 @@ texture = ExtResource("13_fsohl") [node name="ShelfWide" type="Sprite2D" parent="."] z_index = -1 -position = Vector2(-147, -86) +position = Vector2(-147, -87) texture = ExtResource("14_afqnm") [node name="Plant1Pink" type="Sprite2D" parent="ShelfWide"] -position = Vector2(25.5, 0.5) +position = Vector2(25.5, -0.5) texture = ExtResource("12_8vj2d") [node name="Plant1" type="Sprite2D" parent="ShelfWide"] -position = Vector2(16.5, 0.5) +position = Vector2(16.5, -0.5) texture = ExtResource("11_xm18b") [node name="Plant3" type="Sprite2D" parent="ShelfWide"] -position = Vector2(7.5, 0.5) +position = Vector2(7.5, -0.5) texture = ExtResource("10_ejop8") [node name="Plant2" type="Sprite2D" parent="ShelfWide"] -position = Vector2(16, -9) +position = Vector2(16, -11) texture = ExtResource("9_5sdla") flip_h = true @@ -161,7 +163,7 @@ position = Vector2(-17, -35) texture = ExtResource("10_n7jia") [node name="Plant5" type="Sprite2D" parent="ShelfWide"] -position = Vector2(173, -38) +position = Vector2(-8, -2) texture = ExtResource("23_6cdwa") [node name="Cactus1" type="Sprite2D" parent="ShelfWide"] @@ -169,7 +171,7 @@ position = Vector2(8, -36) texture = ExtResource("29_4bhrk") [node name="Plant6" type="Sprite2D" parent="ShelfWide"] -position = Vector2(32, 19) +position = Vector2(32, 18) texture = ExtResource("23_6cdwa") [node name="Cupboard2" type="Sprite2D" parent="."] @@ -362,16 +364,12 @@ position = Vector2(-44, -82) texture = ExtResource("37_qj5jv") [node name="PlantSunflower" type="Sprite2D" parent="."] -position = Vector2(58, -102) -texture = ExtResource("38_wlwqc") - -[node name="PlantSunflower2" type="Sprite2D" parent="."] -position = Vector2(-156, -61) +position = Vector2(59, -107) texture = ExtResource("38_wlwqc") flip_h = true -[node name="PlantSunflower3" type="Sprite2D" parent="."] -position = Vector2(-156, -61) +[node name="PlantSunflower2" type="Sprite2D" parent="."] +position = Vector2(-154, -61) texture = ExtResource("38_wlwqc") flip_h = true @@ -388,3 +386,20 @@ texture = ExtResource("15_c65y4") [node name="YSort" type="Node2D" parent="CounterWidePurple3"] position = Vector2(1, 14) + +[node name="PlantYellow" type="Sprite2D" parent="CounterWidePurple3"] +position = Vector2(-140, -61) +texture = ExtResource("41_ia3bp") + +[node name="PlantYellow2" type="Sprite2D" parent="CounterWidePurple3"] +position = Vector2(-30, -16) +texture = ExtResource("41_ia3bp") + +[node name="PlantPink" type="Sprite2D" parent="."] +position = Vector2(2, -24) +texture = ExtResource("42_v4ulx") +flip_h = true + +[node name="PlantPink2" type="Sprite2D" parent="."] +position = Vector2(-173, -69) +texture = ExtResource("42_v4ulx") diff --git a/main_game/assets/ui/phone/app_calendar.png b/main_game/assets/ui/phone/app_calendar.png new file mode 100644 index 00000000..d31f4f44 Binary files /dev/null and b/main_game/assets/ui/phone/app_calendar.png differ diff --git a/main_game/assets/ui/phone/app_contacts.png b/main_game/assets/ui/phone/app_contacts.png new file mode 100644 index 00000000..f8f408bd Binary files /dev/null and b/main_game/assets/ui/phone/app_contacts.png differ diff --git a/main_game/assets/ui/phone/app_crypto.png b/main_game/assets/ui/phone/app_crypto.png new file mode 100644 index 00000000..08be62d5 Binary files /dev/null and b/main_game/assets/ui/phone/app_crypto.png differ diff --git a/main_game/assets/ui/phone/app_email.png b/main_game/assets/ui/phone/app_email.png new file mode 100644 index 00000000..88b24a8c Binary files /dev/null and b/main_game/assets/ui/phone/app_email.png differ diff --git a/main_game/assets/ui/phone/app_map.png b/main_game/assets/ui/phone/app_map.png new file mode 100644 index 00000000..968ef139 Binary files /dev/null and b/main_game/assets/ui/phone/app_map.png differ diff --git a/main_game/assets/ui/phone/app_save.png b/main_game/assets/ui/phone/app_save.png new file mode 100644 index 00000000..3b59e459 Binary files /dev/null and b/main_game/assets/ui/phone/app_save.png differ diff --git a/main_game/assets/ui/phone/app_settings.png b/main_game/assets/ui/phone/app_settings.png new file mode 100644 index 00000000..6aacd35a Binary files /dev/null and b/main_game/assets/ui/phone/app_settings.png differ diff --git a/main_game/assets/ui/phone/app_shopping.png b/main_game/assets/ui/phone/app_shopping.png new file mode 100644 index 00000000..7a24db19 Binary files /dev/null and b/main_game/assets/ui/phone/app_shopping.png differ diff --git a/main_game/assets/ui/phone/bg1.png b/main_game/assets/ui/phone/bg1.png new file mode 100644 index 00000000..8b9b9116 Binary files /dev/null and b/main_game/assets/ui/phone/bg1.png differ diff --git a/main_game/assets/ui/phone/bg2.png b/main_game/assets/ui/phone/bg2.png new file mode 100644 index 00000000..c60055cd Binary files /dev/null and b/main_game/assets/ui/phone/bg2.png differ diff --git a/main_game/assets/ui/phone/bg3.png b/main_game/assets/ui/phone/bg3.png new file mode 100644 index 00000000..0947e244 Binary files /dev/null and b/main_game/assets/ui/phone/bg3.png differ diff --git a/main_game/assets/ui/phone/bg_city.png b/main_game/assets/ui/phone/bg_city.png new file mode 100644 index 00000000..49678026 Binary files /dev/null and b/main_game/assets/ui/phone/bg_city.png differ diff --git a/main_game/assets/ui/phone/bg_forest.png b/main_game/assets/ui/phone/bg_forest.png new file mode 100644 index 00000000..0da1d33a Binary files /dev/null and b/main_game/assets/ui/phone/bg_forest.png differ diff --git a/main_game/assets/ui/phone/bg_heart.png b/main_game/assets/ui/phone/bg_heart.png new file mode 100644 index 00000000..2abca06e Binary files /dev/null and b/main_game/assets/ui/phone/bg_heart.png differ diff --git a/main_game/assets/ui/phone/bg_snow.png b/main_game/assets/ui/phone/bg_snow.png new file mode 100644 index 00000000..fc3b36e1 Binary files /dev/null and b/main_game/assets/ui/phone/bg_snow.png differ diff --git a/main_game/assets/ui/phone/bg_sunset.png b/main_game/assets/ui/phone/bg_sunset.png new file mode 100644 index 00000000..efbd3e54 Binary files /dev/null and b/main_game/assets/ui/phone/bg_sunset.png differ diff --git a/main_game/assets/ui/phone/phone_Alpha.png b/main_game/assets/ui/phone/phone_Alpha.png new file mode 100644 index 00000000..d29dfcdb Binary files /dev/null and b/main_game/assets/ui/phone/phone_Alpha.png differ diff --git a/main_game/assets/ui/phone/phone_mini.png b/main_game/assets/ui/phone/phone_mini.png new file mode 100644 index 00000000..bd92f965 Binary files /dev/null and b/main_game/assets/ui/phone/phone_mini.png differ diff --git a/main_game/assets/ui/phone/phone_pink.png b/main_game/assets/ui/phone/phone_pink.png new file mode 100644 index 00000000..a0efdb56 Binary files /dev/null and b/main_game/assets/ui/phone/phone_pink.png differ diff --git a/scenes/mall/src/autogen/zone_tile_impl.rs b/scenes/mall/src/autogen/zone_tile_impl.rs index 33d60690..6cdc3304 100644 --- a/scenes/mall/src/autogen/zone_tile_impl.rs +++ b/scenes/mall/src/autogen/zone_tile_impl.rs @@ -18,13 +18,12 @@ Self::Fridges => Some(ZoneGroup(1)), } #[inline] fn zone_size(&self) -> Option { #[allow(clippy::match_single_binding)] match self - { Self::ExitZone => Some(153), -Self::GoodWater => Some(40), -Self::FruitsAndVeggies => Some(1139), -Self::Aisle1 => Some(255), + { Self::GoodWater => Some(40), +Self::FruitsAndVeggies => Some(1092), +Self::Aisle1 => Some(234), Self::Aisle2 => Some(471), -Self::Aisle3 => Some(398), -Self::Aisle4 => Some(289), +Self::Aisle3 => Some(394), +Self::Aisle4 => Some(257), Self::Fridges => Some(204), #[allow(unreachable_patterns)] _ => None, } } type Successors = Self; #[inline] fn zone_successors(&self) -> Option<&'static