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

Compare commits

base: adrien:97b687c085aab25b3262166d2a6136c109900793
Branches Tags
adrien:master
adrien:0.6
adrien:0.5
adrien:0.4
adrien:0.3
adrien:0.2
adrien:0.1
..
compare: adrien:f7a47efecf751fedc941526200e8bb128c298b88
Branches Tags
adrien:master
adrien:0.6
adrien:0.5
adrien:0.4
adrien:0.3
adrien:0.2
adrien:0.1

No commits in common. "97b687c085aab25b3262166d2a6136c109900793" and "f7a47efecf751fedc941526200e8bb128c298b88" have entirely different histories.
97b687c085 ... f7a47efecf

2 changed files with 43 additions and 78 deletions
Show Stats Expand all files Collapse all files

119
TetrArcade.py
View File

@ -22,7 +22,6 @@ WINDOW_WIDTH = 800
WINDOW_HEIGHT = 600 WINDOW_HEIGHT = 600
WINDOW_TITLE = "TETRARCADE" WINDOW_TITLE = "TETRARCADE"
MINO_SIZE = 20 MINO_SIZE = 20
BG_COLOR = (7, 11, 21)
# Delays (seconds) # Delays (seconds)
HIGHLIGHT_TEXT_DISPLAY_DELAY = 0.7 HIGHLIGHT_TEXT_DISPLAY_DELAY = 0.7
@ -56,12 +55,12 @@ HIGH_SCORE_PATH = os.path.join(USER_PROFILE_DIR, ".high_score")
# Text # Text
TEXT_COLOR = arcade.color.BUBBLES TEXT_COLOR = arcade.color.BUBBLES
FONT_NAME = "joystix monospace.ttf"
STATS_TEXT_MARGIN = 40
STATS_TEXT_SIZE = 16
STATS_TEXT_HEIGHT = 20.8
HIGHLIGHT_TEXT_COLOR = arcade.color.BUBBLES HIGHLIGHT_TEXT_COLOR = arcade.color.BUBBLES
HIGHLIGHT_TEXT_SIZE = 20 FONT_NAME = "joystix monospace.ttf"
TEXT_MARGIN = 40
FONT_SIZE = 16
TEXT_HEIGHT = 20.8
HIGHLIGHT_TEXT_FONT_SIZE = 20
CONTROL_TEXT = """ CONTROL_TEXT = """
@ -75,9 +74,7 @@ HARD DROP SPACE
ROTATE CLOCKWISE ↑ ROTATE CLOCKWISE ↑
ROTATE COUNTER Z ROTATE COUNTER Z
HOLD C HOLD C
FULLSCREEN F11
PAUSE ESC PAUSE ESC
QUIT ALT+F4
""" """
@ -106,32 +103,24 @@ AGAIN"""
class MinoSprite(arcade.Sprite): class MinoSprite(arcade.Sprite):
def __init__(self, mino, window, alpha): def __init__(self, mino, matrix_bg, alpha):
super().__init__(MINOES_SPRITES_PATHS[mino.color], window.scale) super().__init__(MINOES_SPRITES_PATHS[mino.color])
self.alpha = alpha self.alpha = alpha
self.window = window self.matrix_bg = matrix_bg
def set_position(self, x, y): def set_position(self, x, y):
size = MINO_SIZE * self.scale self.left = self.matrix_bg.left + x*MINO_SIZE
self.left = self.window.matrix_bg.left + x*size self.bottom = self.matrix_bg.bottom + y*MINO_SIZE
self.bottom = self.window.matrix_bg.bottom + y*size
class MinoesSprites(arcade.SpriteList): class TetrominoSprites(arcade.SpriteList):
def resize(self, scale): def __init__(self, tetromino, matrix_bg, alpha=NORMAL_ALPHA):
for sprite in self:
sprite.scale = scale
self.update()
class TetrominoSprites(MinoesSprites):
def __init__(self, tetromino, window, alpha=NORMAL_ALPHA):
super().__init__() super().__init__()
self.tetromino = tetromino self.tetromino = tetromino
self.matrix_bg = matrix_bg
for mino in tetromino: for mino in tetromino:
mino.sprite = MinoSprite(mino, window, alpha) mino.sprite = MinoSprite(mino, matrix_bg, alpha)
self.append(mino.sprite) self.append(mino.sprite)
def update(self): def update(self):
@ -145,7 +134,7 @@ class TetrominoSprites(MinoesSprites):
sprite.alpha = alpha sprite.alpha = alpha
class MatrixSprites(MinoesSprites): class MatrixSprites(arcade.SpriteList):
def __init__(self, matrix): def __init__(self, matrix):
super().__init__() super().__init__()
@ -170,8 +159,7 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
self.KEY_MAP = { self.KEY_MAP = {
tetrislogic.State.STARTING: { tetrislogic.State.STARTING: {
arcade.key.ENTER: self.new_game, arcade.key.ENTER: self.new_game
arcade.key.F11: self.toogle_fullscreen
}, },
tetrislogic.State.PLAYING: { tetrislogic.State.PLAYING: {
arcade.key.LEFT: self.move_left, arcade.key.LEFT: self.move_left,
@ -195,16 +183,13 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
arcade.key.NUM_0: self.swap, arcade.key.NUM_0: self.swap,
arcade.key.ESCAPE: self.pause, arcade.key.ESCAPE: self.pause,
arcade.key.F1: self.pause, arcade.key.F1: self.pause,
arcade.key.F11: self.toogle_fullscreen
}, },
tetrislogic.State.PAUSED: { tetrislogic.State.PAUSED: {
arcade.key.ESCAPE: self.resume, arcade.key.ESCAPE: self.resume,
arcade.key.F1: self.resume, arcade.key.F1: self.resume
arcade.key.F11: self.toogle_fullscreen
}, },
tetrislogic.State.OVER: { tetrislogic.State.OVER: {
arcade.key.ENTER: self.new_game, arcade.key.ENTER: self.new_game
arcade.key.F11: self.toogle_fullscreen
} }
} }
@ -215,48 +200,29 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
width = WINDOW_WIDTH, width = WINDOW_WIDTH,
height = WINDOW_HEIGHT, height = WINDOW_HEIGHT,
title = WINDOW_TITLE, title = WINDOW_TITLE,
resizable = True, resizable = False,
antialiasing = False antialiasing = False
) )
arcade.set_background_color(BG_COLOR)
center_x = WINDOW_WIDTH / 2
center_y = WINDOW_HEIGHT / 2
self.bg = arcade.Sprite(WINDOW_BG_PATH) self.bg = arcade.Sprite(WINDOW_BG_PATH)
self.matrix_bg = arcade.Sprite(MATRIX_SPRITE_PATH)
self.matrix_bg.alpha = MATRIX_BG_ALPHA
self.matrix.sprites = MatrixSprites(self.matrix)
self.stats_text = arcade.create_text(
text = STATS_TEXT,
color = TEXT_COLOR,
font_size = STATS_TEXT_SIZE,
font_name = FONT_NAME,
anchor_x = 'right'
)
self.on_resize(WINDOW_WIDTH, WINDOW_HEIGHT)
self.new_game()
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_x = center_x
self.bg.center_y = center_y self.bg.center_y = center_y
self.matrix_bg = arcade.Sprite(MATRIX_SPRITE_PATH)
self.matrix_bg.scale = self.scale self.matrix_bg.alpha = MATRIX_BG_ALPHA
self.matrix_bg.center_x = center_x self.matrix_bg.center_x = center_x
self.matrix_bg.center_y = center_y self.matrix_bg.center_y = center_y
self.matrix_bg.left = int(self.matrix_bg.left) self.matrix_bg.left = int(self.matrix_bg.left)
self.matrix_bg.top = int(self.matrix_bg.top) self.matrix_bg.top = int(self.matrix_bg.top)
self.matrix.sprites = MatrixSprites(self.matrix)
self.matrix.sprites.resize(self.scale) self.stats_text = arcade.create_text(
text = STATS_TEXT,
for tetromino in [self.held, self.current, self.ghost] + self.next: color = TEXT_COLOR,
if tetromino: font_size = FONT_SIZE,
tetromino.sprites.resize(self.scale) font_name = FONT_NAME,
anchor_x = 'right'
def toogle_fullscreen(self): )
self.fullscreen = not self.fullscreen
def new_game(self): def new_game(self):
self.highlight_texts = [] self.highlight_texts = []
@ -264,13 +230,13 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
def new_tetromino(self): def new_tetromino(self):
tetromino = super().new_tetromino() tetromino = super().new_tetromino()
tetromino.sprites = TetrominoSprites(tetromino, self) tetromino.sprites = TetrominoSprites(tetromino, self.matrix_bg)
return tetromino return tetromino
def new_current(self): def new_current(self):
self.matrix.sprites = MatrixSprites(self.matrix) self.matrix.sprites = MatrixSprites(self.matrix)
super().new_current() super().new_current()
self.ghost.sprites = TetrominoSprites(self.ghost, self, GHOST_ALPHA) self.ghost.sprites = TetrominoSprites(self.ghost, self.matrix_bg, GHOST_ALPHA)
for tetromino in [self.current, self.ghost] + self.next: for tetromino in [self.current, self.ghost] + self.next:
tetromino.sprites.update() tetromino.sprites.update()
@ -279,9 +245,8 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
if self.current.prelocked: if self.current.prelocked:
self.current.sprites.set_alpha(PRELOCKED_ALPHA) self.current.sprites.set_alpha(PRELOCKED_ALPHA)
if moved: if moved:
size = MINO_SIZE * self.scale change_x = movement.x * MINO_SIZE
change_x = movement.x * size change_y = movement.y * MINO_SIZE
change_y = movement.y * size
self.current.sprites.move(change_x, change_y) self.current.sprites.move(change_x, change_y)
if movement in (tetrislogic.Movement.LEFT, tetrislogic.Movement.RIGHT): if movement in (tetrislogic.Movement.LEFT, tetrislogic.Movement.RIGHT):
self.ghost.sprites.update() self.ghost.sprites.update()
@ -296,7 +261,7 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
def swap(self): def swap(self):
super().swap() super().swap()
self.ghost = TetrominoSprites(self.ghost, self, GHOST_ALPHA) self.ghost = TetrominoSprites(self.ghost, self.matrix_bg, GHOST_ALPHA)
for tetromino in [self.held, self.current, self.ghost]: for tetromino in [self.held, self.current, self.ghost]:
if tetromino: if tetromino:
tetromino.sprites.update() tetromino.sprites.update()
@ -347,7 +312,7 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
arcade.render_text( arcade.render_text(
self.stats_text, self.stats_text,
self.matrix_bg.left - STATS_TEXT_MARGIN, self.matrix_bg.left - TEXT_MARGIN,
self.matrix_bg.bottom self.matrix_bg.bottom
) )
t = time.localtime(self.time) t = time.localtime(self.time)
@ -366,10 +331,10 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
): ):
arcade.draw_text( arcade.draw_text(
text = text, text = text,
start_x = self.matrix_bg.left - STATS_TEXT_MARGIN, start_x = self.matrix_bg.left - TEXT_MARGIN,
start_y = self.matrix_bg.bottom + 2*y*STATS_TEXT_HEIGHT, start_y = self.matrix_bg.bottom + 2*y*TEXT_HEIGHT,
color = TEXT_COLOR, color = TEXT_COLOR,
font_size = STATS_TEXT_SIZE, font_size = FONT_SIZE,
align = 'right', align = 'right',
font_name = FONT_NAME, font_name = FONT_NAME,
anchor_x = 'right' anchor_x = 'right'
@ -387,7 +352,7 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
start_x = self.matrix_bg.center_x, start_x = self.matrix_bg.center_x,
start_y = self.matrix_bg.center_y, start_y = self.matrix_bg.center_y,
color = HIGHLIGHT_TEXT_COLOR, color = HIGHLIGHT_TEXT_COLOR,
font_size = HIGHLIGHT_TEXT_SIZE, font_size = HIGHLIGHT_TEXT_FONT_SIZE,
align = 'center', align = 'center',
font_name = FONT_NAME, font_name = FONT_NAME,
anchor_x = 'center', anchor_x = 'center',

2
tetrislogic/tetromino.py
View File

@ -45,7 +45,7 @@ class Tetromino(list):
self.prelocked = False self.prelocked = False
def ghost(self): def ghost(self):
return type(self)() return self.__class__()
class O(Tetromino, metaclass=MetaTetromino): class O(Tetromino, metaclass=MetaTetromino):