Notifications fade one-by-one

1 files changed, 17 insertions, 3 deletions

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using TMPro;
 using UnityEngine;
 
@@ -30,19 +31,24 @@ namespace ManifoldGardenArchipelago
 
         void Update()
         {
-            while (_notifications.Count > 0 && _notifications[_notifications.Count - 1].ReadyToBeDestroyed())
+            if (_notifications.Count > 0 && _notifications[_notifications.Count - 1].ReadyToBeDestroyed())
             {
                 NotificationLine toDestroy = _notifications[_notifications.Count - 1];
                 GameObject.Destroy(toDestroy.gameObject);
                 _notifications.RemoveAt(_notifications.Count - 1);
             }
 
+            if (_notifications.Count > 0 && _notifications[_notifications.Count - 1].IsIdling())
+            {
+                _notifications[_notifications.Count - 1].StopIdling();
+            }
+
             if (_queuedMessages.Count > 0)
             {
                 if (_notifications.Count > 0 && !_notifications[0].ReadyToBeSurplanted())
                 {
                     if (!_notifications[0].IsMoving() &&
-                        !(_notifications.Count >= MAX_VISIBLE && !_notifications[_notifications.Count - 1].IsFadingOut()))
+                        _notifications.Count(n => !n.IsFadingOut()) < MAX_VISIBLE)
                     {
                         foreach (var notification in _notifications)
                         {
@@ -98,6 +104,7 @@ namespace ManifoldGardenArchipelago
         private enum FadeState
         {
             FadingIn,
+            Idling,
             Waiting,
             FadingOut,
             ReadyToDestroy,
@@ -146,7 +153,7 @@ namespace ManifoldGardenArchipelago
             {
                 if (_textMeshPro.alpha >= _alphaTarget)
                 {
-                    _fadeState = FadeState.Waiting;
+                    _fadeState = FadeState.Idling;
                 }
             }
             else if (_fadeState == FadeState.Waiting)
@@ -198,6 +205,13 @@ namespace ManifoldGardenArchipelago
             _moveState = MoveState.Waiting;
         }
 
+        public bool IsIdling() => _fadeState == FadeState.Idling;
+
+        public void StopIdling()
+        {
+            _fadeState = FadeState.Waiting;
+        }
+
         public bool IsFadingOut() => _fadeState == FadeState.FadingOut;
 
         public bool ReadyToBeDestroyed() => _fadeState == FadeState.ReadyToDestroy;