crayonix/tetri5
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add soft drop and exit on full well

Browse Source
This commit is contained in:
Giovani Rodriguez
2021-06-10 18:25:54 -04:00
parent 15851cb269
commit 8952753fc3
4 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Tetris.py
View File

@@ -41,6 +41,8 @@ class Tetris:
pygame.display.set_caption(win_title)
pygame.display.set_icon(loaded_icon)
self.is_pressing_down = False # TODO move into control util later
main_music_file = ConfigurationManager.configuration["sound"]["main-music"]
self.main_music.set_volume(0.7) # TODO add volume to the config
self.main_music.play(mixer.Sound(main_music_file), -1)
@@ -54,6 +56,9 @@ class Tetris:
self.current_piece.update(elapsed_time, self)
else:
self.current_piece = PieceGenerator.get_piece((360, 100)) # TODO calculate spawn position
if self.stack and self.current_piece.collide(self.stack):
pygame.quit()
sys.exit()
if self.stack:
self.stack.update(elapsed_time)
@@ -84,11 +89,21 @@ class Tetris:
if self.stack and self.current_piece.collide(self.stack):
self.current_piece.revert()
if event.key == pygame.K_DOWN:
self.current_piece.move((0, self.tile_size))
if self.well and self.current_piece.collide(self.well):
self.current_piece.revert()
if self.stack and self.current_piece.collide(self.stack):
self.current_piece.revert()
self.is_pressing_down = True
if self.current_piece:
self.current_piece.gravity_time = ConfigurationManager.configuration["engine"]["piece-gravity-time"] / 8
self.current_piece.set_time = ConfigurationManager.configuration["engine"]["piece-gravity-time"] / 8
if event.type == pygame.KEYUP:
if event.key == pygame.K_DOWN:
self.is_pressing_down = False
if self.current_piece:
self.current_piece.gravity_time = ConfigurationManager.configuration["engine"]["piece-gravity-time"]
self.current_piece.set_time = ConfigurationManager.configuration["engine"]["piece-set-time"]
if self.is_pressing_down:
if self.current_piece:
self.current_piece.gravity_time = ConfigurationManager.configuration["engine"]["piece-gravity-time"] / 8
self.current_piece.set_time = ConfigurationManager.configuration["engine"]["piece-set-time"] / 8
def draw(self) -> None: