fix(all): bugfixes

Author: eastcoastcoder

CollisionManager.py

@@ -65,19 +65,19 @@ def handleBoxHit(self, one: pygame.Rect, two: pygame.Rect, hit: List[int]) -> No
             1,-1  0,-1  -1,-1
         """
         if(one.facing != 'LSTOP' or one.facing != 'RSTOP'):
-            # Right Edge
+            # Right Edge - hit the left side of terrain while moving right
             if(hit[0] == -1):
                 one.x = two.x + two.width
                 one.x += 1
-            # Left Edge
+            # Left Edge - hit the right side of terrain while moving left
             elif(hit[0] == 1):
                 one.x = two.x - one.width
                 one.x -= 1
             # Bottom Edge
             if(hit[1] == -1):
                 one.y = two.y + two.height
                 one.y += 5
-            # Top Edge
+            # Top Edge - landed on terrain from above
             elif(hit[1] == 1):
                 one.y = two.y - one.height
 

EnemyManager.py

@@ -101,7 +101,7 @@ def update_sword(self, player) -> None:
             if player.sword.colliderect(enemy) and player.sword.stab:
                 _get_enemy_death_sound().play()
                 self.enemies.pop(self.enemies.index(enemy))
-            if enemy.sword.colliderect(player) and enemy.stab:
+            if enemy.sword.colliderect(player) and enemy.stab and player.lives != 0:
                 player.die()
 
     def draw(self) -> None:

GameLoop.py

@@ -70,8 +70,9 @@ async def draw(self) -> None:
             controller.get_input(pygame.key.get_pressed(), player, level, player.sword)
 
             if player.lives > 0:
-                player.move(level)
+                # Update jump before collision detection to get correct position
                 player.update_jump()
+                player.move(level)
                 pygame.draw.rect(self.surface, BLUE, player, 0)
                 player.bullet_manager.update_bullets(self.surface)
                 player.bullet_manager.check_hit(enemy_manager)

Player.py

@@ -44,7 +44,7 @@ def __init__(self, surface: pygame.Surface) -> None:
         self.sword = Sword(self)
 
         self.speed = 10
-        self.ammo = 6
+        self.ammo = 20
         self.status = 'GROUND'
         self.facing = 'RSTOP'
         self.current_weapon = 'GUN'
@@ -59,7 +59,7 @@ def move(self, levelloader) -> None:
             levelloader: The level loader instance for collision detection.
         """
         self.hit = levelloader.check_collisions(self, False)
-
+        # Apply horizontal movement
         if self.facing == 'LEFT':
             if self.x > PLAYER_WID:
                 self.x -= PLAYER_SPEED
@@ -75,8 +75,10 @@ def update_jump(self) -> None:
         """Update player jumping physics and state."""
         if self.status == 'RISE' and self.y > PLAYER_JUMP_HT-self.jump_offset:
             self.y -= PLAYER_GRAVITY
-        elif self.status == 'FALL' and self.y < SCREEN_HEIGHT-PLAYER_HT-GROUND_HEIGHT and self.status != 'GROUND':
+        elif self.status == 'FALL' and self.y < SCREEN_HEIGHT-PLAYER_HT-GROUND_HEIGHT:
             self.y += PLAYER_GRAVITY
+        elif self.y >= SCREEN_HEIGHT-PLAYER_HT-GROUND_HEIGHT:
+            self.status = 'GROUND'
         else:
             self.status = 'GROUND'
 

main.py

@@ -37,7 +37,6 @@ async def main() -> None:
         # Pre-load sounds after pygame.init() but before game starts
         preload_sounds()
 
-        # Display "Click to Start" message for browser compatibility
         try:
             font = pygame.font.Font(None, 48)
             small_font = pygame.font.Font(None, 24)
@@ -47,40 +46,7 @@ async def main() -> None:
             font = None
             small_font = None
 
-        print("Waiting for user interaction...")
-        # Wait for user click (required for browser audio/input)
-        waiting = True
-        frame_count = 0
-        while waiting:
-            frame_count += 1
-            if frame_count % 60 == 0:  # Log every 60 frames (~1 second)
-                print(f"Still waiting... frame {frame_count}")
-            
-            win_surf.fill((0, 0, 0))
-            
-            if font and small_font:
-                title = font.render("Pygame Side Scroller", True, (74, 144, 226))
-                prompt = small_font.render("Click anywhere to start", True, (255, 255, 255))
-                win_surf.blit(title, (800//2 - title.get_width()//2, 250))
-                win_surf.blit(prompt, (800//2 - prompt.get_width()//2, 320))
-            else:
-                # Fallback if fonts don't load - draw a white rectangle
-                pygame.draw.rect(win_surf, (255, 255, 255), (300, 250, 200, 100))
-            
-            pygame.display.flip()
-            
-            for event in pygame.event.get():
-                if event.type == pygame.QUIT:
-                    print("Quit event received")
-                    return
-                if event.type == pygame.MOUSEBUTTONDOWN or event.type == pygame.KEYDOWN:
-                    print(f"User interaction detected: {event.type}")
-                    waiting = False
-            
-            await asyncio.sleep(0)  # Yield to browser
-        
         print("Starting game loop...")
-        # Now start the actual game
         game_loop = GameLoop(win_surf)
         await game_loop.draw()