From 67c2b1e811c642d28d86489d81ecd464ce1225de Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 20 Mar 2023 21:24:58 +0200 Subject: Added a functionality to consturct a map from a 2d array --- src/Game.py | 4 +- src/Player.py | 1 - src/map.py | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 2 deletions(-) diff --git a/src/Game.py b/src/Game.py index aedfa0c..bef2b35 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(): @@ -39,6 +40,7 @@ class Game(): 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 + map = Map.Map() # Main game loop running = True @@ -77,7 +79,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 +86,7 @@ class Game(): screen.fill((0, 0, 0)) # Clear the screen + map.draw_map(screen) player.draw(screen, counter) # Update the screen diff --git a/src/Player.py b/src/Player.py index f8ebc06..fe24423 100644 --- a/src/Player.py +++ b/src/Player.py @@ -36,7 +36,6 @@ class Player(): def draw(self, screen, counter): pos = (self.x, self.y) - print(self.direction, DIRECTION.UP) if self.direction == DIRECTION.UP: screen.blit(pygame.transform.rotate(self.sprite[counter // 5], 270), pos) elif self.direction == DIRECTION.DOWN: diff --git a/src/map.py b/src/map.py index e69de29..ee87470 100644 --- a/src/map.py +++ b/src/map.py @@ -0,0 +1,121 @@ +# the map is 2d array of with size (160, 120) +# 0 -> free +# 1 -> vertical line +# 2 -> + +import pygame +import settings as Settings + + +U = 1 +D = 4 +L = 8 +R = 2 + +LU = L | U +LD = L | D +RU = R | U +RD = R | D + + +class Map(): + """ + 0 -> free + 1 -> vertical line + 2 -> horizontal line + 3 -> right, down + + """ + def __init__(self): + self.map = [ + [LU, U, U, U, U, U, U, RU], + [L, 0, 0, 0, 0, 0, 0, R], + [L, 0, LU, 0, RU, 0, 0,R], + [L, 0, 0, 0, 0, 0, 0, R], + [L, 0, 0, 0, 0, 0, 0, R], + [LD, D, D, D, D, D, D, RD], + ] + self.line_length = Settings.settings.width // len(self.map) + self.line_color = (0, 0, 150) + self.line_stroke = 6 + + def consturct_map(self): + pass + + + def draw_wall(self, screen, flag , pos): + if flag & U: + pos1 = pos + pos2 = (pos[0] + self.line_length, pos[1]) + pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) + if flag & D: + pos1 = (pos[0], pos[1] + self.line_length) + pos2 = (pos[0] + self.line_length, pos[1] + self.line_length) + pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) + if flag & R: + pos1 = (pos[0] + self.line_length, pos[1]) + pos2 = (pos[0] + self.line_length, pos[1] + self.line_length) + pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) + if flag & L: + pos1 = pos + pos2 = (pos[0], pos[1] + self.line_length) + pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) + + + + + + def draw_map(self, screen): + rows = len(self.map) + cols = len(self.map[0]) + # ofs = Settings.settings.width // cols + # line_color = (0, 0, 150) + # line_stroke = 6 + for i in range(0, rows): + for j in range(cols): + pos = (j * self.line_length, i * self.line_length) + self.draw_wall(screen, self.map[i][j], pos) + # if self.map[i][j] == 1: + # if i == rows - 1: + # p1 = (j * ofs, (i + 1) * ofs) + # p2 = ((j + 1) * ofs, (i + 1) * ofs) + # else: + # p1 = (j * ofs, i * ofs) + # p2 = ((j + 1) * ofs, i * ofs) + # pygame.draw.line(screen, line_color, p1, p2, line_stroke) + # if self.map[i][j] == 2: + # if j == cols - 1: + # p1 = ((j + 1) * ofs, i * ofs) + # p2 = ((j + 1) * ofs, (i + 1) * ofs) + # else: + # p1 = (j * ofs, i * ofs) + # p2 = (j * ofs, (i + 1) * ofs) + # pygame.draw.line(screen, line_color, p1, p2, line_stroke) + # if self.map[i][j] == 3: + # p1_vertical = (j * ofs, i * ofs) + # p2_vertical = ((j + 1) * ofs, i * ofs) + # p1_horizontal = (j * ofs, i * ofs) + # p2_horizontal = (j * ofs, (i + 1) * ofs) + # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) + # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) + # if self.map[i][j] == 4: + # p1_vertical = (j * ofs, (i + 1) * ofs) + # p2_vertical = ((j + 1) * ofs, (i + 1) * ofs) + # p1_horizontal = (j * ofs, i * ofs) + # p2_horizontal = (j * ofs, (i + 1) * ofs) + # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) + # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) + # if self.map[i][j] == 5: + # p1_vertical = (j * ofs, (i + 1) * ofs) + # p2_vertical = ((j + 1) * ofs, (i + 1) * ofs) + # p1_horizontal = ((j + 1) * ofs, i * ofs) + # p2_horizontal = ((j + 1) * ofs, (i + 1) * ofs) + # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) + # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) + # if self.map[i][j] == 6: + # p1_vertical = (j * ofs, i * ofs) + # p2_vertical = ((j + 1) * ofs, i * ofs) + # p1_horizontal = ((j + 1) * ofs, i * ofs) + # p2_horizontal = ((j + 1) * ofs, (i + 1) * ofs) + # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) + # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) -- cgit v1.2.3 From 8734719d9d0d7b1f04da14e62270d6b64e2956ab Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Tue, 21 Mar 2023 00:40:19 +0200 Subject: Trying to draw the pacman map using the 2dArray --- assets/feh_189639_000001_Sprites.png | Bin 0 -> 14183 bytes src/Player.py | 2 +- src/map.py | 133 +++++++++++++++++++---------------- src/settings.py | 4 +- 4 files changed, 74 insertions(+), 65 deletions(-) create mode 100644 assets/feh_189639_000001_Sprites.png diff --git a/assets/feh_189639_000001_Sprites.png b/assets/feh_189639_000001_Sprites.png new file mode 100644 index 0000000..2cb9b8b Binary files /dev/null and b/assets/feh_189639_000001_Sprites.png differ diff --git a/src/Player.py b/src/Player.py index fe24423..d6a8809 100644 --- a/src/Player.py +++ b/src/Player.py @@ -31,7 +31,7 @@ class Player(): self.x = Settings.settings.width // 2; self.y = Settings.settings.height // 2; self.sprite = get_sprites(sprite_sheet) - self.speed = 5 + self.speed = 10 self.direction = DIRECTION.LEFT def draw(self, screen, counter): diff --git a/src/map.py b/src/map.py index ee87470..0968a7b 100644 --- a/src/map.py +++ b/src/map.py @@ -17,25 +17,78 @@ LD = L | D RU = R | U RD = R | D +M = 11 + class Map(): """ 0 -> free - 1 -> vertical line - 2 -> horizontal line - 3 -> right, down - + 1 -> U + 4 -> D + 8 -> L + 2 -> R + 3 -> RU + 6 -> RD + 9 -> LU + 5 -> LD """ def __init__(self): self.map = [ - [LU, U, U, U, U, U, U, RU], - [L, 0, 0, 0, 0, 0, 0, R], - [L, 0, LU, 0, RU, 0, 0,R], - [L, 0, 0, 0, 0, 0, 0, R], - [L, 0, 0, 0, 0, 0, 0, R], - [LD, D, D, D, D, D, D, RD], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 9, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, 3, 0, 9, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, 3, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 9, U, U, 3, 0, 0, 0, 0, 9, U, U, U, U, 3, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 9, U, U, U, U, 3, 0, 0, 0, 0, 9, U, U, 3, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, L, 0, 0, 0, 0, 0, 0, 0, L, 0, 0, 0, 0, R, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, L, 0, 0, 0, 0, R, 0, 0, 0, 0, L, 0, 0, R, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 5, D, D, 6, 0, 0, 0, 0, 5, D, D, D, D, 6, 0, 0, 0, 0, R, D, L, 0, 0, 0, 0, 5, D, D, D, D, 6, 0, 0, 0, 0, 5, D, D, 6, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 9, U, U, 3, 0, 0, R, U, L, 0, 0, 0, 0, 9, U, U, U, U, U, U, U, U, U, U, U, 3, 0, 0, 0, 0, R, 9, 0, 0, 0, 9, U, U, 3, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 5, D, D, 6, 0, 0, R, 0, L, 0, 0, 0, 0, U, U, U, U, U, 3, 0, 9, U, U, U, U, U, 0, 0, 0, 0, R, L, 0, 0, 0, 5, D, D, 6, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, D, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, D, D, D, D, D, D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, D, D, D, D, D, 3, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, 3, 0, 0, 0, 0, R, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L, 0, 0, 0, 0, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, U, U, U, U, U, U, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, U, U, U, U, U, 9, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + + [0, U, U, U, U, U, U, 0, 0, 0, 0, R, D, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 3, 0, 0, 0, 0, 0, U, U, U, U, U, U, U, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, D, D, D, D, D, D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, D, D, D, D, D, D, D, 0], + + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], + [0, 5, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, 6, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], ] - self.line_length = Settings.settings.width // len(self.map) + self.line_vertical = Settings.settings.width // len(self.map[0]) + self.line_horizontal = Settings.settings.height // len(self.map) self.line_color = (0, 0, 150) self.line_stroke = 6 @@ -46,19 +99,19 @@ class Map(): def draw_wall(self, screen, flag , pos): if flag & U: pos1 = pos - pos2 = (pos[0] + self.line_length, pos[1]) + pos2 = (pos[0] + self.line_vertical, pos[1]) pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) if flag & D: - pos1 = (pos[0], pos[1] + self.line_length) - pos2 = (pos[0] + self.line_length, pos[1] + self.line_length) + pos1 = (pos[0], pos[1] + self.line_horizontal) + pos2 = (pos[0] + self.line_vertical, pos[1] + self.line_horizontal) pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) if flag & R: - pos1 = (pos[0] + self.line_length, pos[1]) - pos2 = (pos[0] + self.line_length, pos[1] + self.line_length) + pos1 = (pos[0] + self.line_vertical, pos[1]) + pos2 = (pos[0] + self.line_vertical, pos[1] + self.line_horizontal) pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) if flag & L: pos1 = pos - pos2 = (pos[0], pos[1] + self.line_length) + pos2 = (pos[0], pos[1] + self.line_horizontal) pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) @@ -73,49 +126,5 @@ class Map(): # line_stroke = 6 for i in range(0, rows): for j in range(cols): - pos = (j * self.line_length, i * self.line_length) + pos = (j * self.line_horizontal, i * self.line_vertical) self.draw_wall(screen, self.map[i][j], pos) - # if self.map[i][j] == 1: - # if i == rows - 1: - # p1 = (j * ofs, (i + 1) * ofs) - # p2 = ((j + 1) * ofs, (i + 1) * ofs) - # else: - # p1 = (j * ofs, i * ofs) - # p2 = ((j + 1) * ofs, i * ofs) - # pygame.draw.line(screen, line_color, p1, p2, line_stroke) - # if self.map[i][j] == 2: - # if j == cols - 1: - # p1 = ((j + 1) * ofs, i * ofs) - # p2 = ((j + 1) * ofs, (i + 1) * ofs) - # else: - # p1 = (j * ofs, i * ofs) - # p2 = (j * ofs, (i + 1) * ofs) - # pygame.draw.line(screen, line_color, p1, p2, line_stroke) - # if self.map[i][j] == 3: - # p1_vertical = (j * ofs, i * ofs) - # p2_vertical = ((j + 1) * ofs, i * ofs) - # p1_horizontal = (j * ofs, i * ofs) - # p2_horizontal = (j * ofs, (i + 1) * ofs) - # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) - # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) - # if self.map[i][j] == 4: - # p1_vertical = (j * ofs, (i + 1) * ofs) - # p2_vertical = ((j + 1) * ofs, (i + 1) * ofs) - # p1_horizontal = (j * ofs, i * ofs) - # p2_horizontal = (j * ofs, (i + 1) * ofs) - # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) - # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) - # if self.map[i][j] == 5: - # p1_vertical = (j * ofs, (i + 1) * ofs) - # p2_vertical = ((j + 1) * ofs, (i + 1) * ofs) - # p1_horizontal = ((j + 1) * ofs, i * ofs) - # p2_horizontal = ((j + 1) * ofs, (i + 1) * ofs) - # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) - # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) - # if self.map[i][j] == 6: - # p1_vertical = (j * ofs, i * ofs) - # p2_vertical = ((j + 1) * ofs, i * ofs) - # p1_horizontal = ((j + 1) * ofs, i * ofs) - # p2_horizontal = ((j + 1) * ofs, (i + 1) * ofs) - # pygame.draw.line(screen, line_color, p1_horizontal, p2_horizontal, line_stroke) - # pygame.draw.line(screen, line_color, p1_vertical, p2_vertical, line_stroke) diff --git a/src/settings.py b/src/settings.py index ba62736..618d8d3 100644 --- a/src/settings.py +++ b/src/settings.py @@ -1,7 +1,7 @@ class Settings(): def __init__(self): - self.width = 640 - self.height = 480 + self.width = 1000 + self.height = 1000 self.fps = 60 settings = Settings() -- cgit v1.2.3 From 53c06e150c11665d82b14219f584b92d06c89b40 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Tue, 21 Mar 2023 15:39:20 +0200 Subject: Added a few more TODOs in Detail and an EXTRA BONUS feauture for the project --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c909b77..afce5ae 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,19 @@ python3 macpan.py - [X] Setup collision with walls - [ ] Load the proper sprites for the map - [ ] Add the ghosts in the game -- [ ] Develop an algorithm to make the ghosts find pacman in the map(BFS, A*) - [ ] Setup the sprite animation for the ghosts +- [ ] Develop an algorithm to make the ghosts find pacman in the map(BFS, A*) +- [ ] Add the Algorithm for Blinky (Normal A*) +- [ ] Add the Algorithm for Pinky (Normal A* + 4 spaces ahead of pacman) +- [ ] Add the Algorithm for Inky (Ambush) +- [ ] Add the Algorithm for Clyde (Same as Blinky excepts when he gets 8 tiles close to pacman he retreats, So he is basically useless) ## Optional - [ ] Setup a menu for the game +- [ ] Setup a simple score system - [ ] Setup a proper sfx/audio for the game - [ ] Add powerups +- [ ] Add firghtening mode for the ghosts + +# EXTRA BONUS +- [ ] Make a nueral network agent that fully plays the game alone using reinforcment learning and PyTorch -- cgit v1.2.3 From c2a57ee13380b17126df50b8dbafa36fc98d7bf0 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Wed, 22 Mar 2023 01:12:33 +0200 Subject: Added the map for pacman using a 2D array describing the map --- src/Game.py | 20 ++++-- src/Player.py | 4 +- src/map.py | 202 +++++++++++++++++++++++++++----------------------------- src/settings.py | 4 +- 4 files changed, 116 insertions(+), 114 deletions(-) diff --git a/src/Game.py b/src/Game.py index bef2b35..9d93786 100644 --- a/src/Game.py +++ b/src/Game.py @@ -29,18 +29,28 @@ 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) + - map = Map.Map() # Main game loop running = True diff --git a/src/Player.py b/src/Player.py index d6a8809..e0128d9 100644 --- a/src/Player.py +++ b/src/Player.py @@ -28,8 +28,8 @@ def get_sprites(sprite_sheet) -> List: class Player(): def __init__(self, sprite_sheet): - self.x = Settings.settings.width // 2; - self.y = Settings.settings.height // 2; + self.x = 450 + self.y = 663 self.sprite = get_sprites(sprite_sheet) self.speed = 10 self.direction = DIRECTION.LEFT diff --git a/src/map.py b/src/map.py index 0968a7b..e05fc2f 100644 --- a/src/map.py +++ b/src/map.py @@ -1,130 +1,122 @@ -# the map is 2d array of with size (160, 120) -# 0 -> free -# 1 -> vertical line -# 2 -> - import pygame +import math import settings as Settings -U = 1 -D = 4 -L = 8 -R = 2 -LU = L | U -LD = L | D -RU = R | U -RD = R | D +H = 1 +V = 2 +D = 4 +BD = 8 +TR = 16 +TL = 32 +BL = 64 +BR = 128 +G = 256 -M = 11 +PI = math.pi class Map(): - """ - 0 -> free - 1 -> U - 4 -> D - 8 -> L - 2 -> R - 3 -> RU - 6 -> RD - 9 -> LU - 5 -> LD - """ def __init__(self): - self.map = [ - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 9, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, 3, 0, 9, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, 3, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 9, U, U, 3, 0, 0, 0, 0, 9, U, U, U, U, 3, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 9, U, U, U, U, 3, 0, 0, 0, 0, 9, U, U, 3, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, L, 0, 0, 0, 0, 0, 0, 0, L, 0, 0, 0, 0, R, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, L, 0, 0, 0, 0, R, 0, 0, 0, 0, L, 0, 0, R, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 5, D, D, 6, 0, 0, 0, 0, 5, D, D, D, D, 6, 0, 0, 0, 0, R, D, L, 0, 0, 0, 0, 5, D, D, D, D, 6, 0, 0, 0, 0, 5, D, D, 6, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 9, U, U, 3, 0, 0, R, U, L, 0, 0, 0, 0, 9, U, U, U, U, U, U, U, U, U, U, U, 3, 0, 0, 0, 0, R, 9, 0, 0, 0, 9, U, U, 3, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 5, D, D, 6, 0, 0, R, 0, L, 0, 0, 0, 0, U, U, U, U, U, 3, 0, 9, U, U, U, U, U, 0, 0, 0, 0, R, L, 0, 0, 0, 5, D, D, 6, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, D, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, D, D, D, D, D, D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, D, D, D, D, D, 3, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, 3, 0, 0, 0, 0, R, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L, 0, 0, 0, 0, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, U, U, U, U, U, U, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, U, U, U, U, U, 9, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - - [0, U, U, U, U, U, U, 0, 0, 0, 0, R, D, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 3, 0, 0, 0, 0, 0, U, U, U, U, U, U, U, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, D, D, D, D, D, D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, D, D, D, D, D, D, D, 0], - - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, M, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R, 0], - [0, 5, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, 6, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + self.maze = [ + [TL, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, TR], + [V, TL, H, H, H, H, H, H, H, H, H, H, H, H, TR, TL, H, H, H, H, H, H, H, H, H, H, H, H, TR, V], + [V, V, D, D, D, D, D, D, D, D, D, D, D, D, V, V, D, D, D, D, D, D, D, D, D, D, D, D, V, V], + [V, V, D, TL, H, H, TR, D, TL, H, H, H, TR, D, V, V, D, TL, H, H, H, TR, D, TL, H, H, TR, D, V, V], + [V, V, BD, V, 0, 0, V, D, V, 0, 0, 0, V, D, V, V, D, V, 0, 0, 0, V, D, V, 0, 0, V, BD, V, V], + [V, V, D, BL, H, H, BR, D, BL, H, H, H, BR, D, BL, BR, D, BL, H, H, H, BR, D, BL, H, H, BR, D, V, V], + [V, V, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, V, V], + [V, V, D, TL, H, H, TR, D, TL, TR, D, TL, H, H, H, H, H, H, TR, D, TL, TR, D, TL, H, H, TR, D, V, V], + [V, V, D, BL, H, H, BR, D, V, V, D, BL, H, H, TR, TL, H, H, BR, D, V, V, D, BL, H, H, BR, D, V, V], + [V, V, D, D, D, D, D, D, V, V, D, D, D, D, V, V, D, D, D, D, V, V, D, D, D, D, D, D, V, V], + [V, BL, H, H, H, H, TR, D, V, BL, H, H, TR, 0, V, V, 0, TL, H, H, BR, V, D, TL, H, H, H, H, BR, V], + [V, 0, 0, 0, 0, 0, V, D, V, TL, H, H, BR, 0, BL, BR, 0, BL, H, H, TR, V, D, V, 0, 0, 0, 0, 0, V], + [V, 0, 0, 0, 0, 0, V, D, V, V, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, V, V, D, V, 0, 0, 0, 0, 0, V], + [BR, 0, 0, 0, 0, 0, V, D, V, V, 0, TL, H, H, G, G, H, H, TR, 0, V, V, D, V, 0, 0, 0, 0, 0, BL], + [H, H, H, H, H, H, BR, D, BL, BR, 0, V, 0, 0, 0, 0, 0, 0, V, 0, BL, BR, D, BL, H, H, H, H, H, H], + [0, 0, 0, 0, 0, 0, 0, D, 0, 0, 0, V, 0, 0, 0, 0, 0, 0, V, 0, 0, 0, D, 0, 0, 0, 0, 0, 0, 0], + [H, H, H, H, H, H, TR, D, TL, TR, 0, V, 0, 0, 0, 0, 0, 0, V, 0, TL, TR, D, TL, H, H, H, H, H, H], + [TR, 0, 0, 0, 0, 0, V, D, V, V, 0, BL, H, H, H, H, H, H, BR, 0, V, V, D, V, 0, 0, 0, 0, 0, TL], + [V, 0, 0, 0, 0, 0, V, D, V, V, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, V, V, D, V, 0, 0, 0, 0, 0, V], + [V, 0, 0, 0, 0, 0, V, D, V, V, 0, TL, H, H, H, H, H, H, TR, 0, V, V, D, V, 0, 0, 0, 0, 0, V], + [V, TL, H, H, H, H, BR, D, BL, BR, 0, BL, H, H, TR, TL, H, H, BR, 0, BL, BR, D, BL, H, H, H, H, TR, V], + [V, V, D, D, D, D, D, D, D, D, D, D, D, D, V, V, D, D, D, D, D, D, D, D, D, D, D, D, V, V], + [V, V, D, TL, H, H, TR, D, TL, H, H, H, TR, D, V, V, D, TL, H, H, H, TR, D, TL, H, H, TR, D, V, V], + [V, V, D, BL, H, TR, V, D, BL, H, H, H, BR, D, BL, BR, D, BL, H, H, H, BR, D, V, TL, H, BR, D, V, V], + [V, V, BD, D, D, V, V, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, V, V, D, D, BD, V, V], + [V, BL, H, TR, D, V, V, D, TL, TR, D, TL, H, H, H, H, H, H, TR, D, TL, TR, D, V, V, D, TL, H, BR, V], + [V, TL, H, BR, D, BL, BR, D, V, V, D, BL, H, H, TR, TL, H, H, BR, D, V, V, D, BL, BR, D, BL, H, TR, V], + [V, V, D, D, D, D, D, D, V, V, D, D, D, D, V, V, D, D, D, D, V, V, D, D, D, D, D, D, V, V], + [V, V, D, TL, H, H, H, H, BR, BL, H, H, TR, D, V, V, D, TL, H, H, BR, BL, H, H, H, H, TR, D, V, V], + [V, V, D, BL, H, H, H, H, H, H, H, H, BR, D, BL, BR, D, BL, H, H, H, H, H, H, H, H, BR, D, V, V], + [V, V, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, V, V], + [V, BL, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, BR, V], + [BL, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, BR] ] - self.line_vertical = Settings.settings.width // len(self.map[0]) - self.line_horizontal = Settings.settings.height // len(self.map) - self.line_color = (0, 0, 150) - self.line_stroke = 6 + self.dot_color = (255, 255, 255) # white + self.small_dot_radius = 4 + self.big_dot_radius = 8 + self.line_color = (0, 0, 255) # Blue + self.line_vertical = Settings.settings.height // len(self.maze) + self.line_horizontal = Settings.settings.width // len(self.maze[0]) + self.line_stroke = 3 def consturct_map(self): pass def draw_wall(self, screen, flag , pos): - if flag & U: - pos1 = pos - pos2 = (pos[0] + self.line_vertical, pos[1]) - pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) - if flag & D: - pos1 = (pos[0], pos[1] + self.line_horizontal) - pos2 = (pos[0] + self.line_vertical, pos[1] + self.line_horizontal) - pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) - if flag & R: - pos1 = (pos[0] + self.line_vertical, pos[1]) - pos2 = (pos[0] + self.line_vertical, pos[1] + self.line_horizontal) + if flag & V: + pos1 = (pos[0] + self.line_vertical * 0.5, pos[1]) + pos2 = (pos1[0], pos1[1] + self.line_horizontal) pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) - if flag & L: - pos1 = pos - pos2 = (pos[0], pos[1] + self.line_horizontal) + if flag & H: + pos1 = (pos[0], pos[1] + self.line_vertical * 0.5) + pos2 = (pos1[0] + self.line_horizontal, pos1[1]) pygame.draw.line(screen, self.line_color, pos1, pos2, self.line_stroke) + if flag & D: + pos1 = (pos[0] + self.line_vertical * 0.5, pos[1] + self.line_horizontal * 0.5) + pygame.draw.circle(screen, self.dot_color, pos1, self.small_dot_radius) + if flag & BD: + pos1 = (pos[0] + self.line_vertical * 0.5, pos[1] + self.line_horizontal * 0.5) + pygame.draw.circle(screen, self.dot_color, pos1, self.big_dot_radius) + if flag & TR: + pos1 = (pos[0] - self.line_vertical * 0.5, pos[1] + self.line_horizontal * 0.5) + arc_rect = pygame.Rect(pos1[0], pos1[1], self.line_vertical, self.line_horizontal) + pygame.draw.arc(screen, self.line_color, arc_rect, 0, PI / 2, self.line_stroke) + if flag & TL: + pos1 = (pos[0] + self.line_vertical * 0.5, pos[1] + self.line_horizontal * 0.5) + arc_rect = pygame.Rect(pos1[0], pos1[1], self.line_vertical, self.line_horizontal) + pygame.draw.arc(screen, self.line_color, arc_rect, PI / 2, PI, self.line_stroke) + if flag & BL: + pos1 = (pos[0] + self.line_vertical * 0.5, pos[1] - self.line_horizontal * 0.5) + arc_rect = pygame.Rect(pos1[0], pos1[1], self.line_vertical, self.line_horizontal) + pygame.draw.arc(screen, self.line_color, arc_rect, PI, 3*PI / 2, self.line_stroke) + if flag & BR: + pos1 = (pos[0] - self.line_vertical * 0.5, pos[1] - self.line_horizontal * 0.5) + arc_rect = pygame.Rect(pos1[0], pos1[1], self.line_vertical, self.line_horizontal) + pygame.draw.arc(screen, self.line_color, arc_rect, 3*PI / 2, PI * 2, self.line_stroke) - - - + + + def draw_map(self, screen): - rows = len(self.map) - cols = len(self.map[0]) - # ofs = Settings.settings.width // cols - # line_color = (0, 0, 150) - # line_stroke = 6 + rows = len(self.maze) + cols = len(self.maze[0]) for i in range(0, rows): for j in range(cols): pos = (j * self.line_horizontal, i * self.line_vertical) - self.draw_wall(screen, self.map[i][j], pos) + self.draw_wall(screen, self.maze[i][j], pos) + + + + + + + + + + + diff --git a/src/settings.py b/src/settings.py index 618d8d3..cdda2a4 100644 --- a/src/settings.py +++ b/src/settings.py @@ -1,7 +1,7 @@ class Settings(): def __init__(self): - self.width = 1000 - self.height = 1000 + self.width = 900 + self.height = 950 self.fps = 60 settings = Settings() -- cgit v1.2.3 From 86b685ec600ed0bffc5dd8ec94850e89a3e7137b Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Wed, 22 Mar 2023 01:13:26 +0200 Subject: Added a new TODO --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index afce5ae..d137568 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ python3 macpan.py - [X] Replace the yellow circle with a pacman sprite - [X] Setup the sprite animation for pacman - [X] Setup collision with walls -- [ ] Load the proper sprites for the map +- [X] Load the proper sprites for the map +- [ ] Setup collision with the map - [ ] Add the ghosts in the game - [ ] Setup the sprite animation for the ghosts - [ ] Develop an algorithm to make the ghosts find pacman in the map(BFS, A*) -- cgit v1.2.3