From fcd6f419d2252188c84990f2af19a7fb4c6687ea Mon Sep 17 00:00:00 2001 From: Leah Alpert Date: Mon, 29 Aug 2011 18:50:20 -0700 Subject: Changed to gui-based tetris --- tetris.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'tetris.py') diff --git a/tetris.py b/tetris.py index 1d90d8d..6ba750a 100644 --- a/tetris.py +++ b/tetris.py @@ -295,7 +295,8 @@ class TetrisGame(object): p.handle_move(DOWN) def update_gui(self): - [gui.render_game(self.to_dict()) for gui in self.gui] + #[gui.render_game(self.to_dict()) for gui in self.gui] + self.gui[0].render_game(self.to_gui_dict()) def end_game(self): if self.gameState.winner!=None: @@ -398,6 +399,34 @@ class TetrisGame(object): d[coord] = "white" return d + + def to_gui_dict(self): + d = {} + if self.start_time!=None: + d[(2,"level")] = self.gameState.level + d[(2,"time_left")] = self.start_time + TIME_LIMIT - time() + + for n in range(2): + board = self.boards[n] + offset = n*MAXX + + #blocks + for (x,y) in board.landed: + d[(x+offset,y)] = board.landed[(x,y)] + + if self.players[n]!=None: + p = self.players[n] + #score + d[(n,"score")] = p.score + + #shapes + if p.shape: + blocks = p.shape.blocks + for b in blocks: + if b.y >= 0: + d[(b.x+offset*n,b.y)] = b.color + + return d if __name__ == "__main__": -- cgit v1.2.3