From 1bf7ea147e785f804bc362eb237dc95cba585044 Mon Sep 17 00:00:00 2001
From: DannyAbdi <dannyabdi13@gmail.com>
Date: Tue, 5 Mar 2024 01:35:26 +0000
Subject: [PATCH] made small changes to accomodate minmax code
---
config.py | 6 +-----
main.py | 19 +++++++++++++------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/config.py b/config.py
index 6bee30d..25fad33 100644
--- a/config.py
+++ b/config.py
@@ -71,9 +71,5 @@ tiles = [pygame.image.load('blank.png'), pygame.image.load('wall.png'), pygame.i
easy_button = pygame.image.load('button_easy.png').convert_alpha()
normal_button = pygame.image.load('button_normal.png').convert_alpha()
hard_button = pygame.image.load('button_hard.png').convert_alpha()
-dfs_button = pygame.image.load('button_dfs.png')
WIDTH, HEIGHT = TILE_SIZE * len(current_level[0]), TILE_SIZE * len(current_level)
-dfs_button_x = 100
-dfs_button_y = 100
-dfs_button_width = 100
-dfs_button_height = 100
+
diff --git a/main.py b/main.py
index ccad931..d98dcec 100644
--- a/main.py
+++ b/main.py
@@ -6,30 +6,36 @@ from dfs import *
from bfs import *
from dijkstra import *
from aStar import *
+from enemy import *
+from minmax import *
pygame.init()
-player = Player(TILE_SIZE, TILE_SIZE)
-
maze = Maze(small_maze)
+player = Player(TILE_SIZE, TILE_SIZE)
+enemy1 = Enemy(maze)
+depth = 3
player_controller = PlayerController(player, maze)
-easy_button = Button(easy_button, 150, 500, small_maze, player_controller)
-normal_button = Button(normal_button, 300, 500, medium_maze, player_controller)
-hard_button = Button(hard_button, 426, 500, large_maze, player_controller)
+easy_button = Button(easy_button, 150, 10, small_maze, player_controller)
+normal_button = Button(normal_button, 300, 10, medium_maze, player_controller)
+hard_button = Button(hard_button, 426, 10, large_maze, player_controller)
dfs_solver = DFS()
bfs_solver = BFS()
dijkstra_solver = Dijkstra(maze)
aStar_solver = AStar(maze)
+minmax_solver = MinMax(maze)
player_controller.set_dfs_solver(dfs_solver)
player_controller.set_bfs_solver(bfs_solver)
player_controller.set_dijkstra_solver(dijkstra_solver)
player_controller.set_astar_solver(aStar_solver)
+# best_move = minmax_solver.minmax(player_position, enemy_position, depth, True)
run = True
while run:
timer.tick(FPS)
maze.draw()
player.draw()
+ enemy1.draw(screen)
easy_button.draw()
normal_button.draw()
hard_button.draw()
@@ -37,7 +43,7 @@ while run:
# player_controller.move_to_goal_dfs()
# player_controller.move_to_goal_bfs()
# player_controller.move_to_goal_dijkstra()
- player_controller.move_to_goal_astar()
+ # player_controller.move_to_goal_astar()
direction = pygame.key.get_pressed()
player_controller.move_player(direction)
@@ -53,6 +59,7 @@ while run:
if easy_button.is_clicked or normal_button.is_clicked or hard_button.is_clicked:
player_controller.reset_player_position()
+ enemy1.reset_position()
pygame.display.flip()
pygame.quit()
--
GitLab