From 241e41892a10d3913c63935a8f9e14306e8a73cd Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 8 May 2023 21:40:21 +0300 Subject: Made a Singeltion class GameState containg the current state of the game --- src/pinky.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index 29949a7..be9e5dc 100644 --- a/src/pinky.py +++ b/src/pinky.py @@ -43,7 +43,7 @@ class Pinky(Ghost): return (27 * 30 + 15, 30 * 30 + 15) @override - def get_next_move(self, pacman, maze, screen, blinky): + def get_next_move(self, game_state, screen): default_tile = self.get_default_tile() dx = [1, 0, -1, 0] @@ -64,25 +64,25 @@ class Pinky(Ghost): rand_pos = (0, 0) - new_target = self.get_four_tiles_ahead_of_pacman(pacman) + new_target = self.get_four_tiles_ahead_of_pacman(game_state.pacman) if settings.debug: pygame.draw.circle(screen, self.color, (new_target[0], new_target[1]), 15) pygame.draw.circle(screen, self.color, default_tile, 15) - if pacman.powerup: + if game_state.pacman.powerup: self.mode = MODE.FRIGHETENED rand_pos = random.randint(0, 900), random.randint(0, 990) - if pacman.powerup is False and self.mode == MODE.FRIGHETENED: + if game_state.pacman.powerup is False and self.mode == MODE.FRIGHETENED: self.mode = MODE.CHASING for i in range(len(dx)): if i != forbidden: nx = self.x + dx[i] * self.speed ny = self.y + dy[i] * self.speed - if self.check_collision(nx, ny, 30, 30, maze): + if self.check_collision(nx, ny, 30, 30, game_state.map.maze): if self.mode == MODE.SCATTERED: ret[i] = self.heuristic( (nx, ny), default_tile[0], default_tile[1]) -- cgit v1.2.3 From aaf0194f9b5d93bd6612bc0b419c4b8f89b4aa21 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 8 May 2023 23:02:03 +0300 Subject: Added a simple Wining screen when the user collects all the food --- src/pinky.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index be9e5dc..5f58f54 100644 --- a/src/pinky.py +++ b/src/pinky.py @@ -42,6 +42,10 @@ class Pinky(Ghost): def get_default_tile(self): return (27 * 30 + 15, 30 * 30 + 15) + @override + def get_intial_tile(self): + return (11 * 30 + 15, 12 * 30 + 15) + @override def get_next_move(self, game_state, screen): default_tile = self.get_default_tile() @@ -65,11 +69,6 @@ class Pinky(Ghost): rand_pos = (0, 0) new_target = self.get_four_tiles_ahead_of_pacman(game_state.pacman) - if settings.debug: - pygame.draw.circle(screen, self.color, - (new_target[0], new_target[1]), 15) - pygame.draw.circle(screen, self.color, - default_tile, 15) if game_state.pacman.powerup: self.mode = MODE.FRIGHETENED -- cgit v1.2.3 From 5b2e6b7e660865b6db9bfb61e1b1d0fecc536858 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 8 May 2023 23:18:26 +0300 Subject: Added EatenMode --- src/pinky.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index 5f58f54..bb50c5b 100644 --- a/src/pinky.py +++ b/src/pinky.py @@ -70,7 +70,7 @@ class Pinky(Ghost): new_target = self.get_four_tiles_ahead_of_pacman(game_state.pacman) - if game_state.pacman.powerup: + if game_state.pacman.powerup and self.mode != MODE.EATEN: self.mode = MODE.FRIGHETENED rand_pos = random.randint(0, 900), random.randint(0, 990) @@ -91,6 +91,10 @@ class Pinky(Ghost): elif self.mode == MODE.CHASING: ret[i] = self.heuristic( (nx, ny), new_target[0], new_target[1]) + elif self.mode == MODE.EATEN: + pos = self.get_intial_tile() + self.x = pos[0] + self.y = pos[1] if settings.debug: pygame.draw.line(screen, self.color, (new_target), (self.x, self.y), 1) -- cgit v1.2.3