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

Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars

Browse Source 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
This commit is contained in:
Sarah 2015-12-10 12:24:11 +01:00
commit 0f8028f6e6
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
View File

@ -152,7 +152,7 @@ public enum AchievementCategory
Material.ROTTEN_FLESH, 0, GameCategory.ARCADE, "SoonTM"),
TYPE_WARS("Type Wars", null,
new StatDisplay[] {StatDisplay.WINS, StatDisplay.GAMES_PLAYED, new StatDisplay("Minons killed", "MinionKills"), new StatDisplay("Words Per Minute", false, true, "MinionKills", "TimeInGame"), StatDisplay.GEMS_EARNED},
new StatDisplay[] {StatDisplay.WINS, StatDisplay.GAMES_PLAYED, new StatDisplay("Minions killed", "MinionKills"), new StatDisplay("Words Per Minute", false, true, "MinionKills", "TimeInGame"), StatDisplay.GEMS_EARNED},
Material.FEATHER, 0, GameCategory.ARCADE, null);
private String _name;
@ -282,7 +282,7 @@ public enum AchievementCategory
// Special display for Words per Minute
if (displayName.equalsIgnoreCase("Words Per Minute"))
{
statString = C.cWhite + (double) statNumber * 60000;
statString = C.cWhite + (double) statNumber;
if(statString.length() > 7)
statString = statString.substring(0, 7);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java
View File

@ -115,7 +115,7 @@ public class Minion
"Elegant", "Violate", "Heroic", "Violent", "Leaves", "Soccer", "Europe", "School", "Scarves", "Orange",
"Dentist", "Neglect", "Strong", "Solvent", "Monkey", "Closet", "Africa", "Hotels", "Sharks", "Yellow",
"Combine", "Fulfill", "Barbie", "Engrave", "Rabbit", "Carpet", "Winter", "Zipper", "Whales", "Purple",
"Surface", "Sailing", "Pencil", "Passage", "Kitten", "Saturn", "Spring", "Acorns", "Comets", "Graffe",
"Surface", "Sailing", "Pencil", "Passage", "Kitten", "Saturn", "Spring", "Acorns", "Comets",
"Gelatin", "Klarin", "Phones", "Quality", "Ingots", "Uranus", "Summer", "Pariot", "Comedy", "Poison",
"Similar", "Flutter", "Shield", "Psychic", "Spider", "Mexico", "Autumn", "Cruise", "Sports", "Forest",
"Oxidize", "Disease", "Guitar", "Opossum", "Ghasts", "France", "Ghosts", "Lucius", "Cement", "Desert",

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
View File

@ -206,8 +206,8 @@ public class TypeWars extends TeamGame
public void prepareGiants()
{
Location red = WorldData.GetDataLocs("PURPLE").get(0).clone();
Location blue = WorldData.GetDataLocs("LIME").get(0).clone();
Location blue = WorldData.GetDataLocs("PURPLE").get(0).clone();
Location red = WorldData.GetDataLocs("LIME").get(0).clone();
red.setYaw(UtilAlg.GetYaw(UtilAlg.getTrajectory(red, blue)));
blue.setYaw(UtilAlg.GetYaw(UtilAlg.getTrajectory(blue, red)));

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/stats/TimeInGameTracker.java
View File

@ -24,7 +24,7 @@ public class TimeInGameTracker extends StatTracker<Game>
for(Player player : getGame().GetPlayers(true))
{
addStat(player, "TimeInGame", (int) (System.currentTimeMillis() - getGame().getGameLiveTime()), false, false);
addStat(player, "TimeInGame", (int) (((System.currentTimeMillis() - getGame().getGameLiveTime())/1000)/60), false, false);
}
}

21
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java
View File

@ -111,12 +111,19 @@ public abstract class GameTutorial
{
for(final Player player : _players.keySet())
{
VisibilityManager.Instance.setVisibility(player, true, UtilServer.getPlayers());
//VisibilityManager.Instance.setVisibility(player, true, UtilServer.getPlayers());
Manager.runSyncLater(new Runnable()
{
@Override
public void run()
{
for(Player player : Manager.GetGame().GetPlayers(true))
{
for(Player other : Manager.GetGame().GetPlayers(true))
{
player.showPlayer(other);
}
}
player.setAllowFlight(false);
player.setFlying(false);
}
@ -163,7 +170,7 @@ public abstract class GameTutorial
_players.put(player, Manager.GetGame().GetTeam(player).GetSpawns().get(i));
player.setAllowFlight(true);
player.setFlying(true);
VisibilityManager.Instance.setVisibility(player, false, UtilServer.getPlayers());
// VisibilityManager.Instance.setVisibility(player, false, UtilServer.getPlayers());
i++;
}
}
@ -209,6 +216,16 @@ public abstract class GameTutorial
public int tick()
{
if(!_hasEnded && hasStarted())
{
for(Player player : UtilServer.getPlayers())
{
for(Player other : _players.keySet())
{
player.hidePlayer(other);
}
}
}
_tick++;
return _tick;
}

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

@ -170,7 +170,7 @@ public class GameManager implements Listener
finished = false;
if(checkForTimer)
{
if(!team.getTutorial().ShowPrepareTimer)
if(team.getTutorial().ShowPrepareTimer)
finished = false;
else
finished = true;