fixing "enemy's" and some merge isssues.

This commit is contained in:
Sarah 2015-11-25 16:03:13 +01:00
parent fac7d152ae
commit de9262882a
2 changed files with 15 additions and 2 deletions

View File

@ -22,7 +22,7 @@ public class TutorialPhaseTypeWars extends TutorialPhase
new TutorialText("Fishi_", 7, 8),
new TutorialText("Fishin_", 7, 9),
new TutorialText("Fishing_", 7, 10),
new TutorialText("Kill your enemies giant before they kill yours.", 11),
new TutorialText("Kill your enemy's giant before they kill yours.", 11),
new TutorialText("Good luck!", 12)
});
}

View File

@ -114,7 +114,8 @@ public abstract class TutorialPhase
i++;
}
displayMessage(text);
UtilTextMiddle.display("", text.getText(), 0, text.getStayTime(), 0, players); try
UtilTextMiddle.display("", text.getText(), 0, text.getStayTime(), 0, players);
try
{
Thread.sleep(text.getStayTime() * 50);
} catch (InterruptedException e)
@ -128,6 +129,18 @@ public abstract class TutorialPhase
}).start();
}
private void displayMessage(final TutorialText text)
{
getTutorial().Manager.runSync(new Runnable()
{
@Override
public void run()
{
onMessageDisplay(text);
}
});
}
protected TutorialText getNextMessage()
{
for(TutorialText text : _text)