From 86d7899e1f89cceb1ff83e160aeec926d9ee7e69 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@pm.me>
Date: Thu, 4 Jan 2024 02:54:02 +0200
Subject: [PATCH] feat(game): add horizontal movement

---
 src/game/game.py      | 31 ++++++++++++++++++++++++++-----
 src/game/tetromino.py |  8 ++++++++
 src/game/timer.py     |  7 ++++++-
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/game/game.py b/src/game/game.py
index 5f56d02..07bcc13 100644
--- a/src/game/game.py
+++ b/src/game/game.py
@@ -3,7 +3,7 @@ from utils import CONFIG, Figure
 
 from .log import log
 from .tetromino import Tetromino
-from .timer import Timer
+from .timer import Timer, Timers
 
 
 class Game:
@@ -17,16 +17,18 @@ class Game:
         self.sprites = pygame.sprite.Group()
         self.tetromino = Tetromino(group=self.sprites)
 
-        self.timers = {
-            "vertical move": Timer(CONFIG.game.initial_speed, True, self.move_down),
-        }
+        self.timers = Timers(
+            Timer(CONFIG.game.initial_speed, True, self.move_down),
+            Timer(CONFIG.game.movment_delay),
+        )
 
-        self.timers["vertical move"].activate()
+        self.timers.vertical.activate()
 
     def run(self) -> None:
         self.dispaly_surface.blit(self.surface, CONFIG.game.pos)
         self.draw()
         self._timer_update()
+        self.handle_event()
 
     def draw(self) -> None:
         self.surface.fill(CONFIG.colors.bg_float)
@@ -38,9 +40,28 @@ class Game:
     def update(self) -> None:
         self.sprites.update()
 
+    def handle_event(self) -> None:
+        keys = pygame.key.get_pressed()
+
+        if not self.timers.horizontal.active:
+            if keys[pygame.K_LEFT] or keys[pygame.K_a] or keys[pygame.K_h]:
+                self.move_left()
+                self.timers.horizontal.activate()
+            elif keys[pygame.K_DOWN] or keys[pygame.K_s] or keys[pygame.K_j]:
+                self.move_down()
+            elif keys[pygame.K_RIGHT] or keys[pygame.K_d] or keys[pygame.K_l]:
+                self.move_right()
+                self.timers.horizontal.activate()
+
     def move_down(self) -> None:
         self.tetromino.move_down()
 
+    def move_left(self) -> None:
+        self.tetromino.move_left()
+
+    def move_right(self) -> None:
+        self.tetromino.move_right()
+
     def _create_grid_surface(self) -> None:
         self.grid_surface = self.surface.copy()
         self.grid_surface.fill("#00ff00")
diff --git a/src/game/tetromino.py b/src/game/tetromino.py
index 6d93a81..ee6ca1a 100644
--- a/src/game/tetromino.py
+++ b/src/game/tetromino.py
@@ -22,3 +22,11 @@ class Tetromino:
     def move_down(self) -> None:
         for block in self.blocks:
             block.pos.y += 1
+
+    def move_left(self) -> None:
+        for block in self.blocks:
+            block.pos.x -= 1
+
+    def move_right(self) -> None:
+        for block in self.blocks:
+            block.pos.x += 1
diff --git a/src/game/timer.py b/src/game/timer.py
index 1bb0db1..baedd09 100644
--- a/src/game/timer.py
+++ b/src/game/timer.py
@@ -1,4 +1,4 @@
-from typing import Callable, Optional
+from typing import Callable, NamedTuple, Optional
 
 import pygame
 from attrs import define, field
@@ -30,3 +30,8 @@ class Timer:
 
             if self.repeated:
                 self.activate()
+
+
+class Timers(NamedTuple):
+    vertical: Timer
+    horizontal: Timer