fixes

terminis/pytetris/__init__.py

@@ -0,0 +1,3 @@
+from .core import Tetris, Mino, Point
+
+__all__ = ["Tetris", "Mino", "Point"]

terminis/pytetris/core.py

@@ -0,0 +1,362 @@
+# -*- coding: utf-8 -*-
+
+import random
+import time
+
+
+class Rotation:
+    CLOCKWISE = 1
+    COUNTERCLOCKWISE = -1
+
+
+class Point:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    def __add__(self, other):
+        return Point(self.x+other.x, self.y+other.y)
+    
+    def __eq__(self, other):
+        return self.x == other.x and self.y == other.y
+
+
+class Movement:
+    LEFT  = Point(-1, 0)
+    RIGHT = Point(1, 0)
+    DOWN  = Point(0, 1)
+    
+    
+class Mino:
+    NO_MINO = 0
+    I = 1
+    J = 2
+    L = 3
+    O = 4
+    S = 5
+    T = 6
+    Z = 7
+
+
+class Tetromino:
+    SUPER_ROTATION_SYSTEM = (
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, -1), Point(0, 2), Point(1, 2)),
+            Rotation.CLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, -1), Point(0, 2), Point(-1, 2)),
+        },
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, 1), Point(0, -2), Point(1, -2)),
+            Rotation.CLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, 1), Point(0, -2), Point(1, -2)),
+        },
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, -1), Point(0, 2), Point(-1, 2)),
+            Rotation.CLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, -1), Point(0, 2), Point(1, 2)),
+        },
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, 1), Point(0, -2), Point(-1, -2)),
+            Rotation.CLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, 1), Point(0, 2), Point(-1, -2))
+        }
+    )
+    INIT_POSITION = Point(4, -1)
+    LOCK_DELAY = 0.5
+
+    def __init__(self):
+        self.position = self.INIT_POSITION
+        self.minoes_positions = self.MINOES_POSITIONS
+        self.orientation = 0
+        self.rotation_point_5_used = False
+        self.rotated_last = False
+        self.hold_enabled = True
+        self.prelocked = False
+
+    def t_spin(self):
+        return ""
+
+
+class O(Tetromino):
+    MINOES_POSITIONS = (Point(0, 0), Point(1, 0), Point(0, -1), Point(1, -1))
+    MINOES_TYPE = Mino.O
+    SUPER_ROTATION_SYSTEM = (tuple(),)
+
+    def _rotate(self, direction):
+        return False
+
+class I(Tetromino):
+    SUPER_ROTATION_SYSTEM = (
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(0, 1), Point(-1, 1), Point(2, 1), Point(-1, -1), Point(2, 2)),
+            Rotation.CLOCKWISE: (Point(1, 0), Point(-1, 0), Point(2, 0), Point(-1, 1), Point(2, -2)),
+        },
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(-1, 0), Point(1, 0), Point(-2, 0), Point(1, -1), Point(-2, 2)),
+            Rotation.CLOCKWISE: (Point(0, 1), Point(-1, 1), Point(2, 1), Point(-1, -1), Point(2, 2)),
+        },
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(0, -1), Point(1, -1), Point(-2, -1), Point(1, 1), Point(-2, -2)),
+            Rotation.CLOCKWISE: (Point(-1, 0), Point(1, 0), Point(-2, 0), Point(1, -1), Point(-2, 2)),
+        },
+        {
+            Rotation.COUNTERCLOCKWISE: (Point(1, 0), Point(-1, 0), Point(2, 0), Point(-1, 1), Point(2, -2)),
+            Rotation.CLOCKWISE: (Point(0, 1), Point(1, -1), Point(-2, -1), Point(1, 1), Point(-2, -2)),
+        },
+    )
+    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(1, 0), Point(2, 0))
+    MINOES_TYPE = Mino.I
+
+class T(Tetromino):
+    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(0, -1), Point(1, 0))
+    MINOES_TYPE = Mino.T
+    T_SLOT = (Point(-1, -1), Point(1, -1), Point(1, 1), Point(-1, 1))
+
+    def t_spin(self):
+        if self.rotated_last:
+            a = not self.matrix.is_free_cell(self.position+self.T_SLOT[self.orientation])
+            b = not self.matrix.is_free_cell(self.position+self.T_SLOT[(1+self.orientation)%4])
+            c = not self.matrix.is_free_cell(self.position+self.T_SLOT[(3+self.orientation)%4])
+            d = not self.matrix.is_free_cell(self.position+self.T_SLOT[(2+self.orientation)%4])
+            
+            if self.rotation_point_5_used or (a and b and (c or d)):
+                return "T-SPIN"
+            elif c and d and (a or b):
+                return "MINI T-SPIN"
+        return ""
+
+class L(Tetromino):
+    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(1, 0), Point(1, -1))
+    MINOES_TYPE = Mino.L
+
+class J(Tetromino):
+    MINOES_POSITIONS = (Point(-1, -1), Point(-1, 0), Point(0, 0), Point(1, 0))
+    MINOES_TYPE = Mino.J
+
+class S(Tetromino):
+    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(0, -1), Point(1, -1))
+    MINOES_TYPE = Mino.S
+
+class Z(Tetromino):
+    MINOES_POSITIONS = (Point(-1, -1), Point(0, -1), Point(0, 0), Point(1, 0))
+    MINOES_TYPE = Mino.Z
+
+
+class Tetris:
+    TETROMINOES = (O, I, T, L, J, S, Z)
+    LEN_NEXT_QUEUE = 1
+    MATRIX_ROWS = 20
+    MATRIX_COLS = 10
+    INIT_POSITION = Point(4, 0)
+    FALL_DELAY = 1
+    LOCK_DELAY = 0.5
+    AUTOSHIFT_DELAY = 0.2
+    INIT_POSITION = Point(4, -1)
+    SCORES = (
+        {"name": "",       "": 0, "MINI T-SPIN": 1, "T-SPIN": 4},
+        {"name": "SINGLE", "": 1, "MINI T-SPIN": 2, "T-SPIN": 8},
+        {"name": "DOUBLE", "": 3, "T-SPIN": 12},
+        {"name": "TRIPLE", "": 5, "T-SPIN": 16},
+        {"name": "TETRIS", "": 8}
+    )
+    
+    def __init__(self, high_score=0):
+        self.high_score = high_score
+
+    def _random_piece(self):
+        if not self.random_bag:
+            self.random_bag = list(self.TETROMINOES)
+            random.shuffle(self.random_bag)
+        return self.random_bag.pop()()
+        
+    def new_game(self, level=1):
+        self.matrix = [
+            [Mino.NO_MINO for x in range(self.MATRIX_COLS)]
+            for y in range(self.MATRIX_ROWS)
+        ]
+        self.level = level - 1
+        self.goal = 0
+        self.score = 0
+        self.random_bag = []
+        self.next_queue = [
+            self._random_piece()
+            for _ in range(self.LEN_NEXT_QUEUE)
+        ]
+        self.held_piece = None
+        self.fall_delay = self.FALL_DELAY
+        self.lock_delay = self.LOCK_DELAY
+        self.time = time.time()
+        self.next_level()
+        self.current_piece = None
+        self.new_piece()
+
+    def next_level(self):
+        self.level += 1
+        if self.level <= 20:
+            self.fall_delay = pow(0.8 - ((self.level-1)*0.007), self.level-1)
+        if self.level > 15:
+            self.lock_delay = 0.5 * pow(0.9, self.level-15)
+        self.goal += 5 * self.level
+        self.show_text("LEVEL %d" % self.level)
+
+    def new_piece(self):
+        if not self.current_piece:
+            self.current_piece = self.next_queue.pop(0)
+            self.next_queue.append(self._random_piece())
+        self.current_piece.position = self.INIT_POSITION
+        if not self._move(Movement.DOWN):
+            self.game_over()
+
+    def hold_piece(self):
+        if self.current_piece.hold_enabled:
+            self.current_piece, self.held_piece = self.held_piece, self.current_piece
+            self.held_piece.minoes_positions = self.held_piece.MINOES_POSITIONS
+            self.held_piece.hold_enabled = False
+            self.new_piece()
+            
+    def _move_rotate(self, movement, minoes_positions):
+        potential_position = self.current_piece.position + movement
+        if all(
+            self.is_free_cell(potential_position+mino_position)
+            for mino_position in minoes_positions
+        ):
+            self.position = potential_position
+            if self.current_piece.prelocked:
+                self.postpone_lock()
+            return True
+        else:
+            return False
+
+    def _move(self, movement):
+        if self._move_rotate(movement, self.current_piece.minoes_positions):
+            self.current_piece.rotated_last = False
+            return True
+        else:
+            if movement == Movement.DOWN and not self.current_piece.prelocked:
+                self.prelock()
+            return False
+
+    def _rotate(self, direction):
+        rotated_minoes_positions = tuple(
+            Point(-direction*mino_position.y, direction*mino_position.x)
+            for mino_position in self.current_piece.minoes_positions
+        )
+        for rotation_point, liberty_degree in enumerate(self.current_piece.SUPER_ROTATION_SYSTEM[self.current_piece.orientation][direction], start=1):
+            potential_position = self.position + liberty_degree
+            if self._move_rotate(potential_position, rotated_minoes_positions):
+                self.current_piece.orientation = (self.current_piece.orientation+direction) % 4
+                self.current_piece.minoes_position = rotated_minoes_positions
+                self.current_piece.rotated_last = True
+                if rotation_point == 5:
+                    self.current_piece.rotation_point_5_used = True
+                return True
+        else:
+            return False
+        
+    def move_left(self):
+        self._move(Movement.LEFT)
+        
+    def move_right(self):
+        self._move(Movement.RIGHT)
+
+    def soft_drop(self):
+        if self._move(Movement.DOWN):
+            self.rows_dropped(1)
+
+    def hard_drop(self):
+        points = 0
+        while self._move(Movement.DOWN):
+            points += 2
+        self.rows_dropped(points)
+        self.lock_piece()
+            
+    def rows_dropped(self, points):
+        self.update_score(points, "")
+        
+    def fall(self):
+        self._move(Movement.DOWN)
+        
+    def rotate_clockwise(self):
+        return self._rotate(Rotation.CLOCKWISE)
+        
+    def rotate_counterclockwise(self):
+        return self._rotate(Rotation.COUNTERCLOCKWISE)
+
+    def is_free_cell(self, position):
+        return (
+            0 <= position.x < self.MATRIX_COLS
+            and position.y < self.MATRIX_ROWS
+            and not (position.y >= 0 and self.matrix[position.y][position.x] != Mino.NO_MINO)
+        )
+        
+    def prelock(self):
+        """
+        Schedules self.lock in self.lock_delay
+        """
+        raise NotImplementedError
+    
+    def postpone_lock(self):
+        """
+        Reset timer calling self.lock to self.lock_delay
+        """
+        raise NotImplementedError
+
+    def lock_piece(self):
+        if self.shape_fits(self.current_piece.position+Movement.DOWN, self.current_piece.minoes_positions):
+            self.postpone_lock()
+            return
+        
+        t_spin = self.current_piece.t_spin()
+        
+        for mino_position in self.current_piece.minoes_position:
+            position = mino_position + self.current_piece.position
+            if position.y >= 0:
+                self.matrix[position.y][position.x] = self.current_piece.MINOES_TYPE
+            else:
+                self.game_over()
+                return
+            
+        nb_rows = 0
+        for y, row in enumerate(self.cells):
+            if all(mino for mino in row):
+                self.cells.pop(y)
+                self.cells.insert(0, [Mino.NO_MINO for x in range(self.NB_COLS)])
+                nb_rows += 1
+        self.current_piece = None
+        self.piece_locked(nb_rows, t_spin)
+
+        if t_spin or nb_rows:
+            points = self.SCORES[nb_rows][t_spin]
+            self.goal -= points
+            points *= 100 * self.level
+            text = t_spin
+            if t_spin and nb_rows:
+                text += " "
+            if nb_rows:
+                text += self.SCORES[nb_rows]["name"]
+            self.update_score(points, text)
+            
+        self.combo = self.combo + 1 if nb_rows else -1
+        if self.combo >= 1:
+            points = (20 if nb_rows==1 else 50) * self.combo * self.level
+            text = "COMBO x%d" % self.combo
+            self.update_score(points, text)
+        
+        if self.goal <= 0:
+            self.new_level()
+            
+        self.new_piece()
+            
+    def update_score(self, points, text):
+        self.score += points
+        if self.score > self.high_score:
+            self.high_score = self.score
+        self.show_text("%s\n%d" % (text, points))
+        
+    def show_text(self, text):
+        print(text)
+            
+    def pause(self):
+        self.time = time.time() - self.time
+        
+    def resume(self):
+        self.time = time.time() - self.time
+
+    def game_over(self):
+        self.show_text("GAME OVER")

terminis/terminis.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from .pytetris import Tetris, Mino, Point
+
 import sys
 
 try:
@@ -13,7 +15,6 @@ pip install --user windows-curses"""
 else:
     curses.COLOR_ORANGE = 8
     
-import random
 import sched
 import time
 import os
@@ -22,7 +23,7 @@ import subprocess
 
 try:
     import configparser
-except ImportError:
+except ImportError: # Python2
     import ConfigParser as configparser
 
 
@@ -37,220 +38,54 @@ Tetris clone for terminal
   --level=n\tstart at level n (integer between 1 and 15)"""
 
 
-locale.setlocale(locale.LC_ALL, '')
-if locale.getpreferredencoding() == 'UTF-8':
-    os.environ["NCURSES_NO_UTF8_ACS"] = "1"
+class Scheduler(sched.scheduler, dict):
+    def __init__(self):
+        sched.scheduler.__init__(self, time.time, time.sleep)
+        dict.__init__(self)
         
-scheduler = sched.scheduler(time.time, lambda delay: curses.napms(int(delay*1000)))
+    def repeat(self, name, delay, action, args=tuple()):
+        self[name] = sched.scheduler.enter(self, delay, 1, self._repeat, (name, delay, action, args))
+        
+    def _repeat(self, name, delay, action, args):
+        del(self[name])
+        self.repeat(name, delay, action, args)
+        action(*args)
+        
+    def single_shot(self, name, delay, action, args=tuple()):
+        self[name] = sched.scheduler.enter(self, delay, 1, self._single_shot, (name, action, args))
+        
+    def _single_shot(self, name, action, args):
+        del(self[name])
+        action(*args)
+        
+    def cancel(self, name):
+        if name in self:
+            try:
+                sched.scheduler.cancel(self, self.pop(name))
+            except:
+                sys.exit(name)
 
 
-class Rotation:
-    CLOCKWISE = 1
-    COUNTERCLOCKWISE = -1
-
-
-class Point:
-    def __init__(self, x, y):
-        self.x = x
-        self.y = y
-
-    def __add__(self, other):
-        return Point(self.x+other.x, self.y+other.y)
-
-
-class Movement:
-    LEFT  = Point(-1, 0)
-    RIGHT = Point(1, 0)
-    DOWN  = Point(0, 1)
-    STILL = Point(0, 0)
-
-
-class Tetromino:
-    SUPER_ROTATION_SYSTEM = (
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, -1), Point(0, 2), Point(1, 2)),
-            Rotation.CLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, -1), Point(0, 2), Point(-1, 2)),
-        },
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, 1), Point(0, -2), Point(1, -2)),
-            Rotation.CLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, 1), Point(0, -2), Point(1, -2)),
-        },
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, -1), Point(0, 2), Point(-1, 2)),
-            Rotation.CLOCKWISE: (Point(0, 0), Point(1, 0), Point(1, -1), Point(0, 2), Point(1, 2)),
-        },
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, 1), Point(0, -2), Point(-1, -2)),
-            Rotation.CLOCKWISE: (Point(0, 0), Point(-1, 0), Point(-1, 1), Point(0, 2), Point(-1, -2))
-        }
-    )
-    lock_delay = 0.5
-    fall_delay = 1
-    color_pair = curses.COLOR_BLACK
-
-    def __init__(self, matrix, position):
-        self.matrix = matrix
-        self.position = position
-        self.minoes_position = self.MINOES_POSITIONS
-        self.orientation = 0
-        self.rotation_point_5_used = False
-        self.rotated_last = False
-        self.lock_timer = None
-        self.fall_timer = None
-        self.hold_enabled = True
-        
-    def possible_position(self, minoes_position, movement):
-        potential_position = self.position + movement
-        if all(
-            self.matrix.is_free_cell(mino_position+potential_position)
-            for mino_position in minoes_position
-        ):
-            return potential_position
-        else:
-            return None
-
-    def move(self, movement, lock=True):
-        possible_position = self.possible_position(self.minoes_position, movement)
-        if possible_position:
-            self.position = possible_position
-            self.postpone_lock()
-            self.rotated_last = False
-            self.matrix.refresh()
-            return True
-        else:
-            if lock and movement == Movement.DOWN:
-                self.locking()
-            return False
-
-    def soft_drop(self):
-        if self.move(Movement.DOWN):
-            self.matrix.game.stats.piece_dropped(1)
-
-    def hard_drop(self):
-        if self.lock_timer:
-            self.lock_timer = scheduler.cancel(self.lock_timer)
-        lines = 0
-        while self.move(Movement.DOWN, lock=False):
-            lines += 2
-        self.matrix.game.stats.piece_dropped(lines)
-        self.lock()
-
-    def rotate(self, direction):
-        potential_minoes_positions = tuple(
-            Point(-direction*mino_position.y, direction*mino_position.x)
-            for mino_position in self.minoes_position
-        )
-        for rotation_point, liberty_degree in enumerate(self.SUPER_ROTATION_SYSTEM[self.orientation][direction], start=1):
-            possible_position = self.possible_position(potential_minoes_positions, liberty_degree)
-            if possible_position:
-                self.orientation = (self.orientation+direction) % 4
-                self.position = possible_position
-                self.minoes_position = potential_minoes_positions
-                self.postpone_lock()
-                self.rotated_last = True
-                if rotation_point == 5:
-                    self.rotation_point_5_used = True
-                self.matrix.refresh()
-                return True
-        else:
-            return False
-
-    def fall(self):
-        self.fall_timer = scheduler.enter(self.fall_delay, 2, self.fall, tuple())
-        self.move(Movement.DOWN)
-
-    def locking(self):
-        if not self.lock_timer:
-            self.lock_timer = scheduler.enter(self.lock_delay, 1, self.lock, tuple())
-            self.matrix.refresh()
-
-    def postpone_lock(self):
-        if self.lock_timer:
-            scheduler.cancel(self.lock_timer)
-            self.lock_timer = scheduler.enter(self.lock_delay, 1, self.lock, tuple())
-
-    def lock(self):
-        self.lock_timer = None
-        if not self.possible_position(self.minoes_position, Movement.DOWN):
-            if self.fall_timer:
-                self.fall_timer = scheduler.cancel(self.fall_timer)
-            self.matrix.lock(self.t_spin())
-
-    def t_spin(self):
-        return ""
-
-
-class O(Tetromino):
-    MINOES_POSITIONS = (Point(0, 0), Point(1, 0), Point(0, -1), Point(1, -1))
-    COLOR = curses.COLOR_YELLOW
-
-    def rotate(self, direction):
-        return False
-
-class I(Tetromino):
-    SUPER_ROTATION_SYSTEM = (
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(0, 1), Point(-1, 1), Point(2, 1), Point(-1, -1), Point(2, 2)),
-            Rotation.CLOCKWISE: (Point(1, 0), Point(-1, 0), Point(2, 0), Point(-1, 1), Point(2, -2)),
-        },
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(-1, 0), Point(1, 0), Point(-2, 0), Point(1, -1), Point(-2, 2)),
-            Rotation.CLOCKWISE: (Point(0, 1), Point(-1, 1), Point(2, 1), Point(-1, -1), Point(2, 2)),
-        },
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(0, -1), Point(1, -1), Point(-2, -1), Point(1, 1), Point(-2, -2)),
-            Rotation.CLOCKWISE: (Point(-1, 0), Point(1, 0), Point(-2, 0), Point(1, -1), Point(-2, 2)),
-        },
-        {
-            Rotation.COUNTERCLOCKWISE: (Point(1, 0), Point(-1, 0), Point(2, 0), Point(-1, 1), Point(2, -2)),
-            Rotation.CLOCKWISE: (Point(0, 1), Point(1, -1), Point(-2, -1), Point(1, 1), Point(-2, -2)),
-        },
-    )
-    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(1, 0), Point(2, 0))
-    COLOR = curses.COLOR_CYAN
-
-class T(Tetromino):
-    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(0, -1), Point(1, 0))
-    COLOR = curses.COLOR_MAGENTA
-    T_SLOT = (Point(-1, -1), Point(1, -1), Point(1, 1), Point(-1, 1))
-
-    def t_spin(self):
-        if self.rotated_last:
-            a = not self.matrix.is_free_cell(self.position+self.T_SLOT[self.orientation])
-            b = not self.matrix.is_free_cell(self.position+self.T_SLOT[(1+self.orientation)%4])
-            c = not self.matrix.is_free_cell(self.position+self.T_SLOT[(3+self.orientation)%4])
-            d = not self.matrix.is_free_cell(self.position+self.T_SLOT[(2+self.orientation)%4])
-            
-            if self.rotation_point_5_used or (a and b and (c or d)):
-                return "T-SPIN"
-            elif c and d and (a or b):
-                return "MINI T-SPIN"
-        return ""
-
-class L(Tetromino):
-    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(1, 0), Point(1, -1))
-    COLOR = curses.COLOR_ORANGE
-
-class J(Tetromino):
-    MINOES_POSITIONS = (Point(-1, -1), Point(-1, 0), Point(0, 0), Point(1, 0))
-    COLOR = curses.COLOR_BLUE
-
-class S(Tetromino):
-    MINOES_POSITIONS = (Point(-1, 0), Point(0, 0), Point(0, -1), Point(1, -1))
-    COLOR = curses.COLOR_GREEN
-
-class Z(Tetromino):
-    MINOES_POSITIONS = (Point(-1, -1), Point(0, -1), Point(0, 0), Point(1, 0))
-    COLOR = curses.COLOR_RED
+scheduler = Scheduler()
 
 
 class Window:
-    def __init__(self, width, height, begin_x, begin_y):
+    MINO_COLOR = {
+        Mino.O: 0,
+        Mino.I: 0,
+        Mino.T: 0,
+        Mino.L: 0,
+        Mino.J: 0,
+        Mino.S: 0,
+        Mino.Z: 0
+    }
+    
+    def __init__(self, game, width, height, begin_x, begin_y):
+        self.game = game
         self.window = curses.newwin(height, width, begin_y, begin_x)
         if self.TITLE:
             self.title_begin_x = (width-len(self.TITLE)) // 2 + 1
         self.piece = None
-        self.refresh()
 
     def draw_border(self):
         self.window.erase()
@@ -258,14 +93,14 @@ class Window:
         if self.TITLE:
             self.window.addstr(0, self.title_begin_x, self.TITLE, curses.A_BOLD)
 
-    def draw_piece(self):
-        if self.piece:
-            if self.piece.lock_timer:
-                attr = self.piece.color_pair | curses.A_BLINK | curses.A_REVERSE
+    def draw_piece(self, piece, position):
+        if piece:
+            if piece.prelocked:
+                attr = self.MINO_COLOR[piece.MINOES_TYPE] | curses.A_BLINK | curses.A_REVERSE
             else:
-                attr = self.piece.color_pair
-            for mino_position in self.piece.minoes_position:
-                position = mino_position + self.piece.position
+                attr = self.MINO_COLOR[piece.MINOES_TYPE]
+            for mino_position in piece.minoes_positions:
+                position = mino_position + position
                 self.draw_mino(position.x, position.y, attr)
 
     def draw_mino(self, x, y, attr):
@@ -278,18 +113,17 @@ class Matrix(Window):
     NB_LINES = 21
     WIDTH = NB_COLS*2+2
     HEIGHT = NB_LINES+1
-    PIECE_POSITION = Point(4, 0)
     TITLE = ""
 
     def __init__(self, game, begin_x, begin_y):
         begin_x += (game.WIDTH - self.WIDTH) // 2
         begin_y += (game.HEIGHT - self.HEIGHT) // 2
-        self.game = game
         self.cells = [
             [None for x in range(self.NB_COLS)]
             for y in range(self.NB_LINES)
         ]
-        Window.__init__(self, self.WIDTH, self.HEIGHT, begin_x, begin_y)
+        self.piece = None
+        Window.__init__(self, game, self.WIDTH, self.HEIGHT, begin_x, begin_y)
 
     def refresh(self, paused=False):
         self.draw_border()
@@ -300,67 +134,39 @@ class Matrix(Window):
                 for x, color in enumerate(line):
                     if color is not None:
                         self.draw_mino(x, y, color)
-            self.draw_piece()
+            self.draw_piece(self.game.current_piece, self.game.current_piece.position)
         self.window.refresh()
 
-    def is_free_cell(self, position):
-        return (
-            0 <= position.x < self.NB_COLS
-            and position.y < self.NB_LINES
-            and not (position.y >= 0 and self.cells[position.y][position.x] is not None)
-        )
-
-    def lock(self, t_spin):
-        for mino_position in self.piece.minoes_position:
-            position = mino_position + self.piece.position
-            if position.y >= 0:
-                self.cells[position.y][position.x] = self.piece.color_pair
-            else:
-                self.game.over()
-                return
-
-        nb_lines_cleared = 0
-        for y, line in enumerate(self.cells):
-            if all(mino for mino in line):
-                self.cells.pop(y)
-                self.cells.insert(0, [None for x in range(self.NB_COLS)])
-                nb_lines_cleared += 1
-                
-        self.game.stats.piece_locked(nb_lines_cleared, t_spin)
-        self.game.start_next_piece()
-
 
 class HoldNext(Window):
     HEIGHT = 6
     PIECE_POSITION = Point(6, 3)
 
-    def __init__(self, width, begin_x, begin_y):
-        Window.__init__(self, width, self.HEIGHT, begin_x, begin_y)
-
-    def refresh(self, paused=False):
-        self.draw_border()
-        if not paused:
-            self.draw_piece()
-        self.window.refresh()
+    def __init__(self, game, width, begin_x, begin_y):
+        Window.__init__(self, game, width, self.HEIGHT, begin_x, begin_y)
 
 
 class Hold(HoldNext):
     TITLE = "HOLD"
 
+    def refresh(self, paused=False):
+        self.draw_border()
+        if not paused:
+            self.draw_piece(self.game.held_piece, self.PIECE_POSITION)
+        self.window.refresh()
+
 
 class Next(HoldNext):
     TITLE = "NEXT"
 
+    def refresh(self, paused=False):
+        self.draw_border()
+        if not paused:
+            self.draw_piece(self.game.next_queue[0], self.PIECE_POSITION)
+        self.window.refresh()
+
 
 class Stats(Window):
-    SCORES = (
-        {"": 0, "MINI T-SPIN": 1, "T-SPIN": 4},
-        {"": 1, "MINI T-SPIN": 2, "T-SPIN": 8},
-        {"": 3, "T-SPIN": 12},
-        {"": 5, "T-SPIN": 16},
-        {"": 8}
-    )
-    LINES_CLEARED_NAMES = ("", "SINGLE", "DOUBLE", "TRIPLE", "TETRIS")
     TITLE = "STATS"
     FILE_NAME = ".high_score"
     if sys.platform == "win32":
@@ -371,109 +177,31 @@ class Stats(Window):
     FILE_PATH = os.path.join(DIR_PATH, FILE_NAME)
 
     def __init__(self, game, width, height, begin_x, begin_y):
-        for arg in sys.argv[1:]:
-            if arg.startswith("--level="):
-                try:
-                    self.level = int(arg[8:])
-                except ValueError:
-                    sys.exit(HELP_MSG)
-                else:
-                    self.level = max(1, self.level)
-                    self.level = min(15, self.level)
-                    self.level -= 1
-                    break
-        else:
-            self.level = 0
-
-        self.game = game
         self.width = width
         self.height = height
-        self.goal = 0
-        self.score = 0
         try:
             with open(self.FILE_PATH, "r") as f:
                self.high_score = int(f.read())
         except:
             self.high_score = 0
-        self.combo = -1
-        self.time = time.time()
-        self.lines_cleared = 0
-        self.clock_timer = None
-        self.strings = []
-        Window.__init__(self, width, height, begin_x, begin_y)
-        self.new_level()
+        Window.__init__(self, game, width, height, begin_x, begin_y)
 
     def refresh(self):
         self.draw_border()
-        self.window.addstr(2, 2, "SCORE\t{:n}".format(self.score))
-        if self.score >= self.high_score:
-            self.window.addstr(3, 2, "HIGH\t{:n}".format(self.high_score), curses.A_BLINK|curses.A_BOLD)
+        self.window.addstr(2, 2, "SCORE\t{:n}".format(self.game.score))
+        if self.game.score >= self.game.high_score:
+            self.window.addstr(3, 2, "HIGH\t{:n}".format(self.game.high_score), curses.A_BLINK|curses.A_BOLD)
         else:
-            self.window.addstr(3, 2, "HIGH\t{:n}".format(self.high_score))
-        t = time.localtime(time.time() - self.time)
+            self.window.addstr(3, 2, "HIGH\t{:n}".format(self.game.high_score))
+        self.window.addstr(5, 2, "LEVEL\t%d" % self.game.level)
+        self.window.addstr(6, 2, "GOAL\t%d" % self.game.goal)
+        self.refresh_time()
+        
+    def refresh_time(self):
+        t = time.localtime(time.time() - self.game.time)
         self.window.addstr(4, 2, "TIME\t%02d:%02d:%02d" % (t.tm_hour-1, t.tm_min, t.tm_sec))
-        self.window.addstr(5, 2, "LEVEL\t%d" % self.level)
-        self.window.addstr(6, 2, "GOAL\t%d" % self.goal)
-        self.window.addstr(7, 2, "LINES\t%d" % self.lines_cleared)
-        start_y = self.height - len(self.strings) - 2
-        for y, string in enumerate(self.strings, start=start_y):
-            x = (self.width-len(string)) // 2 + 1
-            self.window.addstr(y, x, string)
         self.window.refresh()
 
-    def clock(self):
-        self.clock_timer = scheduler.enter(1, 3, self.clock, tuple())
-        self.refresh()
-
-    def new_level(self):
-        self.level += 1
-        if self.level <= 20:
-            Tetromino.fall_delay = pow(0.8 - ((self.level-1)*0.007), self.level-1)
-        if self.level > 15:
-            Tetromino.lock_delay = 0.5 * pow(0.9, self.level-15)
-        self.goal += 5 * self.level
-        self.refresh()
-
-    def piece_dropped(self, lines):
-        self.score += lines
-        if self.score > self.high_score:
-            self.high_score = self.score
-        self.refresh()
-
-    def piece_locked(self, nb_lines, t_spin):
-        self.strings = []
-        
-        if t_spin:
-            self.strings.append(t_spin)
-        if nb_lines:
-            self.strings.append(self.LINES_CLEARED_NAMES[nb_lines])
-            self.combo += 1
-        else:
-            self.combo = -1
-            
-        if nb_lines or t_spin:
-            self.lines_cleared += nb_lines
-            ds = self.SCORES[nb_lines][t_spin]
-            self.goal -= ds
-            ds *= 100 * self.level
-            self.score += ds
-            self.strings.append(str(ds))
-            
-        if self.combo >= 1:
-            self.strings.append("COMBO x%d" % self.combo)
-            ds = (20 if nb_lines==1 else 50) * self.combo * self.level
-            self.score += ds
-            self.strings.append(str(ds))
-            
-        if nb_lines == 4 or (nb_lines and t_spin):
-            curses.beep()
-        if self.score > self.high_score:
-            self.high_score = self.score
-        if self.goal <= 0:
-            self.new_level()
-        else:
-            self.refresh()
-
     def save(self):
         if not os.path.exists(self.DIR_PATH):
             os.makedirs(self.DIR_PATH)
@@ -554,10 +282,11 @@ class ControlsParser(configparser.SafeConfigParser):
 class ControlsWindow(Window, ControlsParser):
     TITLE = "CONTROLS"
 
-    def __init__(self, width, height, begin_x, begin_y):
+    def __init__(self, game, width, height, begin_x, begin_y):
         ControlsParser.__init__(self)
         self.read(self.FILE_PATH)
-        Window.__init__(self, width, height, begin_x, begin_y)
+        Window.__init__(self, game, width, height, begin_x, begin_y)
+        self.refresh()
         for action, key in self.items(self.SECTION):
             if key == "SPACE":
                 self[action] = " "
@@ -574,23 +303,45 @@ class ControlsWindow(Window, ControlsParser):
         self.window.refresh()
 
 
-class Game:
+class Game(Tetris):
     WIDTH = 80
     HEIGHT = Matrix.HEIGHT
-    AUTOREPEAT_DELAY = 0.02
-    TETROMINOES = (O, I, T, L, J, S, Z)
+    MINO_COLOR = {
+        Mino.O: curses.COLOR_YELLOW,
+        Mino.I: curses.COLOR_CYAN,
+        Mino.T: curses.COLOR_MAGENTA,
+        Mino.L: curses.COLOR_ORANGE,
+        Mino.J: curses.COLOR_BLUE,
+        Mino.S: curses.COLOR_GREEN,
+        Mino.Z: curses.COLOR_RED
+    }
+    
+    HIGH_SCORE_FILE_NAME = ".high_score"
+    if sys.platform == "win32":
+        DATA_DIR_PATH = os.environ.get("appdata", os.path.expanduser("~\Appdata\Roaming"))
+    else:
+        DATA_DIR_PATH = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
+    DATA_DIR_PATH = os.path.join(DATA_DIR_PATH, DIR_NAME)
+    HIGH_SCORE_FILE_PATH = os.path.join(DATA_DIR_PATH, HIGH_SCORE_FILE_NAME)
     
     def __init__(self, scr):
+        try:
+            with open(self.HIGH_SCORE_FILE_PATH, "r") as f:
+               high_score = int(f.read())
+        except:
+            high_score = 0
+        Tetris.__init__(self, high_score)
+            
         if curses.has_colors():
             curses.start_color()
             if curses.can_change_color():
                 curses.init_color(curses.COLOR_YELLOW, 1000, 500, 0)
-            for tetromino_class in self.TETROMINOES: 
-                curses.init_pair(tetromino_class.COLOR, tetromino_class.COLOR, curses.COLOR_WHITE)
-                if tetromino_class.COLOR == curses.COLOR_ORANGE:
-                    tetromino_class.color_pair = curses.color_pair(curses.COLOR_YELLOW)
+            for mino_type, color in self.MINO_COLOR.items(): 
+                curses.init_pair(color, color, curses.COLOR_WHITE)
+                if color == curses.COLOR_ORANGE:
+                    Window.MINO_COLOR[mino_type] = curses.color_pair(curses.COLOR_YELLOW)
                 else:
-                    tetromino_class.color_pair = curses.color_pair(tetromino_class.COLOR)|curses.A_BOLD
+                    Window.MINO_COLOR[mino_type] = curses.color_pair(color)|curses.A_BOLD
         try:
             curses.curs_set(0)
         except curses.error:
@@ -606,137 +357,125 @@ class Game:
         right_x = left_x + Matrix.WIDTH + side_width + 2
         bottom_y = top_y + Hold.HEIGHT
 
-        self.matrix = Matrix(self, left_x, top_y)
-        self.hold = Hold(side_width, left_x, top_y)
-        self.next = Next(side_width, right_x, top_y)
-        self.stats = Stats(self, side_width, side_height, left_x, bottom_y)
-        self.controls = ControlsWindow(side_width, side_height, right_x, bottom_y)
+        self.matrix_window = Matrix(self, left_x, top_y)
+        self.hold_window = Hold(self, side_width, left_x, top_y)
+        self.next_window = Next(self, side_width, right_x, top_y)
+        self.stats_window = Stats(self, side_width, side_height, left_x, bottom_y)
+        self.controls_window = ControlsWindow(self, side_width, side_height, right_x, bottom_y)
 
         self.actions = {
-            self.controls["QUIT"]: self.quit,
-            self.controls["PAUSE"]: self.pause,
-            self.controls["HOLD"]: self.swap,
-            self.controls["MOVE LEFT"]: lambda: self.matrix.piece.move(Movement.LEFT),
-            self.controls["MOVE RIGHT"]: lambda: self.matrix.piece.move(Movement.RIGHT),
-            self.controls["SOFT DROP"]: lambda: self.matrix.piece.soft_drop(),
-            self.controls["ROTATE COUNTER"]: lambda: self.matrix.piece.rotate(Rotation.COUNTERCLOCKWISE),
-            self.controls["ROTATE CLOCKWISE"]: lambda: self.matrix.piece.rotate(Rotation.CLOCKWISE),
-            self.controls["HARD DROP"]: lambda: self.matrix.piece.hard_drop()
+            self.controls_window["QUIT"]: self.quit,
+            self.controls_window["PAUSE"]: self.pause,
+            self.controls_window["HOLD"]: self.hold_piece,
+            self.controls_window["MOVE LEFT"]: self.move_left,
+            self.controls_window["MOVE RIGHT"]: self.move_right,
+            self.controls_window["SOFT DROP"]: self.soft_drop,
+            self.controls_window["ROTATE COUNTER"]: self.rotate_counterclockwise,
+            self.controls_window["ROTATE CLOCKWISE"]: self.rotate_clockwise,
+            self.controls_window["HARD DROP"]: self.hard_drop
         }
 
-        self.playing = True
+        
         self.paused = False
-        self.stats.time = time.time()
-        self.stats.clock_timer = scheduler.enter(1, 3, self.stats.clock, tuple())
-        self.random_bag = []
-        self.next.piece = self.random_piece()
-        self.start_next_piece()
-        self.input_timer = scheduler.enter(self.AUTOREPEAT_DELAY, 2, self.process_input, tuple())
+        
+        for arg in sys.argv[1:]:
+            if arg.startswith("--level="):
+                try:
+                    level = int(arg[8:])
+                except ValueError:
+                    sys.exit(HELP_MSG)
+                else:
+                    level = max(1, level)
+                    level = min(15, level)
+                    break
+        else:
+            level = 1
+        self.new_game(level)
+        
+        self.matrix_window.refresh()
+        self.hold_window.refresh()
+        self.next_window.refresh()
+        self.stats_window.refresh()
+        
+        scheduler.repeat("time", 1, self.stats_window.refresh_time)
+        scheduler.repeat("input", self.AUTOSHIFT_DELAY, self.process_input)
 
         try:
             scheduler.run()
         except KeyboardInterrupt:
             self.quit()
 
-    def random_piece(self):
-        if not self.random_bag:
-            self.random_bag = list(self.TETROMINOES)
-            random.shuffle(self.random_bag)
-        return self.random_bag.pop()(self.matrix, Next.PIECE_POSITION)
-
-    def start_next_piece(self):
-        self.matrix.piece = self.next.piece
-        self.next.piece = self.random_piece()
-        self.next.refresh()
-        self.start_piece()
-            
-    def start_piece(self):
-        self.matrix.piece.position = Matrix.PIECE_POSITION
-        if self.matrix.piece.possible_position(self.matrix.piece.minoes_position, Movement.STILL):
-            self.matrix.piece.fall_timer = scheduler.enter(Tetromino.fall_delay, 2, self.matrix.piece.fall, tuple())
-            self.matrix.refresh()
-        else:
-            self.over()
+    def new_piece(self):
+        Tetris.new_piece(self)
+        self.next_window.refresh()
+        self.matrix_window.refresh()
 
     def process_input(self):
-        self.input_timer = scheduler.enter(self.AUTOREPEAT_DELAY, 2, self.process_input, tuple())
         try:
             action = self.actions[self.scr.getkey()]
         except (curses.error, KeyError):
             pass
         else:
             action()
+            self.matrix_window.refresh()
 
     def pause(self):
-        self.stats.time = time.time() - self.stats.time
+        Tetris.pause(self)
         self.paused = True
-        self.hold.refresh(paused=True)
-        self.matrix.refresh(paused=True)
-        self.next.refresh(paused=True)
+        self.hold_window.refresh(paused=True)
+        self.matrix_window.refresh(paused=True)
+        self.next_window.refresh(paused=True)
         self.scr.timeout(-1)
         
         while True:
             key = self.scr.getkey()
-            if key == self.controls["QUIT"]:
+            if key == self.controls_window["QUIT"]:
                 self.quit()
                 break
-            elif key == self.controls["PAUSE"]:
+            elif key == self.controls_window["PAUSE"]:
                 self.scr.timeout(0)
-                self.hold.refresh()
-                self.matrix.refresh()
-                self.next.refresh()
-                self.stats.time = time.time() - self.stats.time
+                self.hold_window.refresh()
+                self.matrix_window.refresh()
+                self.next_window.refresh()
+                self.stats_window.time = time.time() - self.stats_window.time
                 break
 
-    def swap(self):
-        if self.matrix.piece.hold_enabled:
-            if self.matrix.piece.fall_timer:
-                self.matrix.piece.fall_timer = scheduler.cancel(self.matrix.piece.fall_timer)
-            if self.matrix.piece.lock_timer:
-                self.matrix.piece.lock_timer = scheduler.cancel(self.matrix.piece.lock_timer)
+    def hold_piece(self):
+        Tetris.hold_piece(self)
+        self.hold_window.refresh()
 
-            self.matrix.piece, self.hold.piece = self.hold.piece, self.matrix.piece
-            self.hold.piece.position = self.hold.PIECE_POSITION
-            self.hold.piece.minoes_position = self.hold.piece.MINOES_POSITIONS
-            self.hold.piece.hold_enabled = False
-            self.hold.refresh()
-            
-            if self.matrix.piece:
-                self.start_piece()
-            else:
-                self.start_next_piece()
-
-    def over(self):
-        self.matrix.refresh()
+    def game_over(self):
+        Tetris.game_over(self)
+        self.time = time.time() - self.time
+        self.matrix_window.refresh()
         if curses.has_colors():
-            for tetromino_class in self.TETROMINOES: 
-                curses.init_pair(tetromino_class.COLOR, tetromino_class.COLOR, curses.COLOR_BLACK)
+            for color in self.MINO_COLOR.values():
+                curses.init_pair(color, color, curses.COLOR_BLACK)
         for y, word in enumerate((("GA", "ME") ,("OV", "ER")), start=Matrix.NB_LINES//2):
             for x, syllable in enumerate(word, start=Matrix.NB_COLS//2-1):
-                color = self.matrix.cells[y][x]
+                color = self.matrix[y][x]
                 if color is None:
                     color = curses.COLOR_BLACK
                 else:
                     color |= curses.A_REVERSE
-                self.matrix.window.addstr(y, x*2+1, syllable, color)
-        self.matrix.window.refresh()
+                self.matrix_window.window.addstr(y, x*2+1, syllable, color)
+        self.matrix_window.window.refresh()
         curses.beep()
         self.scr.timeout(-1)
-        while self.scr.getkey() != self.controls["QUIT"]:
+        while self.scr.getkey() != self.controls_window["QUIT"]:
             pass
+        self.time = time.time() - self.time
         self.quit()
 
     def quit(self):
-        self.playing = False
-        if self.matrix.piece.fall_timer:
-            self.matrix.piece.fall_timer = scheduler.cancel(self.matrix.piece.fall_timer)
-        if self.matrix.piece.lock_timer:
-            self.matrix.piece.lock_timer = scheduler.cancel(self.matrix.piece.lock_timer)
-        if self.stats.clock_timer:
-            self.stats.clock_timer = scheduler.cancel(self.stats.clock_timer)
-        if self.input_timer:
-            self.input_timer = scheduler.cancel(self.input_timer)
-        self.stats.save()
+        self.stats_window.save()
+        t = time.localtime(time.time() - self.time)
+        sys.exit(
+            "SCORE\t{:n}\n".format(self.score) +
+            "HIGH\t{:n}\n".format(self.high_score) +
+            "TIME\t%02d:%02d:%02d\n" % (t.tm_hour-1, t.tm_min, t.tm_sec) +
+            "LEVEL\t%d\n" % self.level
+        )
 
 
 def main():
@@ -749,6 +488,10 @@ def main():
             controls.edit()
         elif "--edit" in sys.argv[1:]:
             ControlsParser().edit()
+            
+        locale.setlocale(locale.LC_ALL, '')
+        if locale.getpreferredencoding() == 'UTF-8':
+            os.environ["NCURSES_NO_UTF8_ACS"] = "1"
         curses.wrapper(Game)