From 7f501d21772d96756a851421690db08387df3c26 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Sun, 7 May 2023 11:32:10 +0300 Subject: Finished clyde algorithm and added a debug mode to run the program --- src/pinky.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index 42b5d91..191ff61 100644 --- a/src/pinky.py +++ b/src/pinky.py @@ -1,13 +1,14 @@ import pygame from typing_extensions import override from direction import DIRECTION +from settings import settings import math from ghost import Ghost + class Pinky(Ghost): def __init__(self, sprite_sheet, x, y): - super().__init__(sprite_sheet,"pink", x, y) - + super().__init__(sprite_sheet, "pink", x, y) def get_four_tiles_ahead_of_pacman(self, pacman): if pacman.direction == DIRECTION.UP: @@ -36,7 +37,7 @@ class Pinky(Ghost): return (pacman.x, pacman.y) @override - def get_next_move(self, target, maze, screen): + def get_next_move(self, target, maze, screen, blinky): dx = [1, 0, -1, 0] dy = [0, 1, 0, -1] @@ -54,20 +55,20 @@ class Pinky(Ghost): forbidden = 1 new_target = self.get_four_tiles_ahead_of_pacman(target) - pygame.draw.circle(screen, self.color, (new_target[0], new_target[1]), 15) - + if settings.debug: + pygame.draw.circle(screen, self.color, + (new_target[0], new_target[1]), 15) + 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): - ret[i] = self.heuristic((nx, ny), new_target[0], new_target[1]) + ret[i] = self.heuristic( + (nx, ny), new_target[0], new_target[1]) + if settings.debug: + pygame.draw.line(screen, self.color, (new_target), + (self.x, self.y), 1) min_idx = ret.index(min(ret)) return min_idx - - - - - - -- cgit v1.2.3 From 72aeff07de251f66c579405f0aecb0b9c4d4cfac Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 8 May 2023 14:47:07 +0300 Subject: Added scattered mode for the ghosts --- src/pinky.py | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index 191ff61..688163b 100644 --- a/src/pinky.py +++ b/src/pinky.py @@ -1,6 +1,7 @@ import pygame from typing_extensions import override from direction import DIRECTION +from mode import MODE from settings import settings import math from ghost import Ghost @@ -36,8 +37,14 @@ class Pinky(Ghost): else: return (pacman.x, pacman.y) + @override + def get_default_tile(self): + return (27 * 30 + 15, 30 * 30 + 15) + @override def get_next_move(self, target, maze, screen, blinky): + default_tile = self.get_default_tile() + dx = [1, 0, -1, 0] dy = [0, 1, 0, -1] @@ -58,17 +65,31 @@ class Pinky(Ghost): 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) 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): - ret[i] = self.heuristic( - (nx, ny), new_target[0], new_target[1]) + if self.mode == MODE.SCATTERED: + ret[i] = self.heuristic( + (nx, ny), default_tile[0], default_tile[1]) + else: + ret[i] = self.heuristic( + (nx, ny), new_target[0], new_target[1]) if settings.debug: pygame.draw.line(screen, self.color, (new_target), (self.x, self.y), 1) - min_idx = ret.index(min(ret)) + min_h = min(ret) + + # Favour going up when there is a conflict + if min_h == ret[3] and min_h != math.inf: + return 3 + # Favour going down than sideways when there is a conflict + if min_h == ret[1] and min_h != math.inf: + return 1 + min_idx = ret.index(min_h) return min_idx -- cgit v1.2.3 From 9621f880a03337a8a252cf5cd3993d5a1a29969c Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 8 May 2023 17:59:55 +0300 Subject: Added frightened mode --- src/pinky.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index 688163b..416e7d8 100644 --- a/src/pinky.py +++ b/src/pinky.py @@ -1,4 +1,5 @@ import pygame +import random from typing_extensions import override from direction import DIRECTION from mode import MODE @@ -61,6 +62,8 @@ class Pinky(Ghost): if self.last_move == 3: forbidden = 1 + rand_pos = (0, 0) + new_target = self.get_four_tiles_ahead_of_pacman(target) if settings.debug: pygame.draw.circle(screen, self.color, @@ -68,6 +71,10 @@ class Pinky(Ghost): pygame.draw.circle(screen, self.color, default_tile, 15) + if target.powerup: + self.mode = MODE.FRIGHETENED + rand_pos = random.randint(0, 900), random.randint(0, 990) + for i in range(len(dx)): if i != forbidden: nx = self.x + dx[i] * self.speed @@ -76,7 +83,10 @@ class Pinky(Ghost): if self.mode == MODE.SCATTERED: ret[i] = self.heuristic( (nx, ny), default_tile[0], default_tile[1]) - else: + elif self.mode == MODE.FRIGHETENED: + ret[i] = self.heuristic( + (nx, ny), rand_pos[0], rand_pos[1]) + elif self.mode == MODE.CHASING: ret[i] = self.heuristic( (nx, ny), new_target[0], new_target[1]) if settings.debug: -- cgit v1.2.3 From 1584574267bae0ec4b0096ace7a7cbbe08787c05 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Mon, 8 May 2023 18:32:04 +0300 Subject: Fixed a bug in inky's algorithms and also now the ghost reset to chase mode after pacman finishes his powerup --- src/pinky.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/pinky.py') diff --git a/src/pinky.py b/src/pinky.py index 416e7d8..29949a7 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, target, maze, screen, blinky): + def get_next_move(self, pacman, maze, screen, blinky): default_tile = self.get_default_tile() dx = [1, 0, -1, 0] @@ -64,17 +64,20 @@ class Pinky(Ghost): rand_pos = (0, 0) - new_target = self.get_four_tiles_ahead_of_pacman(target) + new_target = self.get_four_tiles_ahead_of_pacman(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 target.powerup: + if 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: + self.mode = MODE.CHASING + for i in range(len(dx)): if i != forbidden: nx = self.x + dx[i] * self.speed -- cgit v1.2.3 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