kristoferssolo/Tetris
1
0
Fork 0
mirror of https://github.com/kristoferssolo/Tetris.git synced 2025-10-21 20:00:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(game): reset

Browse Source 
refactor(game): add type hints
This commit is contained in:
Kristofers Solo 2024-01-04 18:45:29 +02:00
parent c16c031ae2
commit a880dd45fd
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/game/game.py
View File

@ -60,20 +60,20 @@ class Game:
def run(self) -> None: def run(self) -> None:
"""Run a single iteration of the game loop.""" """Run a single iteration of the game loop."""
self._update_display_surface()
self.draw() self.draw()
self._timer_update() self._timer_update()
self.handle_event() self.handle_event()
def draw(self) -> None: def draw(self) -> None:
"""Draw the game surface and its components.""" """Draw the game surface and its components."""
self._fill_game_surface()
self.update() self.update()
self._fill_game_surface()
self.sprites.draw(self.surface) self.sprites.draw(self.surface)
self._draw_border() self._draw_border()
self._draw_grid() self._draw_grid()
def update(self) -> None: def update(self) -> None:
self._update_display_surface()
self.sprites.update() self.sprites.update()
def handle_event(self) -> None: def handle_event(self) -> None:
@ -130,7 +130,7 @@ class Game:
Returns: Returns:
True if the game is over, False otherwise. True if the game is over, False otherwise.
""" """
for block in self.sprites: for block in self.tetromino.blocks:
if block.pos.y < 0: if block.pos.y < 0:
log.info("Game over!") log.info("Game over!")
return True return True
@ -138,6 +138,7 @@ class Game:
def restart(self) -> None: def restart(self) -> None:
"""Restart the game.""" """Restart the game."""
log.info("Restarting the game")
self._reset_game_state() self._reset_game_state()
self._initialize_field_and_tetromino() self._initialize_field_and_tetromino()
@ -277,9 +278,9 @@ class Game:
self.initial_block_speed = CONFIG.game.initial_speed self.initial_block_speed = CONFIG.game.initial_speed
self.increased_block_speed = self.initial_block_speed * 0.4 self.increased_block_speed = self.initial_block_speed * 0.4
self.down_pressed = False self.down_pressed = False
self.level = 1 self.level: int = 1
self.score = 0 self.score: int = 0
self.lines = 0 self.lines: int = 0
def _initialize_sound(self) -> None: def _initialize_sound(self) -> None:
"""Initialize game sounds.""" """Initialize game sounds."""
@ -363,13 +364,10 @@ class Game:
def _reset_game_state(self) -> None: def _reset_game_state(self) -> None:
"""Reset the game state.""" """Reset the game state."""
log.debug("Resetting game state")
self.sprites.empty() self.sprites.empty()
self.field = self._generate_empty_field() self._initialize_field_and_tetromino()
self._initialize_game_state()
self.level = 1
self.score = 0
self.lines = 0
self.update_score(self.lines, self.score, self.level) self.update_score(self.lines, self.score, self.level)
def _draw_vertical_grid_line(self, x: int | float) -> None: def _draw_vertical_grid_line(self, x: int | float) -> None: