From 21f859f57907cf73d734e6503236a29e8574b23f Mon Sep 17 00:00:00 2001 From: Sarah Date: Thu, 26 Nov 2015 16:26:49 +0100 Subject: [PATCH] fixing 2 seconds delay. --- .../game/arcade/gametutorial/GameTutorial.java | 9 +++++---- .../game/arcade/gametutorial/TutorialPhase.java | 14 +++++++++++--- 2 files changed, 16 insertions(+), 7 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 a4f0e170a..5f425ba55 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 @@ -53,13 +53,14 @@ public abstract class GameTutorial { @Override public void run() - { - nextPhase(); + { + nextPhase(true); } }, 40); + _currentPhase.teleport(); } - protected void nextPhase() + protected void nextPhase(boolean phaseOne) { _currentPhase = getNextPhase(); if(_currentPhase == null) @@ -73,7 +74,7 @@ public abstract class GameTutorial { Manager.GetChat().Silence(7000, false); onPhaseChange(_currentPhase); - _currentPhase.start(); + _currentPhase.start(phaseOne); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java index 65c4f4e4b..ed16a0e20 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java @@ -25,16 +25,24 @@ public abstract class TutorialPhase _text = text; } - final public void start() + final public void start(boolean phaseOne) { _hasEnded = false; onStart(); + if(!phaseOne) + { + teleport(); + } + displayText(); + } + + final public void teleport() + { if(_location != null && _target != null) { prepareLocations(); updatePlayers(); } - displayText(); } private void prepareLocations() @@ -99,7 +107,7 @@ public abstract class TutorialPhase { _hasEnded = true; onEnd(); - _tutorial.nextPhase(); + _tutorial.nextPhase(false); } }); break;