JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators

This commit is contained in:
William Burns 2015-12-10 20:56:03 +00:00
parent 2951088005 0bd276c16a
commit 624e8bbe89
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
View File

@ -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);

25
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialText.java
View File

@ -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;
}
}

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
View File

@ -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)