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 b140b79bc..222028622 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 @@ -136,7 +136,7 @@ public abstract class TutorialPhase i++; } displayMessage(text); - UtilTextMiddle.display("", text.getText(), 0, text.getStayTime(), 0, players); + UtilTextMiddle.display((text.getBigText() == null ? "" : text.getBigText()), text.getText(), 0, text.getStayTime(), 0, players); try { Thread.sleep(text.getStayTime() * 50); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialText.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialText.java index dba1d39a6..cc438d484 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialText.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialText.java @@ -7,6 +7,7 @@ public class TutorialText { private String _text; + private String _bigText; private int _stayTime; private int _id; private Sound _sound; @@ -33,6 +34,24 @@ public class TutorialText { this(text, stayTime, id, Sound.NOTE_PLING); } + + public TutorialText(String text, String bigText, int id) + { + this(text, (int) (Math.round(1.5 * text.length()) + 25), id, Sound.NOTE_PLING); + _bigText = bigText; + } + + public TutorialText(String text, String bigText, int id, Sound sound) + { + this(text, (int) (Math.round(1.5 * text.length()) + 25), id, sound); + _bigText = bigText; + } + + public TutorialText(String text, String bigText, int stayTime, int id) + { + this(text, stayTime, id, Sound.NOTE_PLING); + _bigText = bigText; + } public String getText() { @@ -58,5 +77,9 @@ public class TutorialText { _text = text; } - + + public String getBigText() + { + return _bigText; + } } 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 3c710d4f8..c4e3f1374 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 @@ -237,13 +237,13 @@ public class GameManager implements Listener if(!team.getTutorial().hasEnded()) { finished = false; - } - if(checkForTimer) - { - if(team.getTutorial().ShowPrepareTimer) - finished = false; - else - finished = true; + if(checkForTimer) + { + if(team.getTutorial().ShowPrepareTimer) + finished = false; + else + finished = true; + } } } if(prepTime <= timeUsage)