From 59225c1c79597cfae11a247fbb7ae0ea268af1f2 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 6 Feb 2025 03:40:29 -0500 Subject: [PATCH] Grave edge sounds and player hit sounds do not play if you are not vulnerable to them. --- src/enemy.py | 1 + src/level.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/enemy.py b/src/enemy.py index d69689f..d421617 100644 --- a/src/enemy.py +++ b/src/enemy.py @@ -144,6 +144,7 @@ class Enemy(Object): def attack(self, currentTime, player): """Perform attack on player""" + if player.isInvincible: return self.lastAttackTime = currentTime # Play attack sound attackSound = f"{self.enemyType}_attack" diff --git a/src/level.py b/src/level.py index 2e766b2..ed61c28 100644 --- a/src/level.py +++ b/src/level.py @@ -238,7 +238,7 @@ class Level: # Handle grave edge warnings if obj.isHazard: distance = abs(self.player.xPos - obj.xPos) - if distance <= 2 and not self.player.isJumping: + if distance <= 2 and not self.player.isJumping and not self.player.isInvincible: if self.edge_warning_channel is None or not self.edge_warning_channel.get_busy(): self.edge_warning_channel = play_sound(self.sounds['edge']) else: