Config margins (#47)

* Fix merge (#46) * Fix Merge * Update config.py * added margins * Update config.py --------- Co-authored-by: Jean A. Eckelberg <[email protected]>
JeanAEckelberg · Jun 3, 2023 · 024db90 · 024db90
1 parent 3b2690e
commit 024db90
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -39,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
diff --git 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
@@ -0,0 +1,4 @@
+tqdm~=4.65.0
+pygame~=2.3.0
+numpy~=1.24.2
+Pillow~=9.5.0