alex/tetrys
1
Fork 0
Code Releases 1 Activity

Collision detection

Browse Source
This commit is contained in:
Alex Yatskov 2014-05-16 15:44:50 +09:00
parent fe3a4d3c33
commit e20ec6d9ec
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tetris.py
View File

@ -29,7 +29,7 @@ class Tetrad:
def color(self): def color(self):
return self.block_configs[self.config][0] return self.block_configs[self.config][0]
def layout(self): def layout(self):
layout = self.block_configs[self.config][1][self.rotation] layout = self.block_configs[self.config][1][self.rotation]
return map(lambda p: (self.position[0]+p[0], self.position[1]+p[1]), layout) return map(lambda p: (self.position[0]+p[0], self.position[1]+p[1]), layout)
@ -51,7 +51,6 @@ class Tetrad:
return Tetrad(self.config, self.position, (self.rotation + 1) % self.block_rotations) return Tetrad(self.config, self.position, (self.rotation + 1) % self.block_rotations)
# #
# Board # Board
# #
@ -115,6 +114,18 @@ class Board:
return pygame.Rect(top_left, self.block_dims) return pygame.Rect(top_left, self.block_dims)
def can_place_tetrad(self, tetrad):
for point in tetrad.layout():
if point[0] < 0 or point[1] < 0:
return False
if point[0] >= self.grid_dims[0] or point[1] >= self.grid_dims[1]:
return False
if self.blocks[point[0]][point[1]] != 0:
return False
return True
# #
# Game # Game
# #
@ -133,20 +144,25 @@ class Game:
pass pass
def try_tetrad_action(self, tetrad):
if self.board.can_place_tetrad(tetrad):
self.tetrad = tetrad
def move_left(self): def move_left(self):
self.tetrad = self.tetrad.moved_left() self.try_tetrad_action(self.tetrad.moved_left())
def move_right(self): def move_right(self):
self.tetrad = self.tetrad.moved_right() self.try_tetrad_action(self.tetrad.moved_right())
def move_down(self): def move_down(self):
self.tetrad = self.tetrad.moved_down() self.try_tetrad_action(self.tetrad.moved_down())
def rotate(self): def rotate(self):
self.tetrad = self.tetrad.rotated() self.try_tetrad_action(self.tetrad.rotated())
# #
@ -217,22 +233,6 @@ class Engine:
return True return True
def move_right(self):
print 'right'
def move_left(self):
print 'left'
def move_down(self):
print 'down'
def rotate(self):
print 'rotate'
# #
# Entry # Entry
# #