tetrarcade.py

@@ -13,7 +13,7 @@ You can install it with:
 python -m pip install --user arcade"""
     )
 
-from tetrislogic import TetrisLogic, State
+from tetrislogic import TetrisLogic, State, NB_LINES
 
 
 # Constants
@@ -27,8 +27,8 @@ HIGHLIGHT_TEXT_DISPLAY_DELAY = 0.7
 
 # Transparency (0=invisible, 255=opaque)
 NORMAL_ALPHA = 200
-PRELOCKED_ALPHA = 100
-GHOST_ALPHA = 30
+PRELOCKED_ALPHA = 127
+GHOST_ALPHA = 50
 MATRIX_SPRITE_ALPHA = 100
 
 # Paths
@@ -183,50 +183,57 @@ class TetrArcade(TetrisLogic, arcade.Window):
     def load_next(self):
         super().load_next()
         for tetromino in self.next:
-            self.load_minoes(tetromino)
+            self.load_minoes_sprite(tetromino)
 
     def new_current(self):
         super().new_current()
-        self.update_tetromino(self.current)
-        self.load_minoes(self.next[-1])
-        self.load_minoes(self.ghost, GHOST_ALPHA)
+        self.update_sprites_position(self.current)
+        self.load_minoes_sprite(self.next[-1])
+        self.load_minoes_sprite(self.ghost, GHOST_ALPHA)
         for tetromino in [self.current, self.ghost] + self.next:
-            self.update_tetromino(tetromino)
-            self.reload_all_tetrominoes()
+            self.update_sprites_position(tetromino)
+            self.reload_all_tetrominoes_sprites()
 
-    def move(self, movement, prelock=True):
-        moved = super().move(movement, prelock)
-        if moved or self.current.prelocked:
+    def move(self, movement, prelock=False):
+        if super().move(movement, prelock):
             for tetromino in (self.current, self.ghost):
-                self.update_tetromino(tetromino)
-        return moved
+                self.update_sprites_position(tetromino)
+            return True
+        else:
+            return False
 
     def rotate(self, rotation):
         if super().rotate(rotation):
             for tetromino in (self.current, self.ghost):
-                self.update_tetromino(tetromino)
+                self.update_sprites_position(tetromino)
             return True
         else:
             return False
 
     def swap(self):
         super().swap()
-        self.load_minoes(self.ghost, GHOST_ALPHA)
+        self.load_minoes_sprite(self.ghost, GHOST_ALPHA)
         for tetromino in [self.held, self.current, self.ghost]:
             if tetromino:
-                self.update_tetromino(tetromino)
-        self.reload_all_tetrominoes()
+                self.update_sprites_position(tetromino)
+        self.reload_all_tetrominoes_sprites()
 
     def lock(self):
-        self.update_tetromino(self.current)
+        self.update_sprites_position(self.current)
         super().lock()
         self.matrix.minoes_sprites = arcade.SpriteList()
-        for y, line in enumerate(self.matrix):
-            for x, mino in enumerate(line):
+        for line in self.matrix:
+            for mino in line:
                 if mino:
-                    self.update_mino(mino, x, y, NORMAL_ALPHA)
                     self.matrix.minoes_sprites.append(mino.sprite)
 
+    def remove_line_of_matrix(self, line):
+        super().remove_line_of_matrix(line)
+        for line in self.matrix[line:NB_LINES+2]:
+            for mino in line:
+                if mino:
+                    mino.sprite.center_y -= mino.sprite.height-1
+
     def game_over(self):
         super().game_over()
 
@@ -315,21 +322,21 @@ class TetrArcade(TetrisLogic, arcade.Window):
                 anchor_y = 'center'
             )
 
-    def load_minoes(self, tetromino, alpha=NORMAL_ALPHA):
+    def load_minoes_sprite(self, tetromino, alpha=NORMAL_ALPHA):
         path = MINOES_SPRITES_PATHS[tetromino.MINOES_COLOR]
         tetromino.alpha = alpha
         for mino in tetromino:
             mino.sprite = arcade.Sprite(path)
             mino.sprite.alpha = alpha
 
-    def reload_all_tetrominoes(self):
+    def reload_all_tetrominoes_sprites(self):
         self.tetrominoes_sprites = arcade.SpriteList()
         for tetromino in [self.held, self.current, self.ghost] + self.next:
             if tetromino:
                 for mino in tetromino:
                     self.tetrominoes_sprites.append(mino.sprite)
 
-    def update_tetromino(self, tetromino):
+    def update_sprites_position(self, tetromino):
         alpha = (
             PRELOCKED_ALPHA
             if tetromino.prelocked
@@ -337,11 +344,8 @@ class TetrArcade(TetrisLogic, arcade.Window):
         )
         for mino in tetromino:
             coord = mino.coord + tetromino.coord
-            self.update_mino(mino, coord.x, coord.y, alpha)
-
-    def update_mino(self, mino, x, y, alpha):
-        mino.sprite.left = self.matrix.sprite.left + x*(mino.sprite.width-1)
-        mino.sprite.bottom = self.matrix.sprite.bottom + y*(mino.sprite.height-1)
+            mino.sprite.left = self.matrix.sprite.left + coord.x*(mino.sprite.width-1)
+            mino.sprite.bottom = self.matrix.sprite.bottom + coord.y*(mino.sprite.height-1)
             mino.sprite.alpha = alpha
 
     def load_high_score(self):

tetrislogic/tetrislogic.py

@@ -258,7 +258,7 @@ class TetrisLogic():
         for y, line in reversed(list(enumerate(self.matrix))):
             if all(mino for mino in line):
                 nb_lines_cleared += 1
-                self.matrix.pop(y)
+                self.remove_line_of_matrix(y)
                 self.append_new_line_to_matrix()
         if nb_lines_cleared:
             self.nb_lines_cleared += nb_lines_cleared
@@ -295,6 +295,9 @@ class TetrisLogic():
         else:
             self.new_current()
 
+    def remove_line_of_matrix(self, line):
+        self.matrix.pop(line)
+
     def can_move(self, potential_coord, minoes_coords):
         return all(
             self.matrix.cell_is_free(potential_coord+mino_coord)

tetrislogic/tetromino.py

@@ -57,8 +57,8 @@ class Tetromino:
     class O(AbstractTetromino, metaclass=MetaTetromino):
 
         SRS = {
-            Rotation.CLOCKWISE: (tuple(), tuple(), tuple(), tuple()),
             Rotation.COUNTER: (tuple(), tuple(), tuple(), tuple()),
+            Rotation.CLOCKWISE: (tuple(), tuple(), tuple(), tuple())
         }
         MINOES_COORDS = (Coord(0, 0), Coord(1, 0), Coord(0, 1), Coord(1, 1))
         MINOES_COLOR = "yellow"
@@ -70,18 +70,18 @@ class Tetromino:
     class I(AbstractTetromino, metaclass=MetaTetromino):
 
         SRS = {
-            Rotation.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: (
                 (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)),
-                (Coord(1, 0), Coord(-1, 0), Coord(2, 0), Coord(-1, -1), Coord(2, 2)),
+                (Coord(1, 0), Coord(-1, 0), Coord(2, 0), Coord(-1, -1), Coord(2, 2))
             ),
+            Rotation.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))
+            )
         }
         MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(1, 0), Coord(2, 0))
         MINOES_COLOR = "cyan"