black formatting

More compliant with Tetris Guidelines

README.md

@@ -6,7 +6,7 @@ Tetris clone made with Python and Arcade graphic library
 
 ## Requirements
 
-* [Python](https://www.python.org/) 3.6 or upper
+* [Python](https://www.python.org/) 3.6 or later
 
 ## Install
 

TetrArcade.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import sys
+import random
 
 try:
     import arcade
@@ -19,25 +20,26 @@ import os
 import itertools
 import configparser
 
-from tetrislogic import TetrisLogic, Color, Phase, Coord, I_Tetrimino, Movement
+from tetrislogic import TetrisLogic, Color, Coord, I_Tetrimino, Movement, AbstractTimer
 
 
 # Constants
 # Matrix
 LINES = 20
 COLLUMNS = 10
-NEXT_PIECES = 5
+NEXT_PIECES = 6
 
 # Delays (seconds)
 LOCK_DELAY = 0.5
 FALL_DELAY = 1
 AUTOREPEAT_DELAY = 0.300
 AUTOREPEAT_PERIOD = 0.010
+PARTICULE_ACCELERATION = 1.1
 
 # Piece init coord
 MATRIX_PIECE_COORD = Coord(4, LINES)
-NEXT_PIECES_COORDS = [Coord(COLLUMNS + 4, LINES - 4 * n - 3) for n in range(COLLUMNS)]
-HELD_PIECE_COORD = Coord(-5, LINES - 3)
+NEXT_PIECES_COORDS = [Coord(COLLUMNS + 4, LINES - 4 * n) for n in range(NEXT_PIECES)]
+HELD_PIECE_COORD = Coord(-5, LINES)
 
 # Window
 WINDOW_WIDTH = 800
@@ -73,10 +75,8 @@ RESOURCES_DIR = os.path.join(PROGRAM_DIR, "resources")
 IMAGES_DIR = os.path.join(RESOURCES_DIR, "images")
 WINDOW_BG_PATH = os.path.join(IMAGES_DIR, "bg.jpg")
 MATRIX_BG_PATH = os.path.join(IMAGES_DIR, "matrix.png")
-HELD_BG_PATH = os.path.join(IMAGES_DIR, "held.png")
-NEXT_BG_PATH = os.path.join(IMAGES_DIR, "next.png")
 MINOES_SPRITES_PATH = os.path.join(IMAGES_DIR, "minoes.png")
-Color.PRELOCKED = 7
+Color.LOCKED = 7
 MINOES_COLOR_ID = {
     Color.BLUE: 0,
     Color.CYAN: 1,
@@ -85,15 +85,13 @@ MINOES_COLOR_ID = {
     Color.ORANGE: 4,
     Color.RED: 5,
     Color.YELLOW: 6,
-    Color.PRELOCKED: 7,
+    Color.LOCKED: 7,
 }
 TEXTURES = arcade.load_textures(
     MINOES_SPRITES_PATH,
     ((i * MINO_SPRITE_SIZE, 0, MINO_SPRITE_SIZE, MINO_SPRITE_SIZE) for i in range(8)),
 )
 TEXTURES = {color: TEXTURES[i] for color, i in MINOES_COLOR_ID.items()}
-NORMAL_TEXTURE = 0
-LOCKED_TEXTURE = 1
 
 # Music
 MUSIC_DIR = os.path.join(RESOURCES_DIR, "musics")
@@ -119,7 +117,50 @@ else:
     )
 USER_PROFILE_DIR = os.path.join(USER_PROFILE_DIR, "TetrArcade")
 HIGH_SCORE_PATH = os.path.join(USER_PROFILE_DIR, ".high_score")
-CONF_PATH = os.path.join(USER_PROFILE_DIR, "TetrArcade.ini")
+CONF_PATH = os.path.join(USER_PROFILE_DIR, "config.ini")
+
+
+class Texture:
+
+    NORMAL = 0
+    LOCKED = 1
+
+
+class State:
+
+    STARTING = 0
+    PLAYING = 1
+    PAUSED = 2
+    OVER = 3
+
+
+class Timer(AbstractTimer):
+    def __init__(self):
+        self.tasks = {}
+
+    def postpone(self, task, delay):
+        _task = lambda _: task()
+        self.tasks[task] = _task
+        pyglet.clock.schedule_once(_task, delay)
+
+    def cancel(self, task):
+        try:
+            _task = self.tasks[task]
+        except KeyError:
+            pass
+        else:
+            arcade.unschedule(_task)
+            del self.tasks[task]
+
+    def reset(self, task, delay):
+        try:
+            _task = self.tasks[task]
+        except KeyError:
+            _task = lambda _: task()
+            self.tasks[task] = _task
+        else:
+            arcade.unschedule(_task)
+        pyglet.clock.schedule_once(_task, delay)
 
 
 class MinoSprite(arcade.Sprite):
@@ -128,22 +169,21 @@ class MinoSprite(arcade.Sprite):
         self.alpha = alpha
         self.window = window
         self.append_texture(TEXTURES[mino.color])
-        self.append_texture(TEXTURES[Color.PRELOCKED])
+        self.append_texture(TEXTURES[Color.LOCKED])
         self.set_texture(0)
 
-    def refresh(self, x, y, texture=0):
+    def update(self, x, y):
         self.scale = self.window.scale
         size = MINO_SIZE * self.scale
         self.left = self.window.matrix.bg.left + x * size
         self.bottom = self.window.matrix.bg.bottom + y * size
-        self.set_texture(texture)
 
 
 class MinoesSprites(arcade.SpriteList):
     def resize(self, scale):
         for sprite in self:
             sprite.scale = scale
-        self.refresh()
+        self.update()
 
 
 class TetrominoSprites(MinoesSprites):
@@ -155,23 +195,28 @@ class TetrominoSprites(MinoesSprites):
             mino.sprite = MinoSprite(mino, window, alpha)
             self.append(mino.sprite)
 
-    def refresh(self, texture=NORMAL_TEXTURE):
+    def update(self):
         for mino in self.tetromino:
             coord = mino.coord + self.tetromino.coord
-            mino.sprite.refresh(coord.x, coord.y, texture)
+            mino.sprite.update(coord.x, coord.y)
+
+    def set_texture(self, texture):
+        for mino in self.tetromino:
+            mino.sprite.set_texture(texture)
+        self.update()
 
 
 class MatrixSprites(MinoesSprites):
     def __init__(self, matrix):
         super().__init__()
         self.matrix = matrix
-        self.refresh()
+        self.update()
 
-    def refresh(self):
+    def update(self):
         for y, line in enumerate(self.matrix):
             for x, mino in enumerate(line):
                 if mino:
-                    mino.sprite.refresh(x, y)
+                    mino.sprite.update(x, y)
 
     def remove_line(self, y):
         for mino in self.matrix[y]:
@@ -180,10 +225,12 @@ class MatrixSprites(MinoesSprites):
 
 
 class TetrArcade(TetrisLogic, arcade.Window):
+
+    timer = Timer()
+
     def __init__(self):
         locale.setlocale(locale.LC_ALL, "")
         self.highlight_texts = []
-        self.tasks = {}
 
         self.conf = configparser.ConfigParser()
         if self.conf.read(CONF_PATH):
@@ -212,12 +259,9 @@ class TetrArcade(TetrisLogic, arcade.Window):
         self.bg = arcade.Sprite(WINDOW_BG_PATH)
         self.matrix.bg = arcade.Sprite(MATRIX_BG_PATH)
         self.matrix.bg.alpha = MATRIX_BG_ALPHA
-        self.held.bg = arcade.Sprite(HELD_BG_PATH)
-        self.held.bg.alpha = BAR_ALPHA
-        self.next.bg = arcade.Sprite(NEXT_BG_PATH)
-        self.next.bg.alpha = BAR_ALPHA
         self.matrix.sprites = MatrixSprites(self.matrix)
         self.on_resize(self.init_width, self.init_height)
+        self.exploding_minoes = [None for y in range(LINES)]
 
         if self.play_music:
             try:
@@ -232,6 +276,8 @@ class TetrArcade(TetrisLogic, arcade.Window):
         else:
             self.music = None
 
+        self.state = State.STARTING
+
     def new_conf(self):
         self.conf["WINDOW"] = {
             "width": WINDOW_WIDTH,
@@ -266,13 +312,13 @@ class TetrArcade(TetrisLogic, arcade.Window):
         for action, key in self.conf["KEYBOARD"].items():
             self.conf["KEYBOARD"][action] = key.upper()
         self.key_map = {
-            Phase.STARTING: {
+            State.STARTING: {
                 getattr(arcade.key, self.conf["KEYBOARD"]["start"]): self.new_game,
                 getattr(
                     arcade.key, self.conf["KEYBOARD"]["fullscreen"]
                 ): self.toggle_fullscreen,
             },
-            Phase.FALLING: {
+            State.PLAYING: {
                 getattr(arcade.key, self.conf["KEYBOARD"]["move left"]): self.move_left,
                 getattr(
                     arcade.key, self.conf["KEYBOARD"]["move right"]
@@ -291,32 +337,13 @@ class TetrArcade(TetrisLogic, arcade.Window):
                     arcade.key, self.conf["KEYBOARD"]["fullscreen"]
                 ): self.toggle_fullscreen,
             },
-            Phase.LOCK: {
-                getattr(arcade.key, self.conf["KEYBOARD"]["move left"]): self.move_left,
-                getattr(
-                    arcade.key, self.conf["KEYBOARD"]["move right"]
-                ): self.move_right,
-                getattr(arcade.key, self.conf["KEYBOARD"]["soft drop"]): self.soft_drop,
-                getattr(arcade.key, self.conf["KEYBOARD"]["hard drop"]): self.hard_drop,
-                getattr(
-                    arcade.key, self.conf["KEYBOARD"]["rotate clockwise"]
-                ): self.rotate_clockwise,
-                getattr(
-                    arcade.key, self.conf["KEYBOARD"]["rotate counter"]
-                ): self.rotate_counter,
-                getattr(arcade.key, self.conf["KEYBOARD"]["hold"]): self.hold,
-                getattr(arcade.key, self.conf["KEYBOARD"]["pause"]): self.pause,
-                getattr(
-                    arcade.key, self.conf["KEYBOARD"]["fullscreen"]
-                ): self.toggle_fullscreen,
-            },
-            Phase.PAUSED: {
+            State.PAUSED: {
                 getattr(arcade.key, self.conf["KEYBOARD"]["pause"]): self.resume,
                 getattr(
                     arcade.key, self.conf["KEYBOARD"]["fullscreen"]
                 ): self.toggle_fullscreen,
             },
-            Phase.OVER: {
+            State.OVER: {
                 getattr(arcade.key, self.conf["KEYBOARD"]["start"]): self.new_game,
                 getattr(
                     arcade.key, self.conf["KEYBOARD"]["fullscreen"]
@@ -369,33 +396,61 @@ AGAIN""".format(
             self.music.seek(0)
             self.music.play()
 
+        self.state = State.PLAYING
+
     def on_new_level(self, level):
         self.show_text("LEVEL\n{:n}".format(level))
 
     def on_generation_phase(self, matrix, falling_piece, ghost_piece, next_pieces):
-        matrix.sprites.refresh()
+        matrix.sprites.update()
         falling_piece.sprites = TetrominoSprites(falling_piece, self)
         ghost_piece.sprites = TetrominoSprites(ghost_piece, self, GHOST_ALPHA)
         next_pieces[-1].sprites = TetrominoSprites(next_pieces[-1], self)
         for piece, coord in zip(next_pieces, NEXT_PIECES_COORDS):
             piece.coord = coord
-            piece.sprites.refresh()
 
-    def on_falling_phase(self, falling_piece, ghost_piece):
-        falling_piece.sprites.refresh()
-        ghost_piece.sprites.refresh()
+    def on_falling_phase(self, falling_piece):
+        falling_piece.sprites.set_texture(Texture.NORMAL)
 
-    def on_lock_phase(self, locked_piece):
-        locked_piece.sprites.refresh(texture=LOCKED_TEXTURE)
+    def on_locked(self, falling_piece):
+        falling_piece.sprites.set_texture(Texture.LOCKED)
 
-    def on_locked(self, matrix, locked_piece):
-        for mino in locked_piece:
+    def on_locks_down(self, matrix, falling_piece):
+        falling_piece.sprites.set_texture(Texture.NORMAL)
+        for mino in falling_piece:
             matrix.sprites.append(mino.sprite)
 
-    def on_line_remove(self, matrix, y):
+    def on_animate_phase(self, matrix, lines_to_remove):
+        for y in lines_to_remove:
+            line_textures = tuple(TEXTURES[mino.color] for mino in matrix[y])
+            self.exploding_minoes[y] = arcade.Emitter(
+                center_xy=(matrix.bg.left, matrix.bg.bottom + (y + 0.5) * MINO_SIZE),
+                emit_controller=arcade.EmitBurst(COLLUMNS),
+                particle_factory=lambda emitter: arcade.LifetimeParticle(
+                    filename_or_texture=random.choice(line_textures),
+                    change_xy=arcade.rand_in_rect(
+                        (-COLLUMNS * MINO_SIZE, -4 * MINO_SIZE),
+                        2 * COLLUMNS * MINO_SIZE,
+                        5 * MINO_SIZE,
+                    ),
+                    lifetime=0.2,
+                    center_xy=arcade.rand_on_line((0, 0), (matrix.bg.width, 0)),
+                    scale=self.scale,
+                    alpha=NORMAL_ALPHA,
+                    change_angle=2,
+                    mutation_callback=self.speed_up_particule,
+                ),
+            )
+
+    def speed_up_particule(self, particule):
+        particule.change_x *= PARTICULE_ACCELERATION
+        particule.change_y *= PARTICULE_ACCELERATION
+
+    def on_eliminate_phase(self, matrix, lines_to_remove):
+        for y in lines_to_remove:
             matrix.sprites.remove_line(y)
 
-    def on_pattern_phase(self, pattern_name, pattern_score, nb_combo, combo_score):
+    def on_completion_phase(self, pattern_name, pattern_score, nb_combo, combo_score):
         if pattern_score:
             self.show_text("{:s}\n{:n}".format(pattern_name, pattern_score))
         if combo_score:
@@ -405,58 +460,54 @@ AGAIN""".format(
         held_piece.coord = HELD_PIECE_COORD
         if type(held_piece) == I_Tetrimino:
             held_piece.coord += Movement.LEFT
-        held_piece.sprites.refresh()
 
-    def pause(self):
-        super().pause()
+    def on_pause(self):
+        self.state = State.PAUSED
         if self.music:
             self.music.pause()
 
     def resume(self):
-        super().resume()
         if self.music:
             self.music.play()
+        self.state = State.PLAYING
 
     def on_game_over(self):
+        self.state = State.OVER
         if self.music:
             self.music.pause()
 
     def on_key_press(self, key, modifiers):
-        for key_or_modifier in (key, modifiers):
         try:
-                action = self.key_map[self.phase][key_or_modifier]
+            action = self.key_map[self.state][key]
         except KeyError:
-                pass
+            return
         else:
             self.do_action(action)
 
     def on_key_release(self, key, modifiers):
-        for key_or_modifier in (key, modifiers):
         try:
-                action = self.key_map[self.phase][key_or_modifier]
+            action = self.key_map[self.state][key]
         except KeyError:
-                pass
+            return
         else:
             self.remove_action(action)
 
     def show_text(self, text):
         self.highlight_texts.append(text)
-        self.restart(self.del_highlight_text, HIGHLIGHT_TEXT_DISPLAY_DELAY)
+        self.timer.postpone(self.del_highlight_text, HIGHLIGHT_TEXT_DISPLAY_DELAY)
 
     def del_highlight_text(self):
         if self.highlight_texts:
             self.highlight_texts.pop(0)
         else:
-            self.stop(self.del_highlight_text)
+            self.timer.cancel(self.del_highlight_text)
 
     def on_draw(self):
         arcade.start_render()
         self.bg.draw()
 
-        if self.phase not in (Phase.STARTING, Phase.PAUSED):
+        if self.state not in (State.STARTING, State.PAUSED):
             self.matrix.bg.draw()
-            self.held.bg.draw()
-            self.next.bg.draw()
             self.matrix.sprites.draw()
 
             for tetromino in [
@@ -504,12 +555,16 @@ AGAIN""".format(
                     anchor_x="right",
                 )
 
+        for exploding_minoes in self.exploding_minoes:
+            if exploding_minoes:
+                exploding_minoes.draw()
+
         highlight_text = {
-            Phase.STARTING: self.start_text,
-            Phase.FALLING: self.highlight_texts[0] if self.highlight_texts else "",
-            Phase.PAUSED: self.pause_text,
-            Phase.OVER: self.game_over_text,
-        }.get(self.phase, "")
+            State.STARTING: self.start_text,
+            State.PLAYING: self.highlight_texts[0] if self.highlight_texts else "",
+            State.PAUSED: self.pause_text,
+            State.OVER: self.game_over_text,
+        }.get(self.state, "")
         if highlight_text:
             arcade.draw_text(
                 text=highlight_text,
@@ -545,14 +600,6 @@ AGAIN""".format(
         self.matrix.bg.left = int(self.matrix.bg.left)
         self.matrix.bg.top = int(self.matrix.bg.top)
 
-        self.held.bg.scale = self.scale
-        self.held.bg.right = self.matrix.bg.left
-        self.held.bg.top = self.matrix.bg.top
-
-        self.next.bg.scale = self.scale
-        self.next.bg.left = self.matrix.bg.right
-        self.next.bg.top = self.matrix.bg.top
-
         self.matrix.sprites.resize(self.scale)
 
         for tetromino in [
@@ -569,7 +616,7 @@ AGAIN""".format(
                 crypted_high_score = f.read()
                 super().load_high_score(crypted_high_score)
         except:
-            self.high_score = 0
+            self.stats.high_score = 0
 
     def save_high_score(self):
         try:
@@ -588,29 +635,17 @@ High score could not be saved:
                 + str(e)
             )
 
-    def start(self, task, period):
-        _task = lambda _: task()
-        self.tasks[task] = _task
-        arcade.schedule(_task, period)
-
-    def stop(self, task):
-        try:
-            _task = self.tasks[task]
-        except KeyError:
-            pass
-        else:
-            arcade.unschedule(_task)
-            del self.tasks[task]
-
-    def restart(self, task, period):
-        try:
-            _task = self.tasks[task]
-        except KeyError:
-            _task = lambda _: task()
-            self.tasks[task] = _task
-        else:
-            arcade.unschedule(_task)
-        arcade.schedule(_task, period)
+    def update(self, delta_time):
+        for piece in [
+            self.held.piece,
+            self.matrix.piece,
+            self.matrix.ghost,
+        ] + self.next.pieces:
+            if piece:
+                piece.sprites.update()
+        for exploding_minoes in self.exploding_minoes:
+            if exploding_minoes:
+                exploding_minoes.update()
 
     def on_close(self):
         self.save_high_score()

build-requirements.txt

@@ -1 +1,2 @@
-arcade cx-freeze
+arcade
+cx-freeze

setup.py

@@ -29,7 +29,7 @@ options = {
 }
 setup(
     name="TetrArcade",
-    version="0.3",
+    version="0.5",
     description="Tetris clone",
     author="AdrienMalin",
     executables=[executable],

test.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from TetrArcade import TetrArcade, Phase, MinoSprite
+from TetrArcade import TetrArcade, MinoSprite, State
 from tetrislogic import Mino, Color, Coord
 
 game = TetrArcade()
@@ -15,16 +15,22 @@ game.pause()
 game.resume()
 game.move_right()
 game.hold()
+game.update(0)
+game.on_draw()
 game.rotate_clockwise()
 game.hold()
+game.update(0)
+game.on_draw()
 game.rotate_counter()
 for i in range(22):
     game.soft_drop()
     game.on_draw()
 game.lock_phase()
 game.hold()
-game.matrix.sprites.refresh()
+game.update(0)
 game.on_draw()
-while game.phase != Phase.OVER:
+game.matrix.sprites.update()
+game.on_draw()
+while game.state != State.OVER:
     game.hard_drop()
 game.on_draw()

tetrislogic/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from .consts import LINES, COLLUMNS, NEXT_PIECES
-from .utils import Movement, Rotation, Color, Coord, Phase
+from .utils import Movement, Spin, Color, Coord
 from .tetromino import (
     Mino,
     Tetromino,
@@ -12,4 +12,4 @@ from .tetromino import (
     T_Tetrimino,
     Z_Tetrimino,
 )
-from .tetrislogic import TetrisLogic, Matrix
+from .tetrislogic import TetrisLogic, Matrix, AbstractTimer

tetrislogic/consts.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from .utils import Coord
+from .utils import Coord, T_Spin
 
 
 # Matrix
@@ -15,3 +15,13 @@ AUTOREPEAT_PERIOD = 0.010  # Official : 0.010 s
 
 # Piece init coord
 MATRIX_PIECE_COORD = Coord(4, LINES)
+
+# Scores
+LINES_CLEAR_NAME = "LINES_CLEAR_NAME"
+SCORES = (
+    {LINES_CLEAR_NAME: "", T_Spin.NONE: 0, T_Spin.MINI: 1, T_Spin.T_SPIN: 4},
+    {LINES_CLEAR_NAME: "SINGLE", T_Spin.NONE: 1, T_Spin.MINI: 2, T_Spin.T_SPIN: 8},
+    {LINES_CLEAR_NAME: "DOUBLE", T_Spin.NONE: 3, T_Spin.T_SPIN: 12},
+    {LINES_CLEAR_NAME: "TRIPLE", T_Spin.NONE: 5, T_Spin.T_SPIN: 16},
+    {LINES_CLEAR_NAME: "TETRIS", T_Spin.NONE: 8},
+)

tetrislogic/tetrislogic.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import pickle
 
-from .utils import Coord, Movement, Rotation, T_Spin, Phase
+from .utils import Coord, Movement, Spin, T_Spin, T_Slot
 from .tetromino import Tetromino, T_Tetrimino
 from .consts import (
     LINES,
@@ -12,13 +12,26 @@ from .consts import (
     AUTOREPEAT_DELAY,
     AUTOREPEAT_PERIOD,
     MATRIX_PIECE_COORD,
+    SCORES,
+    LINES_CLEAR_NAME,
 )
 
 
-LINES_CLEAR_NAME = "LINES_CLEAR_NAME"
 CRYPT_KEY = 987943759387540938469837689379857347598347598379584857934579343
 
 
+class AbstractTimer:
+    def postpone(task, delay):
+        raise Warning("AbstractTimer.postpone is not implemented.")
+
+    def cancel(self, task):
+        raise Warning("AbstractTimer.stop is not implemented.")
+
+    def reset(self, task, period):
+        self.timer.cancel(task)
+        self.timer.postpone(task, period)
+
+
 class PieceContainer:
     def __init__(self):
         self.piece = None
@@ -49,6 +62,17 @@ class Matrix(list, PieceContainer):
             0 <= coord.x < self.collumns and 0 <= coord.y and not self[coord.y][coord.x]
         )
 
+    def space_to_move(self, potential_coord, minoes_coord):
+        return all(
+            self.cell_is_free(potential_coord + mino_coord)
+            for mino_coord in minoes_coord
+        )
+
+    def space_to_fall(self):
+        return self.space_to_move(
+            self.piece.coord + Movement.DOWN, (mino.coord for mino in self.piece)
+        )
+
 
 class NextQueue(PieceContainer):
     def __init__(self, nb_pieces):
@@ -58,15 +82,6 @@ class NextQueue(PieceContainer):
 
 
 class Stats:
-
-    SCORES = (
-        {LINES_CLEAR_NAME: "", T_Spin.NONE: 0, T_Spin.MINI: 1, T_Spin.T_SPIN: 4},
-        {LINES_CLEAR_NAME: "SINGLE", T_Spin.NONE: 1, T_Spin.MINI: 2, T_Spin.T_SPIN: 8},
-        {LINES_CLEAR_NAME: "DOUBLE", T_Spin.NONE: 3, T_Spin.T_SPIN: 12},
-        {LINES_CLEAR_NAME: "TRIPLE", T_Spin.NONE: 5, T_Spin.T_SPIN: 16},
-        {LINES_CLEAR_NAME: "TETRIS", T_Spin.NONE: 8},
-    )
-
     def _get_score(self):
         return self._score
 
@@ -79,6 +94,7 @@ class Stats:
 
     def __init__(self):
         self._score = 0
+        self.high_score = 0
         self.time = 0
 
     def new_game(self, level):
@@ -103,7 +119,7 @@ class Stats:
     def update_time(self):
         self.time += 1
 
-    def pattern_phase(self, t_spin, lines_cleared):
+    def locks_down(self, t_spin, lines_cleared):
         pattern_name = []
         pattern_score = 0
         combo_score = 0
@@ -111,13 +127,13 @@ class Stats:
         if t_spin:
             pattern_name.append(t_spin)
         if lines_cleared:
-            pattern_name.append(self.SCORES[lines_cleared][LINES_CLEAR_NAME])
+            pattern_name.append(SCORES[lines_cleared][LINES_CLEAR_NAME])
             self.combo += 1
         else:
             self.combo = -1
 
         if lines_cleared or t_spin:
-            pattern_score = self.SCORES[lines_cleared][t_spin]
+            pattern_score = SCORES[lines_cleared][t_spin]
             self.goal -= pattern_score
             pattern_score *= 100 * self.level
             pattern_name = "\n".join(pattern_name)
@@ -132,17 +148,16 @@ class Stats:
 
 class TetrisLogic:
 
-    LINES = LINES
-    COLLUMNS = COLLUMNS
-    NEXT_PIECES = NEXT_PIECES
+    # These class attributes can be redefined on inheritance
     AUTOREPEAT_DELAY = AUTOREPEAT_DELAY
     AUTOREPEAT_PERIOD = AUTOREPEAT_PERIOD
     MATRIX_PIECE_COORD = MATRIX_PIECE_COORD
 
+    timer = AbstractTimer()
+
     def __init__(self, lines=LINES, collumns=COLLUMNS, next_pieces=NEXT_PIECES):
         self.stats = Stats()
         self.load_high_score()
-        self.phase = Phase.STARTING
         self.held = HoldQueue()
         self.matrix = Matrix(lines, collumns)
         self.next = NextQueue(next_pieces)
@@ -153,12 +168,11 @@ class TetrisLogic:
         self.stats.new_game(level)
 
         self.pressed_actions = []
-        self.auto_repeat = False
 
         self.matrix.reset()
         self.next.pieces = [Tetromino() for n in range(self.next.nb_pieces)]
         self.held.piece = None
-        self.start(self.stats.update_time, 1)
+        self.timer.postpone(self.stats.update_time, 1)
 
         self.on_new_game(self.next.pieces)
         self.new_level()
@@ -174,129 +188,100 @@ class TetrisLogic:
     def on_new_level(self, level):
         pass
 
-    def generation_phase(self):
+    # Tetris Engine
+
+    def generation_phase(self, held_piece=None):
+        if not held_piece:
             self.matrix.piece = self.next.pieces.pop(0)
             self.next.pieces.append(Tetromino())
         self.matrix.piece.coord = self.MATRIX_PIECE_COORD
         self.matrix.ghost = self.matrix.piece.ghost()
+        self.refresh_ghost()
+        # if self.pressed_actions:
+        #    self.timer.postpone(self.repeat_action, self.AUTOREPEAT_DELAY)
 
         self.on_generation_phase(
             self.matrix, self.matrix.piece, self.matrix.ghost, self.next.pieces
         )
-        if not self.move(Movement.DOWN):
-            self.game_over()
-        else:
-            self.restart(self.fall, self.stats.fall_delay)
+        if self.move(Movement.DOWN):
             self.falling_phase()
+        else:
+            self.game_over()
 
-    def on_generation_phase(self, matrix, falling_piece, ghost_piece, next_pieces):
-        pass
-
-    def falling_phase(self):
-        self.phase = Phase.FALLING
+    def refresh_ghost(self):
         self.matrix.ghost.coord = self.matrix.piece.coord
         for ghost_mino, current_mino in zip(self.matrix.ghost, self.matrix.piece):
             ghost_mino.coord = current_mino.coord
-        while self.space_to_move(
+        while self.matrix.space_to_move(
             self.matrix.ghost.coord + Movement.DOWN,
             (mino.coord for mino in self.matrix.ghost),
         ):
             self.matrix.ghost.coord += Movement.DOWN
 
-        self.on_falling_phase(self.matrix.piece, self.matrix.ghost)
-
-    def on_falling_phase(self, falling_piece, ghost_piece):
+    def on_generation_phase(self, matrix, falling_piece, ghost_piece, next_pieces):
         pass
 
-    def fall(self):
+    def falling_phase(self):
+        self.timer.cancel(self.lock_phase)
+        self.timer.cancel(self.locks_down)
+        self.matrix.piece.locked = False
+        self.timer.postpone(self.lock_phase, self.stats.fall_delay)
+        self.on_falling_phase(self.matrix.piece)
+
+    def on_falling_phase(self, falling_piece):
+        pass
+
+    def lock_phase(self):
         self.move(Movement.DOWN)
 
+    def on_locked(self, falling_piece):
+        pass
+
     def move(self, movement, rotated_coords=None, lock=True):
         potential_coord = self.matrix.piece.coord + movement
-        if self.space_to_move(
-            potential_coord,
-            rotated_coords or (mino.coord for mino in self.matrix.piece),
-        ):
+        potential_minoes_coords = rotated_coords or (
+            mino.coord for mino in self.matrix.piece
+        )
+        if self.matrix.space_to_move(potential_coord, potential_minoes_coords):
             self.matrix.piece.coord = potential_coord
             if rotated_coords:
                 for mino, coord in zip(self.matrix.piece, rotated_coords):
                     mino.coord = coord
-            else:
+            self.refresh_ghost()
             if movement != Movement.DOWN:
-                    self.matrix.piece.last_rotation_point = None
-                if self.phase == Phase.LOCK:
-                    self.restart(self.pattern_phase, self.stats.lock_delay)
+                self.matrix.piece.rotated_last = False
+            if self.matrix.space_to_fall():
                 self.falling_phase()
+            else:
+                self.matrix.piece.locked = True
+                self.on_locked(self.matrix.piece)
+                self.timer.reset(self.locks_down, self.stats.lock_delay)
             return True
         else:
-            if lock and self.phase != Phase.LOCK and movement == Movement.DOWN:
-                self.lock_phase()
             return False
 
-    def lock_phase(self):
-        self.phase = Phase.LOCK
-        self.on_lock_phase(self.matrix.piece)
-        self.start(self.pattern_phase, self.stats.lock_delay)
-
-    def on_lock_phase(self, locked_piece):
-        pass
-
-    def space_to_move(self, potential_coord, minoes_coord):
-        return all(
-            self.matrix.cell_is_free(potential_coord + mino_coord)
-            for mino_coord in minoes_coord
-        )
-
-    def rotate(self, rotation):
+    def rotate(self, spin):
         rotated_coords = tuple(
-            Coord(rotation * mino.coord.y, -rotation * mino.coord.x)
+            Coord(spin * mino.coord.y, -spin * mino.coord.x)
             for mino in self.matrix.piece
         )
         for rotation_point, liberty_degree in enumerate(
-            self.matrix.piece.SRS[rotation][self.matrix.piece.orientation], start=1
+            self.matrix.piece.SRS[spin][self.matrix.piece.orientation], start=1
         ):
-            if self.move(liberty_degree, rotated_coords):
+            if self.move(liberty_degree, rotated_coords, lock=False):
                 self.matrix.piece.orientation = (
-                    self.matrix.piece.orientation + rotation
+                    self.matrix.piece.orientation + spin
                 ) % 4
-                self.matrix.piece.last_rotation_point = rotation_point
+                self.matrix.piece.rotated_last = True
+                if rotation_point == 5:
+                    self.matrix.piece.rotation_point_5_used = True
                 return True
         else:
             return False
 
-    def hold(self):
-        if not self.matrix.piece.hold_enabled:
-            return
-
-        self.matrix.piece.hold_enabled = False
-        self.stop(self.pattern_phase)
-        self.stop(self.fall)
-        self.matrix.piece, self.held.piece = self.held.piece, self.matrix.piece
-
-        self.on_hold(self.held.piece)
-
-        if self.matrix.piece:
-            self.matrix.piece.coord = self.MATRIX_PIECE_COORD
-            self.matrix.ghost = self.matrix.piece.ghost()
-            self.falling_phase()
-        else:
-            self.generation_phase()
-
-    def on_hold(self, held_piece):
-        pass
-
-    def pattern_phase(self):
-        self.phase = Phase.PATTERN
-        self.matrix.piece.prelocked = False
-        self.stop(self.pattern_phase)
-        self.stop(self.fall)
-
-        # Piece unlocked
-        if self.space_to_move(
-            self.matrix.piece.coord + Movement.DOWN,
-            (mino.coord for mino in self.matrix.piece),
-        ):
-            return
+    def locks_down(self):
+        # self.timer.cancel(self.repeat_action)
+        self.timer.cancel(self.lock_phase)
 
         # Game over
         if all(
@@ -306,28 +291,27 @@ class TetrisLogic:
             self.game_over()
             return
 
-        if self.pressed_actions:
-            self.auto_repeat = False
-            self.stop(self.repeat_action)
-
         for mino in self.matrix.piece:
             coord = mino.coord + self.matrix.piece.coord
             if coord.y <= self.matrix.lines + 3:
                 self.matrix[coord.y][coord.x] = mino
-        self.on_locked(self.matrix, self.matrix.piece)
+
+        self.on_locks_down(self.matrix, self.matrix.piece)
+
+        # Pattern phase
 
         # T-Spin
-        if (
-            type(self.matrix.piece) == T_Tetrimino
-            and self.matrix.piece.last_rotation_point is not None
-        ):
-            a = self.is_t_slot(0)
-            b = self.is_t_slot(1)
-            c = self.is_t_slot(3)
-            d = self.is_t_slot(2)
-            if self.matrix.piece.last_rotation_point == 5 or (a and b and (c or d)):
+        if type(self.matrix.piece) == T_Tetrimino and self.matrix.piece.rotated_last:
+            a = self.is_t_slot(T_Slot.A)
+            b = self.is_t_slot(T_Slot.B)
+            c = self.is_t_slot(T_Slot.C)
+            d = self.is_t_slot(T_Slot.D)
+            if a and b and (c or d):
                 t_spin = T_Spin.T_SPIN
             elif c and d and (a or b):
+                if self.matrix.piece.rotation_point_5_used:
+                    t_spin = T_Spin.T_SPIN
+                else:
                     t_spin = T_Spin.MINI
             else:
                 t_spin = T_Spin.NONE
@@ -335,38 +319,50 @@ class TetrisLogic:
             t_spin = T_Spin.NONE
 
         # Clear complete lines
-        lines_cleared = 0
+        self.lines_to_remove = []
         for y, line in reversed(list(enumerate(self.matrix))):
             if all(mino for mino in line):
-                lines_cleared += 1
-                self.on_line_remove(self.matrix, y)
-                self.matrix.pop(y)
-                self.matrix.append_new_line()
+                self.lines_to_remove.append(y)
+        lines_cleared = len(self.lines_to_remove)
         if lines_cleared:
             self.stats.lines_cleared += lines_cleared
 
-        pattern_name, pattern_score, nb_combo, combo_score = self.stats.pattern_phase(
+        # Animate phase
+
+        self.on_animate_phase(self.matrix, self.lines_to_remove)
+
+        # Eliminate phase
+        self.on_eliminate_phase(self.matrix, self.lines_to_remove)
+        for y in self.lines_to_remove:
+            self.matrix.pop(y)
+            self.matrix.append_new_line()
+
+        # Completion phase
+
+        pattern_name, pattern_score, nb_combo, combo_score = self.stats.locks_down(
             t_spin, lines_cleared
         )
-        self.on_pattern_phase(pattern_name, pattern_score, nb_combo, combo_score)
+        self.on_completion_phase(pattern_name, pattern_score, nb_combo, combo_score)
 
         if self.stats.goal <= 0:
             self.new_level()
         else:
             self.generation_phase()
 
-        if self.pressed_actions:
-            self.start(self.repeat_action, self.AUTOREPEAT_DELAY)
-
-    def on_locked(self, matrix, locked_piece):
+    def on_locks_down(self, matrix, falling_piece):
         pass
 
-    def on_line_remove(self, matrix, y):
+    def on_animate_phase(self, matrix, lines_to_remove):
         pass
 
-    def on_pattern_phase(self, pattern_name, pattern_score, nb_combo, combo_score):
+    def on_eliminate_phase(self, matrix, lines_to_remove):
         pass
 
+    def on_completion_phase(self, pattern_name, pattern_score, nb_combo, combo_score):
+        pass
+
+    # Actions
+
     def move_left(self):
         self.move(Movement.LEFT)
 
@@ -374,10 +370,10 @@ class TetrisLogic:
         self.move(Movement.RIGHT)
 
     def rotate_clockwise(self):
-        self.rotate(Rotation.CLOCKWISE)
+        self.rotate(Spin.CLOCKWISE)
 
     def rotate_counter(self):
-        self.rotate(Rotation.COUNTER)
+        self.rotate(Spin.COUNTER)
 
     def soft_drop(self):
         moved = self.move(Movement.DOWN)
@@ -386,9 +382,28 @@ class TetrisLogic:
         return moved
 
     def hard_drop(self):
+        self.timer.cancel(self.lock_phase)
+        self.timer.cancel(self.locks_down)
         while self.move(Movement.DOWN, lock=False):
             self.stats.score += 2
-        self.pattern_phase()
+        self.locks_down()
+
+    def hold(self):
+        if not self.matrix.piece.hold_enabled:
+            return
+
+        self.matrix.piece.hold_enabled = False
+        self.timer.cancel(self.lock_phase)
+        self.matrix.piece, self.held.piece = self.held.piece, self.matrix.piece
+
+        for mino, coord in zip(self.held.piece, self.held.piece.MINOES_COORDS):
+            mino.coord = coord
+
+        self.on_hold(self.held.piece)
+        self.generation_phase(self.matrix.piece)
+
+    def on_hold(self, held_piece):
+        pass
 
     T_SLOT_COORDS = (Coord(-1, 1), Coord(1, 1), Coord(-1, 1), Coord(-1, -1))
 
@@ -400,21 +415,25 @@ class TetrisLogic:
         return not self.matrix.cell_is_free(t_slot_coord)
 
     def pause(self):
-        self.phase = Phase.PAUSED
         self.stop_all()
         self.pressed_actions = []
-        self.auto_repeat = False
-        self.stop(self.repeat_action)
+        self.timer.cancel(self.repeat_action)
+        self.on_pause()
+
+    def on_pause(self):
+        pass
 
     def resume(self):
-        self.phase = Phase.FALLING
-        self.start(self.fall, self.stats.fall_delay)
-        if self.phase == Phase.LOCK:
-            self.start(self.pattern_phase, self.stats.lock_delay)
-        self.start(self.stats.update_time, 1)
+        self.timer.postpone(self.lock_phase, self.stats.fall_delay)
+        if self.matrix.piece.locked:
+            self.timer.postpone(self.locks_down, self.stats.lock_delay)
+        self.timer.postpone(self.stats.update_time, 1)
+        self.on_resume()
+
+    def on_resume(self):
+        pass
 
     def game_over(self):
-        self.phase = Phase.OVER
         self.stop_all()
         self.save_high_score()
         self.on_game_over()
@@ -423,30 +442,26 @@ class TetrisLogic:
         pass
 
     def stop_all(self):
-        self.stop(self.fall)
-        self.stop(self.pattern_phase)
-        self.stop(self.stats.update_time)
+        self.timer.cancel(self.lock_phase)
+        self.timer.cancel(self.locks_down)
+        self.timer.cancel(self.stats.update_time)
 
     def do_action(self, action):
         action()
         if action in self.autorepeatable_actions:
-            self.auto_repeat = False
             self.pressed_actions.append(action)
             if action == self.soft_drop:
                 delay = self.stats.fall_delay / 20
             else:
                 delay = self.AUTOREPEAT_DELAY
-            self.restart(self.repeat_action, delay)
+            self.timer.reset(self.repeat_action, delay)
 
     def repeat_action(self):
-        if self.pressed_actions:
+        if not self.pressed_actions:
+            return
+
         self.pressed_actions[-1]()
-            if not self.auto_repeat:
-                self.auto_repeat = True
-                self.restart(self.repeat_action, self.AUTOREPEAT_PERIOD)
-        else:
-            self.auto_repeat = False
-            self.stop(self.repeat_action)
+        self.timer.postpone(self.repeat_action, self.AUTOREPEAT_PERIOD)
 
     def remove_action(self, action):
         if action in self.autorepeatable_actions:
@@ -474,13 +489,3 @@ High score is set to 0"""
         crypted_high_score = self.stats.high_score ^ CRYPT_KEY
         crypted_high_score = pickle.dumps(crypted_high_score)
         return crypted_high_score
-
-    def start(task, period):
-        raise Warning("TetrisLogic.start is not implemented.")
-
-    def stop(self, task):
-        raise Warning("TetrisLogic.stop is not implemented.")
-
-    def restart(self, task, period):
-        self.stop(task)
-        self.start(task, period)

tetrislogic/tetromino.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import random
 
-from .utils import Coord, Rotation, Color
+from .utils import Coord, Spin, Color
 
 
 class Mino:
@@ -32,13 +32,13 @@ class TetrominoBase(list):
 
     # Super rotation system
     SRS = {
-        Rotation.CLOCKWISE: (
+        Spin.CLOCKWISE: (
             (Coord(0, 0), Coord(-1, 0), Coord(-1, 1), Coord(0, -2), Coord(-1, -2)),
             (Coord(0, 0), Coord(1, 0), Coord(1, -1), Coord(0, 2), Coord(1, 2)),
             (Coord(0, 0), Coord(1, 0), Coord(1, 1), Coord(0, -2), Coord(1, -2)),
             (Coord(0, 0), Coord(-1, 0), Coord(-1, -1), Coord(0, -2), Coord(-1, 2)),
         ),
-        Rotation.COUNTER: (
+        Spin.COUNTER: (
             (Coord(0, 0), Coord(1, 0), Coord(1, 1), Coord(0, -2), Coord(1, -2)),
             (Coord(0, 0), Coord(1, 0), Coord(1, -1), Coord(0, 2), Coord(1, 2)),
             (Coord(0, 0), Coord(-1, 0), Coord(-1, 1), Coord(0, -2), Coord(-1, -2)),
@@ -49,9 +49,9 @@ class TetrominoBase(list):
     def __init__(self):
         super().__init__(Mino(self.MINOES_COLOR, coord) for coord in self.MINOES_COORDS)
         self.orientation = 0
-        self.last_rotation_point = None
+        self.rotated_last = False
+        self.rotation_point_5_used = False
         self.hold_enabled = True
-        self.prelocked = False
 
     def ghost(self):
         return type(self)()
@@ -60,8 +60,8 @@ class TetrominoBase(list):
 class O_Tetrimino(TetrominoBase, metaclass=MetaTetromino):
 
     SRS = {
-        Rotation.CLOCKWISE: (tuple(), tuple(), tuple(), tuple()),
-        Rotation.COUNTER: (tuple(), tuple(), tuple(), tuple()),
+        Spin.CLOCKWISE: (tuple(), tuple(), tuple(), tuple()),
+        Spin.COUNTER: (tuple(), tuple(), tuple(), tuple()),
     }
     MINOES_COORDS = (Coord(0, 0), Coord(1, 0), Coord(0, 1), Coord(1, 1))
     MINOES_COLOR = Color.YELLOW
@@ -73,13 +73,13 @@ class O_Tetrimino(TetrominoBase, metaclass=MetaTetromino):
 class I_Tetrimino(TetrominoBase, metaclass=MetaTetromino):
 
     SRS = {
-        Rotation.CLOCKWISE: (
+        Spin.CLOCKWISE: (
             (Coord(1, 0), Coord(-1, 0), Coord(2, 0), Coord(-1, -1), Coord(2, 2)),
             (Coord(0, -1), Coord(-1, -1), Coord(2, -1), Coord(-1, 1), Coord(2, -2)),
             (Coord(-1, 0), Coord(1, 0), Coord(-2, 0), Coord(1, 1), Coord(-2, -2)),
             (Coord(0, -1), Coord(1, 1), Coord(-2, 1), Coord(1, -1), Coord(-2, 2)),
         ),
-        Rotation.COUNTER: (
+        Spin.COUNTER: (
             (Coord(0, -1), Coord(-1, -1), Coord(2, -1), Coord(-1, 1), Coord(2, -2)),
             (Coord(-1, 0), Coord(1, 0), Coord(-2, 0), Coord(1, 1), Coord(-2, -2)),
             (Coord(0, 1), Coord(1, 1), Coord(-2, 1), Coord(1, -1), Coord(-2, 2)),

tetrislogic/utils.py

@@ -15,7 +15,7 @@ class Movement:
     DOWN = Coord(0, -1)
 
 
-class Rotation:
+class Spin:
 
     CLOCKWISE = 1
     COUNTER = -1
@@ -28,6 +28,14 @@ class T_Spin:
     T_SPIN = "T-SPIN"
 
 
+class T_Slot:
+
+    A = 0
+    B = 1
+    C = 3
+    D = 2
+
+
 class Color:
 
     BLUE = 0
@@ -37,13 +45,3 @@ class Color:
     ORANGE = 4
     RED = 5
     YELLOW = 6
-
-
-class Phase:
-
-    STARTING = "STARTING"
-    FALLING = "FALLING"
-    LOCK = "LOCK"
-    PATTERN = "PATTERN"
-    PAUSED = "PAUSED"
-    OVER = "OVER"