alex/tetrys
1
Fork 0
Code Releases 1 Activity

Polish

Browse Source
This commit is contained in:
Alex Yatskov 2014-05-19 14:00:44 +09:00
parent a4f7d90061
commit 4bf32448e1
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tetris.py
View File

@ -190,26 +190,17 @@ class Game:
def __init__(self): def __init__(self):
font_path = pygame.font.get_default_font() font_path = pygame.font.get_default_font()
self.font = pygame.font.Font(font_path, 16) self.font = pygame.font.Font(font_path, 16)
self.reset()
self.new_game()
def new_game(self): def new_game(self):
border_width = 3 self.reset()
block_dims = 20, 20
padding = 10
self.board = Board((padding, padding), (10, 20), border_width, block_dims)
self.board_prev = Board((self.board.grid_rect.right+padding, padding), (4, 4), border_width, block_dims)
self.score_position = self.board_prev.grid_rect.left, self.board_prev.grid_rect.bottom+padding
self.tetrad = Tetrad.random() self.tetrad = Tetrad.random()
self.tetrad = self.tetrad.centered(self.board.grid_dims[0]) self.tetrad = self.tetrad.centered(self.board.grid_dims[0])
self.tetrad_next = Tetrad.random() self.tetrad_next = Tetrad.random()
self.tetrad_preview = None self.tetrad_preview = None
self.ticker = 0
self.score = 0
self.lines_cleared = 0
self.active = True self.active = True
@ -217,14 +208,36 @@ class Game:
self.active = False self.active = False
def reset(self):
border_width = 3
block_dims = 20, 20
padding = 10
self.board = Board((padding, padding), (10, 20), border_width, block_dims)
self.board_prev = Board((self.board.grid_rect.right+padding, padding), (4, 4), border_width, block_dims)
self.score_position = self.board_prev.grid_rect.left, self.board_prev.grid_rect.bottom+padding
self.tetrad = None
self.tetrad_next = None
self.tetrad_preview = None
self.ticker = 0
self.score = 0
self.lines_cleared = 0
self.active = False
def render(self, surface): def render(self, surface):
self.board.render(surface) self.board.render(surface)
if self.tetrad_preview is not None: if self.tetrad_preview is not None:
self.board.render_tetrad(surface, self.tetrad_preview, True) self.board.render_tetrad(surface, self.tetrad_preview, True)
self.board.render_tetrad(surface, self.tetrad) if self.tetrad is not None:
self.board.render_tetrad(surface, self.tetrad)
self.board_prev.render(surface) self.board_prev.render(surface)
self.board_prev.render_tetrad(surface, self.tetrad_next) if self.tetrad_next is not None:
self.board_prev.render_tetrad(surface, self.tetrad_next)
self.render_stats(surface) self.render_stats(surface)
@ -330,6 +343,7 @@ class Engine:
self.game = Game() self.game = Game()
self.surface = pygame.display.set_mode(resolution, pygame.DOUBLEBUF) self.surface = pygame.display.set_mode(resolution, pygame.DOUBLEBUF)
pygame.display.set_caption('Tetris')
self.ticks = pygame.time.get_ticks() self.ticks = pygame.time.get_ticks()
if pygame.joystick.get_count() > 0: if pygame.joystick.get_count() > 0:
@ -396,7 +410,7 @@ class Engine:
def main(): def main():
engine = Engine() engine = Engine()
engine.create((800, 600)) engine.create((322, 426))
while engine.update(): while engine.update():
pass pass
engine.destroy() engine.destroy()