diff --git a/src/game/game.py b/src/game/game.py index 07bcc13..27e45c0 100644 --- a/src/game/game.py +++ b/src/game/game.py @@ -1,5 +1,5 @@ import pygame -from utils import CONFIG, Figure +from utils import CONFIG, Direction, Figure from .log import log from .tetromino import Tetromino @@ -57,10 +57,10 @@ class Game: self.tetromino.move_down() def move_left(self) -> None: - self.tetromino.move_left() + self.tetromino.move_horizontal(Direction.LEFT) def move_right(self) -> None: - self.tetromino.move_right() + self.tetromino.move_horizontal(Direction.RIGHT) def _create_grid_surface(self) -> None: self.grid_surface = self.surface.copy() @@ -100,5 +100,5 @@ class Game: ) def _timer_update(self) -> None: - for timer in self.timers.values(): + for timer in self.timers: timer.update() diff --git a/src/game/tetromino.py b/src/game/tetromino.py index ee6ca1a..ad62ae4 100644 --- a/src/game/tetromino.py +++ b/src/game/tetromino.py @@ -1,7 +1,7 @@ from typing import Optional import pygame -from utils import CONFIG, Figure, FigureConfig, Size +from utils import CONFIG, Direction, Figure, FigureConfig, Size from .block import Block @@ -23,10 +23,10 @@ class Tetromino: for block in self.blocks: block.pos.y += 1 - def move_left(self) -> None: + def move_horizontal(self, direction: Direction) -> None: for block in self.blocks: - block.pos.x -= 1 + block.pos.x += direction.value - def move_right(self) -> None: + def next_move_horizontal_collide(self, block: Block, direction: Direction) -> None: for block in self.blocks: - block.pos.x += 1 + block.pos.x += direction.value diff --git a/src/utils/__init__.py b/src/utils/__init__.py index aebd831..b37ed9d 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -1,4 +1,5 @@ from .config import CONFIG +from .direction import Direction from .figure import Figure, FigureConfig from .log import log from .path import BASE_PATH @@ -11,4 +12,5 @@ __all__ = [ "Size", "Figure", "FigureConfig", + "Direction", ] diff --git a/src/utils/config.py b/src/utils/config.py index a7a2175..0021ad1 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -18,7 +18,7 @@ class Game: size: Size = Size(columns * cell.width, rows * cell.width) pos: Vec2 = Vec2(padding, padding) offset: Vec2 = Vec2(columns // 2, -1) - initial_speed: int = 200 + initial_speed: int = 400 movment_delay: int = 200 rotation_delay: int = 200 diff --git a/src/utils/direction.py b/src/utils/direction.py new file mode 100644 index 0000000..7b20349 --- /dev/null +++ b/src/utils/direction.py @@ -0,0 +1,6 @@ +from enum import Enum + + +class Direction(Enum): + LEFT = -1 + RIGHT = 1