refactor: improve keyboard input logic

This commit is contained in:
Giovani Rodriguez
2021-06-14 13:17:18 -04:00
parent f52f218a5f
commit bc8721e077
3 changed files with 49 additions and 40 deletions

View File

@@ -4,6 +4,7 @@ import pygame
from typing import List, Tuple
from pygame import mixer
from tetris.util import ConfigurationManager
from tetris.util import Controller
from typing import TYPE_CHECKING
if TYPE_CHECKING:
@@ -107,6 +108,7 @@ class Piece(Entity):
def update(self, elapsed_time: int, game: "Game") -> None:
super().update(elapsed_time)
tile_size = ConfigurationManager.get("engine", "tile-size")
if self.applying_gravity:
self.applying_gravity = self._apply_gravity(elapsed_time, game.well, game.stack)
@@ -120,6 +122,30 @@ class Piece(Entity):
self.applying_set = self._apply_set(elapsed_time, game)
self.applying_gravity = not self.applying_set
# handle rotation, left and right movement
if Controller.key_down(pygame.K_SPACE):
self.rotate()
if game.well and self.collide(game.well) or game.stack and self.collide(game.stack):
self.revert()
if Controller.key_down(pygame.K_LEFT):
self.move((-tile_size, 0))
if game.well and self.collide(game.well) or game.stack and self.collide(game.stack):
self.revert()
if Controller.key_down(pygame.K_RIGHT):
self.move((tile_size, 0))
if game.well and self.collide(game.well) or game.stack and self.collide(game.stack):
self.revert()
# handle soft drop movement
gravity_time = ConfigurationManager.get("engine", "piece-gravity-time")
set_time = ConfigurationManager.get("engine", "piece-set-time")
if Controller.key_pressed(pygame.K_DOWN):
self.gravity_time = gravity_time // 8
self.set_time = set_time // 8
if not Controller.key_pressed(pygame.K_DOWN):
self.gravity_time = gravity_time
self.set_time = set_time
def draw(self, surface: pygame.Surface, well: Well, stack: "Stack") -> None:
tile_size = ConfigurationManager.get("engine", "tile-size")