From a7fc1ac0e26aae6bdd29d34263d074d46a53b868 Mon Sep 17 00:00:00 2001 From: turtenguin Date: Tue, 5 Dec 2023 23:06:39 -0500 Subject: [PATCH 1/2] Fix goriya flashing and door bugs --- Door/BombableDoor.cs | 2 +- Enemies/Goriya.cs | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Door/BombableDoor.cs b/Door/BombableDoor.cs index a7d12e80..84318f78 100644 --- a/Door/BombableDoor.cs +++ b/Door/BombableDoor.cs @@ -90,7 +90,7 @@ private void HandleCollisionWhenLocked(CollisionInfo collision) private void HandleCollisionWhenUnlocked(CollisionInfo collision) { - if (collision.CollidedWith.Layer != CollisionLayer.Player && GameState.Link.StateMachine.isKnockedBack) return; + if (collision.CollidedWith.Layer != CollisionLayer.Player || GameState.Link.StateMachine.isKnockedBack) return; GameState.Link.StateMachine.prevDirection = GameState.Link.StateMachine.currentDirection; GameState.Link.StateMachine.currentDirection = direction; GameState.Link.EnterRoomTransition(); diff --git a/Enemies/Goriya.cs b/Enemies/Goriya.cs index dbe2490c..7741b59c 100644 --- a/Enemies/Goriya.cs +++ b/Enemies/Goriya.cs @@ -162,8 +162,11 @@ public void OnCollision(List collisions) { EnemyUtilities.HandleWeaponCollision(this, GetType(), collision); CurrentCooldown = EnemyUtilities.DAMAGE_COOLDOWN; // Reset the cooldown timer - Sprites[CurrentSprite].flashing = true; - new Timer(1.0f, StopFlashing); + for(int i = 0; i < Sprites.Count; i++) + { + Sprites[i].flashing = true; + } + new Timer(10.0f, StopFlashing); } } } @@ -180,7 +183,10 @@ public void CompleteStun() } public void StopFlashing() { - Sprites[CurrentSprite].flashing = false; + for (int i = 0; i < Sprites.Count; i++) + { + Sprites[i].flashing = false; + } } public void DropItem() { From 24c56dcd26191853b3e9cd7d2f61f46371bf0329 Mon Sep 17 00:00:00 2001 From: turtenguin Date: Tue, 5 Dec 2023 23:07:23 -0500 Subject: [PATCH 2/2] Update flash time --- Enemies/Goriya.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Enemies/Goriya.cs b/Enemies/Goriya.cs index 7741b59c..a6271596 100644 --- a/Enemies/Goriya.cs +++ b/Enemies/Goriya.cs @@ -166,7 +166,7 @@ public void OnCollision(List collisions) { Sprites[i].flashing = true; } - new Timer(10.0f, StopFlashing); + new Timer(1.0f, StopFlashing); } } }