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

remove Mino class, compute color pair once

Browse Source
This commit is contained in:
adrienmalin 2019-02-20 08:33:35 +01:00
parent ac86db43e7
commit afd41bf528
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
terminis/terminis.py
View File

@ -62,14 +62,6 @@ class Movement:
STILL = Point(0, 0) STILL = Point(0, 0)
class Mino:
color_pairs = [curses.COLOR_BLACK for color_pair in range(9)]
def __init__(self, position, color):
self.position = position
self.color_pair = self.color_pairs[color]
class Tetromino: class Tetromino:
SUPER_ROTATION_SYSTEM = ( SUPER_ROTATION_SYSTEM = (
{ {
@ -95,10 +87,7 @@ class Tetromino:
def __init__(self, matrix, position): def __init__(self, matrix, position):
self.matrix = matrix self.matrix = matrix
self.position = position self.position = position
self.minoes = tuple( self.minoes_position = self.MINOES_POSITIONS
Mino(position, self.COLOR)
for position in self.MINOES_POSITIONS
)
self.orientation = 0 self.orientation = 0
self.rotation_point_5_used = False self.rotation_point_5_used = False
self.rotated_last = False self.rotated_last = False
@ -109,8 +98,8 @@ class Tetromino:
def move(self, movement, lock=True): def move(self, movement, lock=True):
potential_position = self.position + movement potential_position = self.position + movement
if all( if all(
self.matrix.is_free_cell(mino.position+potential_position) self.matrix.is_free_cell(mino_position+potential_position)
for mino in self.minoes for mino_position in self.minoes_position
): ):
self.position = potential_position self.position = potential_position
self.postpone_lock() self.postpone_lock()
@ -138,8 +127,8 @@ class Tetromino:
def rotate(self, direction): def rotate(self, direction):
potential_minoes_positions = tuple( potential_minoes_positions = tuple(
Point(-direction*mino.position.y, direction*mino.position.x) Point(-direction*mino_position.y, direction*mino_position.x)
for mino in self.minoes for mino_position in self.minoes_position
) )
for rotation_point, liberty_degree in enumerate(self.SUPER_ROTATION_SYSTEM[self.orientation][direction], start=1): for rotation_point, liberty_degree in enumerate(self.SUPER_ROTATION_SYSTEM[self.orientation][direction], start=1):
potential_position = self.position + liberty_degree potential_position = self.position + liberty_degree
@ -149,8 +138,7 @@ class Tetromino:
): ):
self.orientation = (self.orientation+direction) % 4 self.orientation = (self.orientation+direction) % 4
self.position = potential_position self.position = potential_position
for mino, potential_mino_position in zip(self.minoes, potential_minoes_positions): self.minoes_position = potential_minoes_positions
mino.position = potential_mino_position
self.postpone_lock() self.postpone_lock()
self.rotated_last = True self.rotated_last = True
if rotation_point == 5: if rotation_point == 5:
@ -266,16 +254,16 @@ class Window:
def draw_piece(self): def draw_piece(self):
if self.piece: if self.piece:
if self.piece.lock_timer: if self.piece.lock_timer:
attr = Mino.color_pairs[self.piece.COLOR] | curses.A_BLINK | curses.A_REVERSE attr = self.piece.color_pair | curses.A_BLINK | curses.A_REVERSE
else: else:
attr = Mino.color_pairs[self.piece.COLOR] attr = self.piece.color_pair
for mino in self.piece.minoes: for mino_position in self.piece.minoes_position:
position = mino.position + self.piece.position position = mino_position + self.piece.position
self.draw_mino(position.x, position.y, attr) self.draw_mino(position.x, position.y, attr)
def draw_mino(self, x, y, color): def draw_mino(self, x, y, attr):
if y >= 0: if y >= 0:
self.window.addstr(y, x*2+1, "██", color) self.window.addstr(y, x*2+1, "██", attr)
class Matrix(Window): class Matrix(Window):
@ -316,10 +304,10 @@ class Matrix(Window):
) )
def lock(self, t_spin): def lock(self, t_spin):
for mino in self.piece.minoes: for mino_position in self.piece.minoes_position:
position = mino.position + self.piece.position position = mino_position + self.piece.position
if position.y >= 0: if position.y >= 0:
self.cells[position.y][position.x] = mino.color_pair self.cells[position.y][position.x] = self.piece.color_pair
else: else:
self.game.over() self.game.over()
return return
@ -578,16 +566,20 @@ class Game:
WIDTH = 80 WIDTH = 80
HEIGHT = Matrix.HEIGHT HEIGHT = Matrix.HEIGHT
AUTOREPEAT_DELAY = 0.02 AUTOREPEAT_DELAY = 0.02
TETROMINOES = (O, I, T, L, J, S, Z)
def __init__(self, scr): def __init__(self, scr):
color_pairs = [curses.COLOR_BLACK for color_pair in range(9)]
if curses.has_colors(): if curses.has_colors():
curses.start_color() curses.start_color()
for color in range(1, 8): for color in range(1, 8):
curses.init_pair(color, color, curses.COLOR_WHITE) curses.init_pair(color, color, curses.COLOR_WHITE)
Mino.color_pairs[color] = curses.color_pair(color)|curses.A_BOLD color_pairs[color] = curses.color_pair(color)|curses.A_BOLD
if curses.can_change_color(): if curses.can_change_color():
curses.init_color(curses.COLOR_YELLOW, 1000, 500, 0) curses.init_color(curses.COLOR_YELLOW, 1000, 500, 0)
Mino.color_pairs[curses.COLOR_ORANGE] = curses.color_pair(curses.COLOR_YELLOW) color_pairs[curses.COLOR_ORANGE] = curses.color_pair(curses.COLOR_YELLOW)
for tetromino_class in self.TETROMINOES:
tetromino_class.color_pair = color_pairs[tetromino_class.COLOR]
try: try:
curses.curs_set(0) curses.curs_set(0)
except curses.error: except curses.error:
@ -637,7 +629,7 @@ class Game:
def random_piece(self): def random_piece(self):
if not self.random_bag: if not self.random_bag:
self.random_bag = [O, I, T, L, J, S, Z] self.random_bag = list(self.TETROMINOES)
random.shuffle(self.random_bag) random.shuffle(self.random_bag)
return self.random_bag.pop() return self.random_bag.pop()