adrien/TetrArcade
1
0
Fork 0
Code Issues 1 Pull Requests Releases 6 Wiki Activity

random choose shape in tetrislogic

Browse Source
This commit is contained in:
adrienmalin 2019-10-01 01:40:25 +02:00
parent 59b21145f4
commit f7a47efecf
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tetrislogic/tetrislogic.py
View File

@ -1,4 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import random
from .utils import Coord, Movement, Rotation, T_Spin, Line from .utils import Coord, Movement, Rotation, T_Spin, Line
from .tetromino import Tetromino, T from .tetromino import Tetromino, T
from .consts import ( from .consts import (
@ -32,6 +34,8 @@ class Matrix(list):
class TetrisLogic(): class TetrisLogic():
random_bag = []
def __init__(self): def __init__(self):
self.load_high_score() self.load_high_score()
self.state = State.STARTING self.state = State.STARTING
@ -79,7 +83,10 @@ class TetrisLogic():
self.new_level() self.new_level()
def new_tetromino(self): def new_tetromino(self):
return Tetromino() if not self.random_bag:
self.random_bag = list(Tetromino.shapes)
random.shuffle(self.random_bag)
return self.random_bag.pop()()
def append_new_line_to_matrix(self): def append_new_line_to_matrix(self):
self.matrix.append(Line(None for x in range(NB_COLS))) self.matrix.append(Line(None for x in range(NB_COLS)))

29
tetrislogic/tetromino.py
View File

@ -1,6 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import random
from .utils import Coord, Rotation from .utils import Coord, Rotation
class Mino: class Mino:
@ -17,20 +15,9 @@ class MetaTetromino(type):
Tetromino.shapes.append(cls) Tetromino.shapes.append(cls)
class Tetromino: class Tetromino(list):
shapes = [] shapes = []
random_bag = []
def __new__(cls):
if not cls.random_bag:
cls.random_bag = list(cls.shapes)
random.shuffle(cls.random_bag)
return cls.random_bag.pop()()
class AbstractTetromino(list):
# Super rotation system # Super rotation system
SRS = { SRS = {
Rotation.CLOCKWISE: ( Rotation.CLOCKWISE: (
@ -60,7 +47,7 @@ class AbstractTetromino(list):
def ghost(self): def ghost(self):
return self.__class__() return self.__class__()
class O(AbstractTetromino, metaclass=MetaTetromino): class O(Tetromino, metaclass=MetaTetromino):
SRS = { SRS = {
Rotation.CLOCKWISE: (tuple(), tuple(), tuple(), tuple()), Rotation.CLOCKWISE: (tuple(), tuple(), tuple(), tuple()),
@ -73,7 +60,7 @@ class O(AbstractTetromino, metaclass=MetaTetromino):
return False return False
class I(AbstractTetromino, metaclass=MetaTetromino): class I(Tetromino, metaclass=MetaTetromino):
SRS = { SRS = {
Rotation.CLOCKWISE: ( Rotation.CLOCKWISE: (
@ -93,31 +80,31 @@ class I(AbstractTetromino, metaclass=MetaTetromino):
MINOES_COLOR = "cyan" MINOES_COLOR = "cyan"
class T(AbstractTetromino, metaclass=MetaTetromino): class T(Tetromino, metaclass=MetaTetromino):
MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(0, 1), Coord(1, 0)) MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(0, 1), Coord(1, 0))
MINOES_COLOR = "magenta" MINOES_COLOR = "magenta"
class L(AbstractTetromino, metaclass=MetaTetromino): class L(Tetromino, metaclass=MetaTetromino):
MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(1, 0), Coord(1, 1)) MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(1, 0), Coord(1, 1))
MINOES_COLOR = "orange" MINOES_COLOR = "orange"
class J(AbstractTetromino, metaclass=MetaTetromino): class J(Tetromino, metaclass=MetaTetromino):
MINOES_COORDS = (Coord(-1, 1), Coord(-1, 0), Coord(0, 0), Coord(1, 0)) MINOES_COORDS = (Coord(-1, 1), Coord(-1, 0), Coord(0, 0), Coord(1, 0))
MINOES_COLOR = "blue" MINOES_COLOR = "blue"
class S(AbstractTetromino, metaclass=MetaTetromino): class S(Tetromino, metaclass=MetaTetromino):
MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(0, 1), Coord(1, 1)) MINOES_COORDS = (Coord(-1, 0), Coord(0, 0), Coord(0, 1), Coord(1, 1))
MINOES_COLOR = "green" MINOES_COLOR = "green"
class Z(AbstractTetromino, metaclass=MetaTetromino): class Z(Tetromino, metaclass=MetaTetromino):
MINOES_COORDS = (Coord(-1, 1), Coord(0, 1), Coord(0, 0), Coord(1, 0)) MINOES_COORDS = (Coord(-1, 1), Coord(0, 1), Coord(0, 0), Coord(1, 0))
MINOES_COLOR = "red" MINOES_COLOR = "red"