From 3c931b83ac9f7c86c2b1ff6c9e0a55da287e6b6e Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 6 Feb 2025 13:24:00 -0500 Subject: [PATCH] Updated libstormgames submodule. Rewrite load level on death. This was actually a lot easier than I was making it. --- libstormgames | 2 +- src/player.py | 9 --------- wicked_quest.py | 7 ++++++- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/libstormgames b/libstormgames index 68e72f5..21216f3 160000 --- a/libstormgames +++ b/libstormgames @@ -1 +1 @@ -Subproject commit 68e72f5d81e24223fabf21f4591ab472d8356891 +Subproject commit 21216f361aa0a9e6b74affbc7b5bdf325b31546e diff --git a/src/player.py b/src/player.py index 4f5c21f..b485874 100644 --- a/src/player.py +++ b/src/player.py @@ -152,8 +152,6 @@ class Player: # Stop all current sounds before playing death sound pygame.mixer.stop() cut_scene(self.sounds, 'lose_a_life') - if self._lives > 0: - self.reset_on_death() def set_max_health(self, value): """Set max health""" @@ -167,13 +165,6 @@ class Player: """Get remaining lives""" return self._lives - def reset_on_death(self): - """Reset player state after death""" - self._health = self._maxHealth - self.isJumping = False - self.isRunning = False - self.xPos = 0 - def add_weapon(self, weapon): """Add a new weapon to inventory and equip if first weapon""" self.weapons.append(weapon) diff --git a/wicked_quest.py b/wicked_quest.py index ace5a1e..c6b27b4 100644 --- a/wicked_quest.py +++ b/wicked_quest.py @@ -188,9 +188,14 @@ class WickedQuest: pygame.mixer.stop() self.display_game_over(pygame.time.get_ticks() - startTime) return + else: + pygame.mixer.stop() + self.load_level(currentLevelNum) + self.currentLevel.player._health = self.currentLevel.player._maxHealth # Restore health + continue # Handle collisions and check level completion - if self.currentLevel.handle_collisions(): # Changed from elif to if + if self.currentLevel.handle_collisions(): # Level completed self.display_level_stats(pygame.time.get_ticks() - startTime)