Merge pull request #1 from omagdy7/Map

Map

1 files changed, 17 insertions, 5 deletions

diff --git a/src/Game.py b/src/Game.py
index aedfa0c..9d93786 100644
--- a/src/Game.py
+++ b/src/Game.py
@@ -1,6 +1,7 @@
 import Player
 from Direction import DIRECTION
 import settings as Settings
+import map as Map
 import pygame
 
 class Game():
@@ -28,16 +29,27 @@ class Game():
 
         clock = pygame.time.Clock()
 
-        # Sprite sheet for pacman
-        sprite_sheet = pygame.image.load('../assets/pacman_left_sprite.png').convert_alpha();
-
         sprite_width, sprite_height = 32, 32
 
 
+        map = Map.Map()
+
+        grid_x = Settings.settings.width // len(map.maze[0])
+        grid_y = (Settings.settings.height - 50) // len(map.maze)
+
 
         # Checks collision with walls
         def check_collision(dx, dy):
-            return player.y + sprite_height + dy > Settings.settings.height or player.y + dy < 0 or player.x + sprite_width + dx > Settings.settings.width or player.x + dx < 0 
+            print(grid_x, grid_y)
+            x = int((player.x + dx) / grid_x)
+            y = int((player.y + dy) / grid_y)
+            print(x, y)
+            print(map.maze[x][y])
+            is_dot = map.maze[x][y] == Map.D
+            is_big_dot = map.maze[x][y] == Map.BD
+            is_free = map.maze[x][y] == 0
+            return not (is_dot or is_free or is_big_dot)
+
 
         # Main game loop
         running = True
@@ -77,7 +89,6 @@ class Game():
                         dy = 0 # Necssarry to move only horizontal or vertical
 
 
-            # print(player.direction)
             # Update the circle's position and checking for collisions
             if not check_collision(dx, dy):
                 player.x += dx
@@ -85,6 +96,7 @@ class Game():
 
             screen.fill((0, 0, 0)) # Clear the screen
 
+            map.draw_map(screen)
             player.draw(screen, counter)
 
             # Update the screen