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-23 16:26:42 +01:00
parent 549a4d363b
commit d243c67287
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
terminis/terminis.py
View File

@ -93,10 +93,10 @@ class Tetromino:
self.fall_timer = None self.fall_timer = None
self.hold_enabled = True self.hold_enabled = True
def moved(self, potential_position, potential_minoes_positions): def moved(self, movement, potential_minoes_positions):
potential_position = self.position + movement
if self.matrix.shape_fits(potential_position, potential_minoes_positions): if self.matrix.shape_fits(potential_position, potential_minoes_positions):
self.position = potential_position self.position = potential_position
self.minoes_positions = potential_minoes_positions
self.postpone_lock() self.postpone_lock()
self.matrix.refresh() self.matrix.refresh()
return True return True
@ -104,8 +104,7 @@ class Tetromino:
return False return False
def move(self, movement, lock=True): def move(self, movement, lock=True):
potential_position = self.position + movement if self.moved(movement, self.minoes_positions):
if self.moved(potential_position, self.minoes_positions):
self.rotated_last = False self.rotated_last = False
return True return True
else: else:
@ -119,8 +118,8 @@ class Tetromino:
for mino_position in self.minoes_positions 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):
potential_position = self.position + liberty_degree if self.moved(liberty_degree, potential_minoes_positions):
if self.moved(potential_position, potential_minoes_positions): self.minoes_positions = potential_minoes_positions
self.orientation = (self.orientation+direction) % 4 self.orientation = (self.orientation+direction) % 4
self.rotated_last = True self.rotated_last = True
if rotation_point == 5: if rotation_point == 5:
@ -729,6 +728,12 @@ class Game:
if self.input_timer: if self.input_timer:
self.input_timer = scheduler.cancel(self.input_timer) self.input_timer = scheduler.cancel(self.input_timer)
self.stats.save() self.stats.save()
print("SCORE\t{:n}".format(self.stats.score))
print("HIGH\t{:n}".format(self.stats.high_score))
t = time.localtime(time.time() - self.stats.time)
print("TIME\t%02d:%02d:%02d" % (t.tm_hour-1, t.tm_min, t.tm_sec))
print("LEVEL\t%d" % self.stats.level)
print("LINES\t%d" % self.stats.lines_cleared)
def main(): def main():