diff --git a/TetrArcade.py b/TetrArcade.py index 7dc517d..09c6f60 100644 --- a/TetrArcade.py +++ b/TetrArcade.py @@ -209,34 +209,6 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window): self.matrix_bg.alpha = MATRIX_BG_ALPHA self.matrix.sprites = MatrixSprites(self.matrix) - def on_hide(self): - self.pause() - - def on_resize(self, width, height): - super().on_resize(width, height) - center_x = width / 2 - center_y = height / 2 - self.scale = min(width/WINDOW_WIDTH, height/WINDOW_HEIGHT) - - self.bg.scale = max(width/WINDOW_WIDTH, height/WINDOW_HEIGHT) - self.bg.center_x = center_x - self.bg.center_y = center_y - - self.matrix_bg.scale = self.scale - self.matrix_bg.center_x = center_x - self.matrix_bg.center_y = center_y - self.matrix_bg.left = int(self.matrix_bg.left) - self.matrix_bg.top = int(self.matrix_bg.top) - - self.matrix.sprites.resize(self.scale) - - for tetromino in [self.held, self.current, self.ghost] + self.next: - if tetromino: - tetromino.sprites.resize(self.scale) - - def toggle_fullscreen(self): - self.set_fullscreen(not self.fullscreen) - def new_game(self): self.highlight_texts = [] super().new_game() @@ -388,6 +360,34 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window): anchor_y = 'center' ) + def on_hide(self): + self.pause() + + def toggle_fullscreen(self): + self.set_fullscreen(not self.fullscreen) + + def on_resize(self, width, height): + super().on_resize(width, height) + center_x = width / 2 + center_y = height / 2 + self.scale = min(width/WINDOW_WIDTH, height/WINDOW_HEIGHT) + + self.bg.scale = max(width/WINDOW_WIDTH, height/WINDOW_HEIGHT) + self.bg.center_x = center_x + self.bg.center_y = center_y + + self.matrix_bg.scale = self.scale + self.matrix_bg.center_x = center_x + self.matrix_bg.center_y = center_y + self.matrix_bg.left = int(self.matrix_bg.left) + self.matrix_bg.top = int(self.matrix_bg.top) + + self.matrix.sprites.resize(self.scale) + + for tetromino in [self.held, self.current, self.ghost] + self.next: + if tetromino: + tetromino.sprites.resize(self.scale) + def load_high_score(self): try: with open(HIGH_SCORE_PATH, "r") as f: diff --git a/tetrislogic/tetrislogic.py b/tetrislogic/tetrislogic.py index fd11739..723d6e8 100644 --- a/tetrislogic/tetrislogic.py +++ b/tetrislogic/tetrislogic.py @@ -216,6 +216,7 @@ class TetrisLogic(): self.current.coord + Movement.DOWN, (mino.coord for mino in self.current) ): + self.restart(self.lock, self.lock_delay) return # Start lock