Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config margins #47

Merged
merged 5 commits into from
Jun 3, 2023
Merged

Config margins #47

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90ca0d2
Fix merge (#46)
JeanAEckelberg May 27, 2023
650eaf5
Update config.py
JuliaCaesar Jun 3, 2023
d262e76
Merge branch 'Visualizer' into config_margins
JuliaCaesar Jun 3, 2023
c576840
added margins
JuliaCaesar Jun 3, 2023
bfd4279
Update config.py
JuliaCaesar Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions game/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions game/controllers/master_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 4 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tqdm~=4.65.0
pygame~=2.3.0
numpy~=1.24.2
Pillow~=9.5.0