Fixed stuff

Assets/Scripts/GameManager.cs

@@ -499,7 +499,7 @@ namespace Marro.PacManUdon
         // I'm not redoing this unless I get instantiatable classes before I wrap up this project.
 
         bool currentlyInTimeSequence;
-        bool waitingForTimeSequencefinish;
+        bool waitingForTimeSequenceFinish;
         PacManTimeSequence currentTimeSequence;
         bool hasTimeSequenceQueued;
         private DataList timeSequenceQueue;
@@ -600,11 +600,15 @@ namespace Marro.PacManUdon
         {
             if (Networking.IsOwner(gameObject))
             {
-                TimeSequenceExecuteFinish();
+                TimeSequenceExecuteFinalize();
+                if (!hasTimeSequenceQueued)
+                {
+                    TimeSequenceExecuteFinished();
+                }
             }
             else
             {
-                waitingForTimeSequencefinish = true;
+                waitingForTimeSequenceFinish = true;
             }
         }
 
@@ -657,12 +661,58 @@ namespace Marro.PacManUdon
                     break;
                 case PacManTimeSequence.AttractScreenWaitToRestart:
                 case PacManTimeSequence.WaitForStartTimeout:
-                    // These only have a finished state
+                    // These don't have steps
                     break;
             }
         }
 
-        private void TimeSequenceExecuteFinish()
+        private void TimeSequenceExecuteFinalize()
+        {
+            // Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}");
+            switch (currentTimeSequence)
+            {
+                default:
+                    Debug.LogError($"{gameObject} No time sequence finalize known for sequence {currentTimeSequence}");
+                    break;
+                case PacManTimeSequence.AttractScreenIntroduction:
+                    TimeSequenceFinalizeAttractScreenIntroduction();
+                    break;
+                case PacManTimeSequence.WaitForStart:
+                    TimeSequenceFinalizeWaitForStart();
+                    break;
+                case PacManTimeSequence.WaitForStartTimeout:
+                    TimeSequenceFinalizeWaitForStart();
+                    break;
+                case PacManTimeSequence.StartNewGame:
+                    TimeSequenceFinalizeStartNewGame();
+                    break;
+                case PacManTimeSequence.StartNewLevel:
+                    TimeSequenceFinalizeStartNewLevel();
+                    break;
+                case PacManTimeSequence.GhostCaught:
+                    TimeSequenceFinalizeGhostCaught();
+                    break;
+                case PacManTimeSequence.RestartLevel:
+                    TimeSequenceFinalizeRestartLevel();
+                    break;
+                case PacManTimeSequence.Intermission2:
+                    TimeSequenceFinalizeIntermission2();
+                    break;
+                case PacManTimeSequence.Intermission3:
+                    TimeSequenceFinalizeIntermission3();
+                    break;
+                case PacManTimeSequence.AttractScreenDemo:
+                case PacManTimeSequence.AttractScreenWaitToRestart:
+                case PacManTimeSequence.GameOver:
+                case PacManTimeSequence.Intermission1:
+                case PacManTimeSequence.PacManCaught:
+                case PacManTimeSequence.BoardClear:
+                    // These don't have a finalize
+                    break;
+            }
+        }
+
+        private void TimeSequenceExecuteFinished()
         {
             // Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}");
             switch (currentTimeSequence)
@@ -679,30 +729,12 @@ namespace Marro.PacManUdon
                 case PacManTimeSequence.AttractScreenWaitToRestart:
                     TimeSequenceFinishedAttractScreenWaitToRestart();
                     break;
-                case PacManTimeSequence.WaitForStart:
-                    TimeSequenceFinishedWaitForStart();
-                    break;
-                case PacManTimeSequence.WaitForStartTimeout:
-                    TimeSequenceFinishedWaitForStart();
-                    break;
-                case PacManTimeSequence.StartNewGame:
-                    TimeSequenceFinishedStartNewGame();
-                    break;
                 case PacManTimeSequence.BoardClear:
                     TimeSequenceFinishedBoardClear();
                     break;
-                case PacManTimeSequence.StartNewLevel:
-                    TimeSequenceFinishedStartNewLevel();
-                    break;
-                case PacManTimeSequence.GhostCaught:
-                    TimeSequenceFinishedGhostCaught();
-                    break;
                 case PacManTimeSequence.PacManCaught:
                     TimeSequenceFinishedPacManCaught();
                     break;
-                case PacManTimeSequence.RestartLevel:
-                    TimeSequenceFinishedRestartLevel();
-                    break;
                 case PacManTimeSequence.GameOver:
                     TimeSequenceFinishedGameOver();
                     break;
@@ -715,6 +747,14 @@ namespace Marro.PacManUdon
                 case PacManTimeSequence.Intermission3:
                     TimeSequenceFinishedIntermission3();
                     break;
+                case PacManTimeSequence.RestartLevel:
+                case PacManTimeSequence.StartNewLevel:
+                case PacManTimeSequence.GhostCaught:
+                case PacManTimeSequence.WaitForStart:
+                case PacManTimeSequence.WaitForStartTimeout:
+                case PacManTimeSequence.StartNewGame:
+                    // These don't have a finished
+                    break;
             }
         }
 

Assets/Scripts/Sequences/AttractScreenIntroduction.cs

@@ -169,10 +169,13 @@ namespace Marro.PacManUdon
             }
         }
 
+        private void TimeSequenceFinalizeAttractScreenIntroduction()
+        {
+            attractScreen.gameObject.SetActive(false);
+        }
+
         private void TimeSequenceFinishedAttractScreenIntroduction()
         {
-            // Hide elements, start demo
-            attractScreen.gameObject.SetActive(false);
             StartTimeSequence(PacManTimeSequence.AttractScreenDemo);
         }
     }

Assets/Scripts/Sequences/GhostCaught.cs

@@ -13,12 +13,11 @@ namespace Marro.PacManUdon
                     soundManager.PlayGhostEatSound();
                     break;
                 case 1:
-                    
                     break;
             }
         }
 
-        private void TimeSequenceFinishedGhostCaught()
+        private void TimeSequenceFinalizeGhostCaught()
         {
             // Unfreeze and reveal pacman
             SetPacManActive(true);

Assets/Scripts/Sequences/Intermission2.cs

@@ -79,15 +79,18 @@ namespace Marro.PacManUdon
                 case 11:
                     // End cutscene
                     SetFrozen(true);
-                    
                     break;
             }
         }
 
-        private void TimeSequenceFinishedIntermission2()
+        private void TimeSequenceFinalizeIntermission2()
         {
             SetIntermissionScreenVisible(false);
             soundManager.StopAllSound();
+        }
+
+        private void TimeSequenceFinishedIntermission2()
+        {
             StartTimeSequence(PacManTimeSequence.StartNewLevel);
         }
     }

Assets/Scripts/Sequences/Intermission3.cs

@@ -61,6 +61,12 @@ namespace Marro.PacManUdon
             }
         }
 
+        private void TimeSequenceFinalizeIntermission3()
+        {
+            soundManager.StopAllSound();
+            StartTimeSequence(PacManTimeSequence.StartNewLevel);
+        }
+
         private void TimeSequenceFinishedIntermission3()
         {
             soundManager.StopAllSound();

Assets/Scripts/Sequences/RestartLevel.cs

@@ -36,7 +36,7 @@ namespace Marro.PacManUdon
             }
         }
 
-        private void TimeSequenceFinishedRestartLevel()
+        private void TimeSequenceFinalizeRestartLevel()
         {
             // Unfreeze
             SetFrozen(false);

Assets/Scripts/Sequences/StartNewGame.cs

@@ -65,7 +65,7 @@ namespace Marro.PacManUdon
             }
         }
 
-        private void TimeSequenceFinishedStartNewGame()
+        private void TimeSequenceFinalizeStartNewGame()
         {
             // Start game, end sequence
             soundManager.StartGhostSound();

Assets/Scripts/Sequences/StartNewLevel.cs

@@ -35,7 +35,7 @@ namespace Marro.PacManUdon
             }
         }
 
-        private void TimeSequenceFinishedStartNewLevel()
+        private void TimeSequenceFinalizeStartNewLevel()
         {
             // Unfreeze
             SetFrozen(false);

Assets/Scripts/Sequences/WaitForStart.cs

@@ -18,7 +18,7 @@ namespace Marro.PacManUdon
             }
         }
 
-        private void TimeSequenceFinishedWaitForStart()
+        private void TimeSequenceFinalizeWaitForStart()
         {
             if (playerInput.active == false)
             {