From 3c263e57e74e901ffe1201b66e0046d59e53a59f Mon Sep 17 00:00:00 2001 From: s452645 Date: Wed, 19 May 2021 23:44:56 +0200 Subject: [PATCH 1/2] implemented setting random mines as targets --- main.py | 11 ++++++++++- mine_models/standard_mine.py | 2 +- minefield.py | 23 +++++++++++++++++++---- searching_algorithms/a_star.py | 28 +++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 6a11f12..0e335d9 100644 --- a/main.py +++ b/main.py @@ -1,4 +1,5 @@ # libraries +import time import pygame from pyglet.gl import * # for blocky textures import random @@ -119,12 +120,20 @@ def main(): for component in ui_components_list.selectable_ui_components: component.set_flags(is_active=False) + # === TARGET-MINE CHOICE (NAIVE) === + mines = minefield.get_active_mines() + if any(mines): + row, column = random.choice(mines).position + const.SCREEN.blit(HIGHLIGHT, const.get_tile_coordinates((row, column))) + else: + is_game_over = True + action_sequence = a_star.graphsearch( initial_state=a_star.State( row=minefield.agent.position[0], column=minefield.agent.position[1], direction=minefield.agent.direction), - minefield=minefield, tox=row, toy=column) + minefield=minefield, target_type="mine", tox=row, toy=column) # initializing variables in_game_timer = 0 diff --git a/mine_models/standard_mine.py b/mine_models/standard_mine.py index 4f1a9d9..371fe8c 100644 --- a/mine_models/standard_mine.py +++ b/mine_models/standard_mine.py @@ -3,7 +3,7 @@ from .mine import Mine class StandardMine(Mine): def __init__(self, position, active=True): - self.mine_type = "standard" + self.type = "standard" super().__init__(position, active) def disarm(self): diff --git a/minefield.py b/minefield.py index 269d3d6..6238734 100644 --- a/minefield.py +++ b/minefield.py @@ -45,16 +45,31 @@ class Minefield: if mine is not None and isinstance(mine, TimeMine): mine.timer = max(0, mine.starting_time - int(self.turn / 4)) + def get_active_mines(self): + mines = list() + + for row in range(const.V_GRID_VER_TILES): + for column in range(const.V_GRID_VER_TILES): + mine = self.matrix[row][column].mine + + if mine is not None and mine.active: + # do not add mines with predecessors + if mine.type == 'chained' and mine.predecessor is not None: + continue + + mines.append(mine) + + return mines + # ================ # # === MOVEMENT === # # ================ # # check if sapper's destination is accessible - # If Agent comes upon a tile with a mine his starting position shall be reestablished - def is_valid_move(self, target_row: int, target_column: int): + @staticmethod + def is_valid_move(target_row: int, target_column: int): if 0 <= target_row < const.V_GRID_VER_TILES \ - and 0 <= target_column < const.V_GRID_HOR_TILES \ - and self.matrix[target_row][target_column].mine is None: + and 0 <= target_column < const.V_GRID_HOR_TILES: return True return False diff --git a/searching_algorithms/a_star.py b/searching_algorithms/a_star.py index c87ed90..5c42f66 100644 --- a/searching_algorithms/a_star.py +++ b/searching_algorithms/a_star.py @@ -45,12 +45,32 @@ def get_estimated_cost(node: Node): return abs(node.state.row - GOAL[0]) + abs(node.state.column - GOAL[1]) -def goal_test(state: State): +def tile_goal_test(state: State): if (state.row, state.column) == GOAL: return True return False +def mine_goal_test(state: State): + if state.row == GOAL[0] and state.column == GOAL[1] - 1: + if state.direction == Direction.RIGHT: + return True + + elif state.row == GOAL[0] and state.column == GOAL[1] + 1: + if state.direction == Direction.LEFT: + return True + + elif state.row == GOAL[0] - 1 and state.column == GOAL[1]: + if state.direction == Direction.DOWN: + return True + + elif state.row == GOAL[0] + 1 and state.column == GOAL[1]: + if state.direction == Direction.UP: + return True + + return False + + def get_successors(state: State, minefield: Minefield): successors = list() @@ -73,6 +93,7 @@ def graphsearch(initial_state: State, minefield: Minefield, fringe: List[Node] = None, explored: List[Node] = None, + target_type: str = "tile", tox: int = None, toy: int = None): @@ -86,6 +107,11 @@ def graphsearch(initial_state: State, if tox is not None and toy is not None: GOAL = (tox, toy) + if target_type == "mine": + goal_test = mine_goal_test + else: + goal_test = tile_goal_test + # fringe and explored initialization if fringe is None: fringe = list() From cfe686ca247faba3707811dd32e78d7767b3bf7c Mon Sep 17 00:00:00 2001 From: s452645 Date: Sun, 23 May 2021 08:43:31 +0200 Subject: [PATCH 2/2] implemented auto-mode --- game.py | 17 +++++++++++++++-- main.py | 19 +++++++++++++++++-- searching_algorithms/a_star.py | 4 ++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/game.py b/game.py index 1000a20..9e34c6d 100644 --- a/game.py +++ b/game.py @@ -1,4 +1,4 @@ -from random import randint +from random import choice, randint import project_constants as const @@ -112,8 +112,20 @@ class Game: def get_turn_number(self): return self.turn + # draws a random mine to disarm (in auto mode) + def set_random_mine_as_target(self): + self.goal = choice(self.minefield.get_active_mines()).position + + # display new destination + self.input_box_row.set_texts(user_input=str(self.goal[0])) + self.input_box_column.set_texts(user_input=str(self.goal[1])) + + # prevents highlighting input_box_row, + # couldn't find any better solution w/o major Game class changes + self.input_box_row.set_is_selected(False) + # gets action sequence for agent - def get_action_sequence(self): + def get_action_sequence(self, target_type: str = "tile"): return a_star.graphsearch( initial_state=a_star.State( row=self.agent.row, @@ -121,6 +133,7 @@ class Game: direction=self.agent.direction ), minefield=self.minefield, + target_type=target_type, tox=self.goal[0], toy=self.goal[1] ) diff --git a/main.py b/main.py index 3da6402..6c19ad1 100644 --- a/main.py +++ b/main.py @@ -26,6 +26,7 @@ def main(): # setting flags for program running = True in_menu = True + auto = False is_game_over = False # create and initialize_gui_components game instance @@ -38,7 +39,7 @@ def main(): # ==== MENU ==== # # ============== # - while running and in_menu: + while running and in_menu and not auto: events = pygame.event.get() # checking if game should stop running @@ -59,12 +60,21 @@ def main(): # if ok button is clicked then leave menu section in_menu = not game.button_ok.is_clicked(pygame.mouse.get_pos(), events) + # if auto button is clicked then leave menu and start auto-mode + auto = game.button_auto.is_clicked(pygame.mouse.get_pos(), events) + # ========================== # # ==== BEFORE GAME LOOP ==== # # ========================== # # getting action sequence for agent - action_sequence = game.get_action_sequence() + if auto: + in_menu = False + game.set_random_mine_as_target() + action_sequence = game.get_action_sequence("mine") + + else: + action_sequence = game.get_action_sequence("tile") # initializing game attributes before the game loop game.initialize_before_game_loop() @@ -88,6 +98,11 @@ def main(): # drawing minefield and agent instances game.draw_minefield() + # handling auto button (clicking quits auto-mode) + if auto: + game.button_auto.set_flags(is_active=True) + auto = not game.button_auto.is_clicked(pygame.mouse.get_pos(), events) + # drawing inactive gui components so they don't "disappear" game.run_in_game_menu_overlay(pygame.mouse.get_pos(), events) game.set_is_active_flag_for_all_in_game_gui_components(False) diff --git a/searching_algorithms/a_star.py b/searching_algorithms/a_star.py index 5c42f66..227c1ad 100644 --- a/searching_algorithms/a_star.py +++ b/searching_algorithms/a_star.py @@ -111,6 +111,10 @@ def graphsearch(initial_state: State, goal_test = mine_goal_test else: goal_test = tile_goal_test + if minefield.matrix[GOAL[0]][GOAL[1]].mine is not None and minefield.matrix[GOAL[0]][GOAL[1]].mine.active: + # TODO: cross-platform popup, move to separate function + ctypes.windll.user32.MessageBoxW(0, "Brak rozwiązania", "GAME OVER", 1) + return [] # fringe and explored initialization if fringe is None: