CodingPirates/PyGame-Tetris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mowing toward numpy for grid and bricks. /JL

Browse Source
This commit is contained in:
Jan Lerking
2025-05-10 14:59:00 +02:00
parent 93e433fc1b
commit a349da2a58
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dropzone.py
View File

@@ -21,7 +21,7 @@ class DropZone():
for row_idx, row in enumerate(brick.shape): for row_idx, row in enumerate(brick.shape):
for col_idx, cell in enumerate(row): for col_idx, cell in enumerate(row):
if cell: if cell:
globals.dropgrid[brick.y + row_idx][brick.x + col_idx] = 1 globals.grid[brick.y + row_idx][brick.x + col_idx] = 1
self.dropzone.blit(brick.brick, (brick.y + row_idx, brick.x + col_idx)) self.dropzone.blit(brick.brick, (brick.y + row_idx, brick.x + col_idx))

2
requirements.txt
View File

@@ -1,3 +1,3 @@
numpy==2.2.5 numpy==2.2.5
pygame==2.6.1 pygame==2.6.1
pygamecontrols==0.2.2 pygamecontrols==0.2.5

6
tetris.py
View File

@@ -100,7 +100,7 @@ class Tetris:
case pygame.QUIT: case pygame.QUIT:
self.running = False self.running = False
case pygame.KEYDOWN: case pygame.KEYDOWN:
new_pos = pos[:] #new_pos = pos[:]
match event.key: match event.key:
case pygame.K_RIGHT: case pygame.K_RIGHT:
if self.current.direction == enums.BrickDirection.Dropped: if self.current.direction == enums.BrickDirection.Dropped:
@@ -193,7 +193,7 @@ class Tetris:
if not self.current.update(): if not self.current.update():
self.dropzone.lock(self.current) self.dropzone.lock(self.current)
self.current = self.next self.current = self.next
self.next = Brick(brick = randrange(0, len(BRICKS))) self.next = Brick(brick = random.choice(list(BRICKS.keys())))
# Handle hotplugging # Handle hotplugging
case pygame.JOYDEVICEADDED: case pygame.JOYDEVICEADDED:
@@ -217,9 +217,11 @@ class Tetris:
if "left button" in self.joysticks[self.joy.get_instance_id()].controllers[0].mapping: if "left button" in self.joysticks[self.joy.get_instance_id()].controllers[0].mapping:
self.left_button = self.joysticks[self.joy.get_instance_id()].controllers[0].mapping["left button"] self.left_button = self.joysticks[self.joy.get_instance_id()].controllers[0].mapping["left button"]
else: self.left_button = None
if "right button" in self.joysticks[self.joy.get_instance_id()].controllers[0].mapping: if "right button" in self.joysticks[self.joy.get_instance_id()].controllers[0].mapping:
self.right_button = self.joysticks[self.joy.get_instance_id()].controllers[0].mapping["right button"] self.right_button = self.joysticks[self.joy.get_instance_id()].controllers[0].mapping["right button"]
else: self.right_button = None
case pygame.JOYDEVICEREMOVED: case pygame.JOYDEVICEREMOVED:
del self.joysticks[event.instance_id] del self.joysticks[event.instance_id]