From 19254fc4a02a5947038e458933676a57d595df45 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Thu, 3 Dec 2015 18:06:27 +0100
Subject: [PATCH] Prepare Timer flag.

---
 .../game/arcade/gametutorial/GameTutorial.java      |  1 +
 .../nautilus/game/arcade/managers/GameManager.java  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java
index 151cbf02f..2583a1f65 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java
@@ -33,6 +33,7 @@ public abstract class GameTutorial
 	public boolean TeleportOnEnd = true;
 	public boolean RunTasksSync = true;
 	public boolean PlayTutorialSounds = false;
+	public boolean ShowPrepareTimer = false;
 	
 	public long TimeBetweenPhase = 0;
 	public long StartAfterTutorial = 5000;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
index 43759a930..9c60cc850 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
@@ -122,7 +122,7 @@ public class GameManager implements Listener
 		}
 	}
 	
-	public boolean isInTutorial()
+	public boolean isInTutorial(boolean checkForTimer)
 	{
 		if (Manager.GetGame() == null || Manager.GetGame().GetState() != GameState.Prepare)
 			return false;
@@ -160,6 +160,13 @@ public class GameManager implements Listener
 					{
 						finished = false;
 					}
+					if(checkForTimer)
+					{
+						if(team.getTutorial().ShowPrepareTimer)
+							finished = false;
+						else
+							finished = true;
+					}
 				}
 			}
 			if(!finished)
@@ -179,7 +186,7 @@ public class GameManager implements Listener
 
 		Game game = Manager.GetGame();
 		
-		if(isInTutorial())
+		if(isInTutorial(true))
 			return;
 
 		double percentage = (double) (System.currentTimeMillis() - game.GetStateTime()) / game.PrepareTime;
@@ -264,7 +271,7 @@ public class GameManager implements Listener
 		}
 		else if (game.GetState() == GameState.Prepare)
 		{
-			if(isInTutorial())
+			if(isInTutorial(false))
 				return;
 			
 			if (game.CanStartPrepareCountdown())