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

use property for score

Browse Source
This commit is contained in:
adrienmalin 2019-09-29 12:05:07 +02:00
parent 80d639fd63
commit f5be3c1ad5
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tetrislogic.py
View File

@ -117,6 +117,12 @@ class Tetromino:
def ghost(self): def ghost(self):
return self.__class__() return self.__class__()
def minoes_absolute_coord(self):
return [
mino_coord + self.coord
for mino_coord in self.minoes_coords
]
class O(AbstractTetromino, metaclass=MetaTetromino): class O(AbstractTetromino, metaclass=MetaTetromino):
@ -203,6 +209,17 @@ class TetrisLogic():
self.time = 0 self.time = 0
self.autorepeatable_actions = (self.move_left, self.move_right, self.soft_drop) self.autorepeatable_actions = (self.move_left, self.move_right, self.soft_drop)
self.pressed_actions = [] self.pressed_actions = []
self._score = 0
@property
def score(self):
return self._score
@score.setter
def score(self, new_score):
self._score = new_score
if self._score > self.high_score:
self.high_score = self._score
def new_game(self): def new_game(self):
self.level = 0 self.level = 0
@ -275,14 +292,14 @@ class TetrisLogic():
def soft_drop(self): def soft_drop(self):
if self.move(Movement.DOWN): if self.move(Movement.DOWN):
self.add_to_score(1) self.score += 1
return True return True
else: else:
return False return False
def hard_drop(self): def hard_drop(self):
while self.move(Movement.DOWN, prelock=False): while self.move(Movement.DOWN, prelock=False):
self.add_to_score(2) self.score += 2
self.lock() self.lock()
def fall(self): def fall(self):
@ -417,7 +434,7 @@ class TetrisLogic():
lock_score += ds lock_score += ds
self.show_text("COMBO x{:n}\n{:n}".format(self.combo, ds)) self.show_text("COMBO x{:n}\n{:n}".format(self.combo, ds))
self.add_to_score(lock_score) self.score += lock_score
if self.goal <= 0: if self.goal <= 0:
self.new_level() self.new_level()
@ -430,7 +447,6 @@ class TetrisLogic():
if coord.y <= NB_LINES+3: if coord.y <= NB_LINES+3:
self.matrix[coord.y][coord.x] = self.current_piece.MINOES_COLOR self.matrix[coord.y][coord.x] = self.current_piece.MINOES_COLOR
def append_new_line_to_matrix(self): def append_new_line_to_matrix(self):
self.matrix.append([None for x in range(NB_COLS)]) self.matrix.append([None for x in range(NB_COLS)])
@ -463,11 +479,6 @@ class TetrisLogic():
] ]
return not self.cell_is_free(t_slot_coord) return not self.cell_is_free(t_slot_coord)
def add_to_score(self, delta_score):
self.score += delta_score
if self.score > self.high_score:
self.high_score = self.score
def swap(self): def swap(self):
if self.current_piece.hold_enabled: if self.current_piece.hold_enabled:
self.current_piece.hold_enabled = False self.current_piece.hold_enabled = False
@ -548,6 +559,7 @@ High score is set to 0"""
) )
def save_high_score(self): def save_high_score(self):
print("High score: {:n}".format(self.high_score))
raise Warning( raise Warning(
"""TetrisLogic.save_high_score not implemented. """TetrisLogic.save_high_score not implemented.
High score is not saved""" High score is not saved"""