PrepareForCutscene

Assets/Scripts/GameManager.cs

@@ -192,6 +192,13 @@ namespace Marro.PacManUdon
             pelletManager.SetPowerPelletsBlink(false);
         }
 
+        private void PrepareForCutscene()
+        {
+            HideEverything();
+            RestartLevel();
+            SetFrozen(true);
+        }
+
         public void GotPellet(bool addScore = true)
         {
             pelletCountRemaining--;

Assets/Scripts/Sequences/AttractScreenDemo.cs

@@ -9,9 +9,9 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+
                     SetGameState(PacManGameState.AttractModeDemo);
-                    HideEverything();
-                    SetFrozen(true);
                     break;
                 case 1:
                     InitializeLevel();
@@ -19,9 +19,7 @@ namespace Marro.PacManUdon
                     SetLevel(1);
                     break;
                 case 2:
-                    // Reset ghosts
+                    // Setup ghosts
-                    RestartLevel();
-
                     ghostManager.Ghosts[0].SetPredefinedPath(new Vector2[]{ // Blinky
                         Vector2.down,
                         Vector2.left,

Assets/Scripts/Sequences/AttractScreenIntroduction.cs

@@ -9,13 +9,12 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+                    
                     SetGameState(PacManGameState.AttractMode);
                     
                     // Initialize
                     soundManager.SuppressSound(true);
-                    RestartLevel();
-                    HideEverything();
-                    SetFrozen(true);
                     attractScreen.gameObject.SetActive(true);
                     attractScreen.Initialize();
                     for (int i = 0; i <= 15; i++)

Assets/Scripts/Sequences/Intermission1.cs

@@ -11,8 +11,9 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+                    
                     // Show just level display
-                    RestartLevel();
                     statusDisplay.SetLevelDisplayVisible(true);
                     break;
                 case 1:
@@ -20,7 +21,6 @@ namespace Marro.PacManUdon
                     soundManager.SuppressSound(false);
                     soundManager.StartIntermissionSound();
 
-                    pacMan.Reset();
                     pacMan.SetLevel(4);
                     pacMan.SetPowerPellet(false); // Update speed
                     pacMan.SetKinematic(true);
@@ -28,7 +28,6 @@ namespace Marro.PacManUdon
                     pacMan.SetPosition(intermissionScreenElements[0].transform.localPosition);
                     pacMan.SetDirection(Vector2.left);
 
-                    ghostManager.Reset();
                     ghostManager.SetLevel(5);
                     ghostManager.SetKinematic(true);
                     ghostManager.gameObject.SetActive(true);

Assets/Scripts/Sequences/Intermission2.cs

@@ -11,8 +11,9 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+                    
                     // Show just level display
-                    RestartLevel();
                     statusDisplay.SetLevelDisplayVisible(true);
                     break;
                 case 1:
@@ -27,7 +28,6 @@ namespace Marro.PacManUdon
                     break;
                 case 3:
                     // Start animation, pacman running and blinky prepared to chase
-                    pacMan.Reset();
                     pacMan.SetLevel(4);
                     pacMan.SetPowerPellet(false); // Update speed
                     pacMan.SetKinematic(true);
@@ -35,7 +35,6 @@ namespace Marro.PacManUdon
                     pacMan.SetPosition(intermissionScreenElements[0].transform.localPosition);
                     pacMan.SetDirection(Vector2.left);
 
-                    ghostManager.Reset();
                     ghostManager.SetLevel(5);
                     ghostManager.SetKinematic(true);
                     ghostManager.gameObject.SetActive(true);

Assets/Scripts/Sequences/Intermission3.cs

@@ -11,8 +11,9 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+                    
                     // Show just level display
-                    RestartLevel();
                     statusDisplay.SetLevelDisplayVisible(true);
                     break;
                 case 1:
@@ -20,7 +21,6 @@ namespace Marro.PacManUdon
                     soundManager.SuppressSound(false);
                     soundManager.StartIntermissionSound();
 
-                    pacMan.Reset();
                     pacMan.SetLevel(4);
                     pacMan.SetPowerPellet(false); // Update speed
                     pacMan.SetKinematic(true);
@@ -28,7 +28,6 @@ namespace Marro.PacManUdon
                     pacMan.SetPosition(intermissionScreenElements[0].transform.localPosition);
                     pacMan.SetDirection(Vector2.left);
 
-                    ghostManager.Reset();
                     ghostManager.SetLevel(5);
                     ghostManager.SetKinematic(true);
                     ghostManager.gameObject.SetActive(true);

Assets/Scripts/Sequences/StartNewGame.cs

@@ -12,12 +12,10 @@ namespace Marro.PacManUdon
                     // Prepare new game, hide everything except score bar
                     gameState = PacManGameState.InGame;
 
-                    HideEverything();
-
                     InitializeNewGame();
                     InitializeLevel();
-                    RestartLevel();
+                    PrepareForCutscene();
-                    SetFrozen(true);
+                    
                     soundManager.SuppressSound(false);
                     soundManager.PlayGameStartSound();
                     break;

Assets/Scripts/Sequences/StartNewLevel.cs

@@ -7,9 +7,10 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+                    
                     // Reset, show maze and score display
                     InitializeLevel();
-                    RestartLevel();
                     SetMazeVisible(true);
                     statusDisplay.SetScoreDisplayVisible(true);
                     break;

Assets/Scripts/Sequences/WaitForStart.cs

@@ -7,8 +7,9 @@ namespace Marro.PacManUdon
             switch (sequenceProgress)
             {
                 case 0:
+                    PrepareForCutscene();
+                    
                     SetGameState(PacManGameState.WaitForStart);
-                    HideEverything();
                     soundManager.SuppressSound(false);
                     soundManager.PlayCoinSound();
                     break;