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

fix typo in method name

Browse Source
This commit is contained in:
adrienmalin
2019-09-28 15:06:24 +02:00
parent 78613ef615
commit d89a29cce9
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tetrarcade.py
View File

@ -13,7 +13,7 @@ python -m pip install --user arcade
""" """
) )
from tetrislogic import TetrisLogic, Status, AbstractScheduler from tetrislogic import TetrisLogic, State, AbstractScheduler
# Constants # Constants
@ -129,10 +129,10 @@ class TetrArcade(TetrisLogic, arcade.Window):
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
self.KEY_MAP = { self.KEY_MAP = {
Status.STARTING: { State.STARTING: {
arcade.key.ENTER: self.new_game arcade.key.ENTER: self.new_game
}, },
Status.PLAYING: { State.PLAYING: {
arcade.key.LEFT: self.move_left, arcade.key.LEFT: self.move_left,
arcade.key.NUM_4: self.move_left, arcade.key.NUM_4: self.move_left,
arcade.key.RIGHT: self.move_right, arcade.key.RIGHT: self.move_right,
@ -155,11 +155,11 @@ class TetrArcade(TetrisLogic, arcade.Window):
arcade.key.ESCAPE: self.pause, arcade.key.ESCAPE: self.pause,
arcade.key.F1: self.pause, arcade.key.F1: self.pause,
}, },
Status.PAUSED: { State.PAUSED: {
arcade.key.ESCAPE: self.resume, arcade.key.ESCAPE: self.resume,
arcade.key.F1: self.resume arcade.key.F1: self.resume
}, },
Status.OVER: { State.OVER: {
arcade.key.ENTER: self.new_game arcade.key.ENTER: self.new_game
} }
} }
@ -216,7 +216,7 @@ class TetrArcade(TetrisLogic, arcade.Window):
def on_key_press(self, key, modifiers): def on_key_press(self, key, modifiers):
for key_or_modifier in (key, modifiers): for key_or_modifier in (key, modifiers):
try: try:
action = self.KEY_MAP[self.status][key_or_modifier] action = self.KEY_MAP[self.state][key_or_modifier]
except KeyError: except KeyError:
pass pass
else: else:
@ -224,7 +224,7 @@ class TetrArcade(TetrisLogic, arcade.Window):
def on_key_release(self, key, modifiers): def on_key_release(self, key, modifiers):
try: try:
action = self.KEY_MAP[self.status][key] action = self.KEY_MAP[self.state][key]
except KeyError: except KeyError:
pass pass
else: else:
@ -291,7 +291,7 @@ class TetrArcade(TetrisLogic, arcade.Window):
arcade.start_render() arcade.start_render()
self.bg_sprite.draw() self.bg_sprite.draw()
if self.status in (Status.PLAYING, Status.OVER): if self.state in (State.PLAYING, State.OVER):
self.matrix_sprite.draw() self.matrix_sprite.draw()
self.matrix_minoes_sprites.draw() self.matrix_minoes_sprites.draw()
@ -300,7 +300,11 @@ class TetrArcade(TetrisLogic, arcade.Window):
self.update_piece(self.current_piece, self.current_piece_sprites) self.update_piece(self.current_piece, self.current_piece_sprites)
if self.current_piece.prelocked: if self.current_piece.prelocked:
alpha = PRELOCKED_ALPHA if self.current_piece.prelocked else NORMAL_ALPHA alpha = (
PRELOCKED_ALPHA
if self.current_piece.prelocked
else NORMAL_ALPHA
)
for mino_sprite in self.current_piece_sprites: for mino_sprite in self.current_piece_sprites:
mino_sprite.alpha = alpha mino_sprite.alpha = alpha
self.current_piece_sprites.draw() self.current_piece_sprites.draw()
@ -350,11 +354,11 @@ class TetrArcade(TetrisLogic, arcade.Window):
) )
highlight_text = { highlight_text = {
Status.STARTING: START_TEXT, State.STARTING: START_TEXT,
Status.PLAYING: self.highlight_texts[0] if self.highlight_texts else "", State.PLAYING: self.highlight_texts[0] if self.highlight_texts else "",
Status.PAUSED: PAUSE_TEXT, State.PAUSED: PAUSE_TEXT,
Status.OVER: GAME_OVER_TEXT State.OVER: GAME_OVER_TEXT
}.get(self.status, "") }.get(self.state, "")
if highlight_text: if highlight_text:
arcade.draw_text( arcade.draw_text(
text = highlight_text, text = highlight_text,

16
tetrislogic.py
View File

@ -34,7 +34,7 @@ HELD_PIECE_POSITION = Coord(-7, NB_LINES-3)
HELD_I_POSITION = Coord(-7, NB_LINES-3) HELD_I_POSITION = Coord(-7, NB_LINES-3)
class Status: class State:
STARTING = "starting" STARTING = "starting"
PLAYING = "playing" PLAYING = "playing"
@ -70,7 +70,7 @@ class AbstractScheduler:
def stop(self, task): def stop(self, task):
raise NotImplementedError raise NotImplementedError
def restrart(self, task, period): def restart(self, task, period):
self.stop(task) self.stop(task)
self.start(task, period) self.start(task, period)
@ -197,7 +197,7 @@ class TetrisLogic():
def __init__(self): def __init__(self):
self.high_score = 0 self.high_score = 0
self.status = Status.STARTING self.state = State.STARTING
self.matrix = [] self.matrix = []
self.next_pieces = [] self.next_pieces = []
self.current_piece = None self.current_piece = None
@ -226,7 +226,7 @@ class TetrisLogic():
self.next_pieces = [Tetromino() for i in range(NB_NEXT_PIECES)] self.next_pieces = [Tetromino() for i in range(NB_NEXT_PIECES)]
self.current_piece = None self.current_piece = None
self.held_piece = None self.held_piece = None
self.status = Status.PLAYING self.state = State.PLAYING
self.scheduler.start(self.update_time, 1) self.scheduler.start(self.update_time, 1)
self.new_level() self.new_level()
@ -237,7 +237,7 @@ class TetrisLogic():
self.fall_delay = pow(0.8 - ((self.level-1)*0.007), self.level-1) self.fall_delay = pow(0.8 - ((self.level-1)*0.007), self.level-1)
if self.level > 15: if self.level > 15:
self.lock_delay = 0.5 * pow(0.9, self.level-15) self.lock_delay = 0.5 * pow(0.9, self.level-15)
self.show_text("Level\n{:n}".format(self.level)) self.show_text("LEVEL\n{:n}".format(self.level))
self.scheduler.start(self.drop, self.fall_delay) self.scheduler.start(self.drop, self.fall_delay)
self.new_current_piece() self.new_current_piece()
@ -457,7 +457,7 @@ class TetrisLogic():
self.new_current_piece() self.new_current_piece()
def pause(self): def pause(self):
self.status = Status.PAUSED self.state = State.PAUSED
self.scheduler.stop(self.drop) self.scheduler.stop(self.drop)
self.scheduler.stop(self.lock) self.scheduler.stop(self.lock)
self.scheduler.stop(self.update_time) self.scheduler.stop(self.update_time)
@ -465,14 +465,14 @@ class TetrisLogic():
self.stop_autorepeat() self.stop_autorepeat()
def resume(self): def resume(self):
self.status = Status.PLAYING self.state = State.PLAYING
self.scheduler.start(self.drop, self.fall_delay) self.scheduler.start(self.drop, self.fall_delay)
if self.current_piece.prelocked: if self.current_piece.prelocked:
self.scheduler.start(self.lock, self.lock_delay) self.scheduler.start(self.lock, self.lock_delay)
self.scheduler.start(self.update_time, 1) self.scheduler.start(self.update_time, 1)
def game_over(self): def game_over(self):
self.status = Status.OVER self.state = State.OVER
self.scheduler.stop(self.drop) self.scheduler.stop(self.drop)
self.scheduler.stop(self.update_time) self.scheduler.stop(self.update_time)
self.scheduler.stop(self.repeat_action) self.scheduler.stop(self.repeat_action)