From 90ca0d218e620953c37a2bc1e51390724ca36f96 Mon Sep 17 00:00:00 2001 From: "Jean A. Eckelberg" Date: Sat, 27 May 2023 01:14:39 -0500 Subject: [PATCH 1/4] Fix merge (#46) * Fix Merge --- game/controllers/master_controller.py | 5 +---- requirements.txt | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 requirements.txt diff --git a/game/controllers/master_controller.py b/game/controllers/master_controller.py index 4bfb6da..154b6b9 100644 --- a/game/controllers/master_controller.py +++ b/game/controllers/master_controller.py @@ -118,10 +118,7 @@ def turn_logic(self, clients: list[Player], turn): self.movement_controller.handle_actions(client.actions[i], client, self.current_world_data["game_board"]) except IndexError: pass - try: - self.interact_controller.handle_actions(client.actions[i], client, self.current_world_data["game_board"]) - except IndexError: - pass + # checks event logic at the end of round # self.handle_events(clients) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..7440582 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +tqdm~=4.65.0 +pygame~=2.3.0 +numpy~=1.24.2 +Pillow~=9.5.0 \ No newline at end of file From 650eaf537e1420ada6c93e4aea3c90935a357f07 Mon Sep 17 00:00:00 2001 From: MyFridgeIsFinePleaseStopAsking <101206316+JuliaCaesar@users.noreply.github.com> Date: Fri, 2 Jun 2023 22:13:45 -0500 Subject: [PATCH 2/4] Update config.py --- game/config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/game/config.py b/game/config.py index c9af04f..80ccb9a 100644 --- a/game/config.py +++ b/game/config.py @@ -37,6 +37,8 @@ GAME_MAP_DIR = os.path.join(os.getcwd(), "logs") # Location of game map file GAME_MAP_FILE = os.path.join(GAME_MAP_DIR, GAME_MAP_FILE_NAME) # Filepath for game map file +GAME_BOARD_MARGIN_LEFT = 200 +GAME_BOARD_MARGIN_TOP = 200 class Debug: # Keeps track of the current debug level of the game level = DebugLevel.NONE From c5768409654b3522e2c5fc8ce0c8f1a531b8d231 Mon Sep 17 00:00:00 2001 From: MyFridgeIsFinePleaseStopAsking <101206316+JuliaCaesar@users.noreply.github.com> Date: Fri, 2 Jun 2023 22:27:48 -0500 Subject: [PATCH 3/4] added margins --- Visualiser2/config.py | 2 ++ game/config.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Visualiser2/config.py b/Visualiser2/config.py index 0a7909e..565730a 100644 --- a/Visualiser2/config.py +++ b/Visualiser2/config.py @@ -8,6 +8,8 @@ class Config: __SCREEN_SIZE: Vector = Vector(x=1366, y=768) # width, height __FRAME_RATE: int = 4 __BACKGROUND_COLOR: (int, int, int) = 0, 0, 0 + __GAME_BOARD_MARGIN_LEFT = 200 + __GAME_BOARD_MARGIN_TOP = 200 # if you have an animation, this will be the number of frames the animation goes through for each turn @property diff --git a/game/config.py b/game/config.py index 80ccb9a..c9af04f 100644 --- a/game/config.py +++ b/game/config.py @@ -37,8 +37,6 @@ GAME_MAP_DIR = os.path.join(os.getcwd(), "logs") # Location of game map file GAME_MAP_FILE = os.path.join(GAME_MAP_DIR, GAME_MAP_FILE_NAME) # Filepath for game map file -GAME_BOARD_MARGIN_LEFT = 200 -GAME_BOARD_MARGIN_TOP = 200 class Debug: # Keeps track of the current debug level of the game level = DebugLevel.NONE From bfd427955f32af380a4e772eb0b57354800572c1 Mon Sep 17 00:00:00 2001 From: MyFridgeIsFinePleaseStopAsking <101206316+JuliaCaesar@users.noreply.github.com> Date: Fri, 2 Jun 2023 22:30:09 -0500 Subject: [PATCH 4/4] Update config.py --- Visualiser2/config.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Visualiser2/config.py b/Visualiser2/config.py index 565730a..5944ad6 100644 --- a/Visualiser2/config.py +++ b/Visualiser2/config.py @@ -41,3 +41,11 @@ def FRAME_RATE(self) -> int: @property def BACKGROUND_COLOR(self) -> (int, int, int): return self.__BACKGROUND_COLOR + + @property + def GAME_BOARD_MARGIN_LEFT(self) -> int: + return self.__GAME_BOARD_MARGIN_LEFT + + @property + def GAME_BOARD_MARGIN_TOP(self) -> int: + return self.__GAME_BOARD_MARGIN_TOP