Merge pull request #491 from CSE3902-Group-3/Fix-goriya-flashing-bug

Fix goriya flashing and door bugs
CSE3902-Group-3 · Dec 6, 2023 · 094f02a · 094f02a
2 parents 01a6215 + 24c56dc
commit 094f02a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -162,7 +162,10 @@ public void OnCollision(List<CollisionInfo> collisions)
                     {
                         EnemyUtilities.HandleWeaponCollision(this, GetType(), collision);
                         CurrentCooldown = EnemyUtilities.DAMAGE_COOLDOWN; // Reset the cooldown timer
-                        Sprites[CurrentSprite].flashing = true;
+                        for(int i = 0; i < Sprites.Count; i++)
+                        {
+                            Sprites[i].flashing = true;
+                        }
                         new Timer(1.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()
         {