From c8859bc571b5df3a33ce0ed5b602d0523760958b Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sat, 6 Jan 2024 23:18:10 +0200 Subject: [PATCH] refactor(game) --- src/game/screens/main.py | 15 +++++++++------ src/game/screens/tetris.py | 3 ++- src/utils/__init__.py | 1 + src/utils/tuples.py | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/game/screens/main.py b/src/game/screens/main.py index 1033bea..af7f09e 100644 --- a/src/game/screens/main.py +++ b/src/game/screens/main.py @@ -46,15 +46,18 @@ class Main(BaseScreen, SceenElement, TextScreen): def run(self) -> None: while True: - if not self.game: - self.draw() + self.run_game_loop() - self.handle_events() + def run_game_loop(self) -> None: + if not self.game: + self.draw() - if self.game: - self.game.run() + self.handle_events() - self.update() + if self.game: + self.game.run() + + self.update() def exit(self) -> None: """Exit the game.""" diff --git a/src/game/screens/tetris.py b/src/game/screens/tetris.py index f029f80..94f7f57 100644 --- a/src/game/screens/tetris.py +++ b/src/game/screens/tetris.py @@ -341,7 +341,8 @@ class Tetris(BaseScreen): def _play_landing_sound(self) -> None: """Play the landing sound effect.""" - self.landing_sound.play() + if self.game_mode is GameMode.PLAYER: + self.landing_sound.play() def _update_display_surface(self) -> None: """Update the display surface.""" diff --git a/src/utils/__init__.py b/src/utils/__init__.py index c99d702..1817a6c 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -17,4 +17,5 @@ __all__ = [ "Rotation", "GameMode", "Weights", + "BestMove", ] diff --git a/src/utils/tuples.py b/src/utils/tuples.py index 837d6a3..f7c9b98 100644 --- a/src/utils/tuples.py +++ b/src/utils/tuples.py @@ -15,4 +15,4 @@ class Size(NamedTuple): class BestMove(NamedTuple): rotation: int - direction: Direction + x: int