6 Commits

Author SHA1 Message Date
363a89a590 V0.4 Exploding lines 2019-10-06 23:11:51 +02:00
f9c1fe4688 remove no longer necessary const 2019-10-06 18:19:14 +02:00
a0a414db14 particules! 2019-10-06 17:59:27 +02:00
4522ac1d4b rename refresh update 2019-10-06 13:42:37 +02:00
e3e05e87d7 replace mp3 by ogg 2019-10-06 12:57:01 +02:00
82f2b74e68 fix build-requirements.txt 2019-10-06 12:02:59 +02:00
13 changed files with 54 additions and 20 deletions

View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sys import sys
import random
try: try:
import arcade import arcade
@ -33,6 +34,7 @@ LOCK_DELAY = 0.5
FALL_DELAY = 1 FALL_DELAY = 1
AUTOREPEAT_DELAY = 0.300 AUTOREPEAT_DELAY = 0.300
AUTOREPEAT_PERIOD = 0.010 AUTOREPEAT_PERIOD = 0.010
PARTICULE_ACCELERATION = 1.1
# Piece init coord # Piece init coord
MATRIX_PIECE_COORD = Coord(4, LINES) MATRIX_PIECE_COORD = Coord(4, LINES)
@ -73,10 +75,8 @@ RESOURCES_DIR = os.path.join(PROGRAM_DIR, "resources")
IMAGES_DIR = os.path.join(RESOURCES_DIR, "images") IMAGES_DIR = os.path.join(RESOURCES_DIR, "images")
WINDOW_BG_PATH = os.path.join(IMAGES_DIR, "bg.jpg") WINDOW_BG_PATH = os.path.join(IMAGES_DIR, "bg.jpg")
MATRIX_BG_PATH = os.path.join(IMAGES_DIR, "matrix.png") MATRIX_BG_PATH = os.path.join(IMAGES_DIR, "matrix.png")
HELD_BG_PATH = os.path.join(IMAGES_DIR, "held.png")
NEXT_BG_PATH = os.path.join(IMAGES_DIR, "next.png")
MINOES_SPRITES_PATH = os.path.join(IMAGES_DIR, "minoes.png") MINOES_SPRITES_PATH = os.path.join(IMAGES_DIR, "minoes.png")
Color.PRELOCKED = 7 Color.LOCKED = 7
MINOES_COLOR_ID = { MINOES_COLOR_ID = {
Color.BLUE: 0, Color.BLUE: 0,
Color.CYAN: 1, Color.CYAN: 1,
@ -85,7 +85,7 @@ MINOES_COLOR_ID = {
Color.ORANGE: 4, Color.ORANGE: 4,
Color.RED: 5, Color.RED: 5,
Color.YELLOW: 6, Color.YELLOW: 6,
Color.PRELOCKED: 7, Color.LOCKED: 7,
} }
TEXTURES = arcade.load_textures( TEXTURES = arcade.load_textures(
MINOES_SPRITES_PATH, MINOES_SPRITES_PATH,
@ -128,10 +128,10 @@ class MinoSprite(arcade.Sprite):
self.alpha = alpha self.alpha = alpha
self.window = window self.window = window
self.append_texture(TEXTURES[mino.color]) self.append_texture(TEXTURES[mino.color])
self.append_texture(TEXTURES[Color.PRELOCKED]) self.append_texture(TEXTURES[Color.LOCKED])
self.set_texture(0) self.set_texture(0)
def refresh(self, x, y, texture=0): def update(self, x, y, texture=0):
self.scale = self.window.scale self.scale = self.window.scale
size = MINO_SIZE * self.scale size = MINO_SIZE * self.scale
self.left = self.window.matrix.bg.left + x * size self.left = self.window.matrix.bg.left + x * size
@ -143,7 +143,7 @@ class MinoesSprites(arcade.SpriteList):
def resize(self, scale): def resize(self, scale):
for sprite in self: for sprite in self:
sprite.scale = scale sprite.scale = scale
self.refresh() self.update()
class TetrominoSprites(MinoesSprites): class TetrominoSprites(MinoesSprites):
@ -155,23 +155,23 @@ class TetrominoSprites(MinoesSprites):
mino.sprite = MinoSprite(mino, window, alpha) mino.sprite = MinoSprite(mino, window, alpha)
self.append(mino.sprite) self.append(mino.sprite)
def refresh(self, texture=NORMAL_TEXTURE): def update(self, texture=NORMAL_TEXTURE):
for mino in self.tetromino: for mino in self.tetromino:
coord = mino.coord + self.tetromino.coord coord = mino.coord + self.tetromino.coord
mino.sprite.refresh(coord.x, coord.y, texture) mino.sprite.update(coord.x, coord.y, texture)
class MatrixSprites(MinoesSprites): class MatrixSprites(MinoesSprites):
def __init__(self, matrix): def __init__(self, matrix):
super().__init__() super().__init__()
self.matrix = matrix self.matrix = matrix
self.refresh() self.update()
def refresh(self): def update(self):
for y, line in enumerate(self.matrix): for y, line in enumerate(self.matrix):
for x, mino in enumerate(line): for x, mino in enumerate(line):
if mino: if mino:
mino.sprite.refresh(x, y) mino.sprite.update(x, y)
def remove_line(self, y): def remove_line(self, y):
for mino in self.matrix[y]: for mino in self.matrix[y]:
@ -214,6 +214,7 @@ class TetrArcade(TetrisLogic, arcade.Window):
self.matrix.bg.alpha = MATRIX_BG_ALPHA self.matrix.bg.alpha = MATRIX_BG_ALPHA
self.matrix.sprites = MatrixSprites(self.matrix) self.matrix.sprites = MatrixSprites(self.matrix)
self.on_resize(self.init_width, self.init_height) self.on_resize(self.init_width, self.init_height)
self.exploding_minoes = [None for y in range(LINES)]
if self.play_music: if self.play_music:
try: try:
@ -369,7 +370,7 @@ AGAIN""".format(
self.show_text("LEVEL\n{:n}".format(level)) self.show_text("LEVEL\n{:n}".format(level))
def on_generation_phase(self, matrix, falling_piece, ghost_piece, next_pieces): def on_generation_phase(self, matrix, falling_piece, ghost_piece, next_pieces):
matrix.sprites.refresh() matrix.sprites.update()
falling_piece.sprites = TetrominoSprites(falling_piece, self) falling_piece.sprites = TetrominoSprites(falling_piece, self)
ghost_piece.sprites = TetrominoSprites(ghost_piece, self, GHOST_ALPHA) ghost_piece.sprites = TetrominoSprites(ghost_piece, self, GHOST_ALPHA)
next_pieces[-1].sprites = TetrominoSprites(next_pieces[-1], self) next_pieces[-1].sprites = TetrominoSprites(next_pieces[-1], self)
@ -381,8 +382,32 @@ AGAIN""".format(
matrix.sprites.append(mino.sprite) matrix.sprites.append(mino.sprite)
def on_line_remove(self, matrix, y): def on_line_remove(self, matrix, y):
line_textures = tuple(TEXTURES[mino.color] for mino in matrix[y])
self.exploding_minoes[y] = arcade.Emitter(
center_xy=(matrix.bg.left, matrix.bg.bottom + (y + 0.5) * MINO_SIZE),
emit_controller=arcade.EmitBurst(COLLUMNS),
particle_factory=lambda emitter: arcade.LifetimeParticle(
filename_or_texture=random.choice(line_textures),
change_xy=arcade.rand_in_rect(
(-COLLUMNS * MINO_SIZE, -4 * MINO_SIZE),
2 * COLLUMNS * MINO_SIZE,
5 * MINO_SIZE,
),
lifetime=1,
center_xy=arcade.rand_on_line((0, 0), (matrix.bg.width, 0)),
scale=self.scale,
alpha=NORMAL_ALPHA,
change_angle=2,
mutation_callback=self.speed_up_particule,
),
)
matrix.sprites.remove_line(y) matrix.sprites.remove_line(y)
def speed_up_particule(self, particule):
particule.change_x *= PARTICULE_ACCELERATION
particule.change_y *= PARTICULE_ACCELERATION
def on_pattern_phase(self, pattern_name, pattern_score, nb_combo, combo_score): def on_pattern_phase(self, pattern_name, pattern_score, nb_combo, combo_score):
if pattern_score: if pattern_score:
self.show_text("{:s}\n{:n}".format(pattern_name, pattern_score)) self.show_text("{:s}\n{:n}".format(pattern_name, pattern_score))
@ -490,6 +515,10 @@ AGAIN""".format(
anchor_x="right", anchor_x="right",
) )
for exploding_minoes in self.exploding_minoes:
if exploding_minoes:
exploding_minoes.draw()
highlight_text = { highlight_text = {
Phase.STARTING: self.start_text, Phase.STARTING: self.start_text,
Phase.FALLING: self.highlight_texts[0] if self.highlight_texts else "", Phase.FALLING: self.highlight_texts[0] if self.highlight_texts else "",
@ -547,7 +576,7 @@ AGAIN""".format(
crypted_high_score = f.read() crypted_high_score = f.read()
super().load_high_score(crypted_high_score) super().load_high_score(crypted_high_score)
except: except:
self.high_score = 0 self.stats.high_score = 0
def save_high_score(self): def save_high_score(self):
try: try:
@ -590,13 +619,16 @@ High score could not be saved:
arcade.unschedule(_task) arcade.unschedule(_task)
arcade.schedule(_task, period) arcade.schedule(_task, period)
def on_update(self, delta_time): def update(self, delta_time):
for piece in [self.held.piece, self.matrix.ghost] + self.next.pieces: for piece in [self.held.piece, self.matrix.ghost] + self.next.pieces:
if piece: if piece:
piece.sprites.refresh() piece.sprites.update()
if self.matrix.piece: if self.matrix.piece:
texture = LOCKED_TEXTURE if self.phase == Phase.LOCK else NORMAL_TEXTURE texture = LOCKED_TEXTURE if self.phase == Phase.LOCK else NORMAL_TEXTURE
self.matrix.piece.sprites.refresh(texture=texture) self.matrix.piece.sprites.update(texture=texture)
for exploding_minoes in self.exploding_minoes:
if exploding_minoes:
exploding_minoes.update()
def on_close(self): def on_close(self):
self.save_high_score() self.save_high_score()

View File

@ -1 +1,2 @@
arcade cx-freeze arcade
cx-freeze

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
resources/musics/2-!!!.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -29,7 +29,7 @@ options = {
} }
setup( setup(
name="TetrArcade", name="TetrArcade",
version="0.3", version="0.4",
description="Tetris clone", description="Tetris clone",
author="AdrienMalin", author="AdrienMalin",
executables=[executable], executables=[executable],

View File

@ -23,7 +23,7 @@ for i in range(22):
game.on_draw() game.on_draw()
game.lock_phase() game.lock_phase()
game.hold() game.hold()
game.matrix.sprites.refresh() game.matrix.sprites.update()
game.on_draw() game.on_draw()
while game.phase != Phase.OVER: while game.phase != Phase.OVER:
game.hard_drop() game.hard_drop()

View File

@ -79,6 +79,7 @@ class Stats:
def __init__(self): def __init__(self):
self._score = 0 self._score = 0
self.high_score = 0
self.time = 0 self.time = 0
def new_game(self, level): def new_game(self, level):