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

Update terminis.py

Browse Source
This commit is contained in:
adrienmalin
2019-02-22 16:35:06 +01:00
parent 3fb83acb31
commit 04761e19bb
1 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
terminis/terminis.py
View File

@ -62,7 +62,6 @@ class Movement:
LEFT = Point(-1, 0) LEFT = Point(-1, 0)
RIGHT = Point(1, 0) RIGHT = Point(1, 0)
DOWN = Point(0, 1) DOWN = Point(0, 1)
STILL = Point(0, 0)
class Tetromino: class Tetromino:
@ -91,7 +90,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_position = self.MINOES_POSITIONS self.minoes_positions = 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
@ -99,20 +98,10 @@ class Tetromino:
self.fall_timer = None self.fall_timer = None
self.hold_enabled = True 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): def move(self, movement, lock=True):
possible_position = self.possible_position(self.minoes_position, movement) potential_position = self.position + movement
if possible_position: if self.matrix.shape_fits(potential_position, self.minoes_positions):
self.position = possible_position self.position = potential_position
self.postpone_lock() self.postpone_lock()
self.rotated_last = False self.rotated_last = False
self.matrix.refresh() self.matrix.refresh()
@ -138,14 +127,14 @@ 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_position in self.minoes_position for mino_position in self.minoes_positions
) )
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):
possible_position = self.possible_position(potential_minoes_positions, liberty_degree) potential_position = self.position + liberty_degree
if possible_position: if self.matrix.shape_fits(potential_position, potential_minoes_positions):
self.orientation = (self.orientation+direction) % 4 self.orientation = (self.orientation+direction) % 4
self.position = possible_position self.position = potential_position
self.minoes_position = potential_minoes_positions self.minoes_positions = potential_minoes_positions
self.postpone_lock() self.postpone_lock()
self.rotated_last = True self.rotated_last = True
if rotation_point == 5: if rotation_point == 5:
@ -171,7 +160,7 @@ class Tetromino:
def lock(self): def lock(self):
self.lock_timer = None self.lock_timer = None
if not self.possible_position(self.minoes_position, Movement.DOWN): if not self.matrix.shape_fits(self.position+Movement.DOWN, self.minoes_positions):
if self.fall_timer: if self.fall_timer:
self.fall_timer = scheduler.cancel(self.fall_timer) self.fall_timer = scheduler.cancel(self.fall_timer)
self.matrix.lock(self.t_spin()) self.matrix.lock(self.t_spin())
@ -264,7 +253,7 @@ class Window:
attr = self.piece.color_pair | curses.A_BLINK | curses.A_REVERSE attr = self.piece.color_pair | curses.A_BLINK | curses.A_REVERSE
else: else:
attr = self.piece.color_pair attr = self.piece.color_pair
for mino_position in self.piece.minoes_position: for mino_position in self.piece.minoes_positions:
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)
@ -310,8 +299,14 @@ class Matrix(Window):
and not (position.y >= 0 and self.cells[position.y][position.x] is not None) and not (position.y >= 0 and self.cells[position.y][position.x] is not None)
) )
def shape_fits(self, piece_position, MINOES_POSITIONS):
return all(
self.is_free_cell(piece_position+mino_position)
for mino_position in MINOES_POSITIONS
)
def lock(self, t_spin): def lock(self, t_spin):
for mino_position in self.piece.minoes_position: for mino_position in self.piece.minoes_positions:
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] = self.piece.color_pair self.cells[position.y][position.x] = self.piece.color_pair
@ -354,13 +349,12 @@ class Next(HoldNext):
class Stats(Window): class Stats(Window):
SCORES = ( SCORES = (
{"": 0, "MINI T-SPIN": 1, "T-SPIN": 4}, {"name": "", "": 0, "MINI T-SPIN": 1, "T-SPIN": 4},
{"": 1, "MINI T-SPIN": 2, "T-SPIN": 8}, {"name": "SINGLE", "": 1, "MINI T-SPIN": 2, "T-SPIN": 8},
{"": 3, "T-SPIN": 12}, {"name": "DOUBLE", "": 3, "T-SPIN": 12},
{"": 5, "T-SPIN": 16}, {"name": "TRIPLE", "": 5, "T-SPIN": 16},
{"": 8} {"name": "TETRIS", "": 8}
) )
LINES_CLEARED_NAMES = ("", "SINGLE", "DOUBLE", "TRIPLE", "TETRIS")
TITLE = "STATS" TITLE = "STATS"
FILE_NAME = ".high_score" FILE_NAME = ".high_score"
if sys.platform == "win32": if sys.platform == "win32":
@ -446,7 +440,7 @@ class Stats(Window):
if t_spin: if t_spin:
self.strings.append(t_spin) self.strings.append(t_spin)
if nb_lines: if nb_lines:
self.strings.append(self.LINES_CLEARED_NAMES[nb_lines]) self.strings.append(self.SCORES[nb_lines]["name"])
self.combo += 1 self.combo += 1
else: else:
self.combo = -1 self.combo = -1
@ -652,7 +646,7 @@ class Game:
def start_piece(self): def start_piece(self):
self.matrix.piece.position = Matrix.PIECE_POSITION self.matrix.piece.position = Matrix.PIECE_POSITION
if self.matrix.piece.possible_position(self.matrix.piece.minoes_position, Movement.STILL): if self.matrix.shape_fits(self.matrix.piece.position, self.matrix.piece.minoes_positions):
self.matrix.piece.fall_timer = scheduler.enter(Tetromino.fall_delay, 2, self.matrix.piece.fall, tuple()) self.matrix.piece.fall_timer = scheduler.enter(Tetromino.fall_delay, 2, self.matrix.piece.fall, tuple())
self.matrix.refresh() self.matrix.refresh()
else: else:
@ -697,7 +691,7 @@ class Game:
self.matrix.piece, self.hold.piece = self.hold.piece, self.matrix.piece self.matrix.piece, self.hold.piece = self.hold.piece, self.matrix.piece
self.hold.piece.position = self.hold.PIECE_POSITION self.hold.piece.position = self.hold.PIECE_POSITION
self.hold.piece.minoes_position = self.hold.piece.MINOES_POSITIONS self.hold.piece.minoes_positions = self.hold.piece.MINOES_POSITIONS
self.hold.piece.hold_enabled = False self.hold.piece.hold_enabled = False
self.hold.refresh() self.hold.refresh()