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

title + debug

Browse Source
This commit is contained in:
William Burns 2015-12-11 02:41:44 +00:00
parent 563a0f0ec7
commit 1607345f04
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java
View File

@ -82,6 +82,8 @@ public class Gladiators extends SoloGame
private ArenaType _furthestOutCurrent; private ArenaType _furthestOutCurrent;
private boolean _firstRound;
public Gladiators(ArcadeManager manager) public Gladiators(ArcadeManager manager)
{ {
super(manager, GameType.Gladiators, super(manager, GameType.Gladiators,
@ -116,6 +118,7 @@ public class Gladiators extends SoloGame
_playerArenas = new HashMap<>(); _playerArenas = new HashMap<>();
_roundState = RoundState.WAITING; _roundState = RoundState.WAITING;
_firstRound = true;
} }
@EventHandler @EventHandler
@ -516,6 +519,8 @@ public class Gladiators extends SoloGame
a.setState(ArenaState.WAITING); a.setState(ArenaState.WAITING);
} }
UtilTextMiddle.display(C.cGreen + "Gladiators!", C.cGreen + "Defeat your opponent to advance", 20, 60, 20);
return; return;
} }
@ -656,7 +661,7 @@ public class Gladiators extends SoloGame
if (Recharge.Instance.use(p, "Arena Bounce", 500, false, false)) if (Recharge.Instance.use(p, "Arena Bounce", 500, false, false))
{ {
//p.sendMessage("bounce. closest = " + closest.toString() + " player arena = " + _playerArenas.get(p).toString()); //p.sendMessage("bounce. closest = " + closest.toString() + " player arena = " + _playerArenas.get(p).toString());
UtilAction.velocity(p, UtilAlg.getTrajectory2d(e.getTo(), p.getLocation()), 1.7, true, 0.5, 0, 5, true); UtilAction.velocity(p, UtilAlg.getTrajectory2d(e.getTo(), p.getLocation()), 1.7, true, 0.2, 0, 3, true);
} }
return; return;
@ -793,6 +798,10 @@ public class Gladiators extends SoloGame
else if (_roundState.equals(RoundState.STARTING_3)) else if (_roundState.equals(RoundState.STARTING_3))
{ {
_roundState = RoundState.STARTING_2; _roundState = RoundState.STARTING_2;
if (_firstRound)
return;
UtilTextMiddle.display(C.cGreen + "3", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0); UtilTextMiddle.display(C.cGreen + "3", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0);
for (Player p : UtilServer.getPlayers()) for (Player p : UtilServer.getPlayers())
@ -802,6 +811,10 @@ public class Gladiators extends SoloGame
else if (_roundState.equals(RoundState.STARTING_2)) else if (_roundState.equals(RoundState.STARTING_2))
{ {
_roundState = RoundState.STARTING_1; _roundState = RoundState.STARTING_1;
if (_firstRound)
return;
UtilTextMiddle.display(C.cYellow + "2", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0); UtilTextMiddle.display(C.cYellow + "2", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0);
for (Player p : UtilServer.getPlayers()) for (Player p : UtilServer.getPlayers())
@ -811,6 +824,10 @@ public class Gladiators extends SoloGame
else if (_roundState.equals(RoundState.STARTING_1)) else if (_roundState.equals(RoundState.STARTING_1))
{ {
_roundState = RoundState.STARTED; _roundState = RoundState.STARTED;
if (_firstRound)
return;
UtilTextMiddle.display(C.cGold + "1", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0); UtilTextMiddle.display(C.cGold + "1", C.cGreen + C.Bold + getRoundNotation(), 0, 80, 0);
for (Player p : UtilServer.getPlayers()) for (Player p : UtilServer.getPlayers())
@ -821,6 +838,12 @@ public class Gladiators extends SoloGame
{ {
_roundState = RoundState.FIGHTING; _roundState = RoundState.FIGHTING;
if (_firstRound)
{
_firstRound = false;
return;
}
UtilTextMiddle.display(C.cRed + "FIGHT", C.cGreen + C.Bold + getRoundNotation(), 0, 40, 0); UtilTextMiddle.display(C.cRed + "FIGHT", C.cGreen + C.Bold + getRoundNotation(), 0, 40, 0);
for (Player p : UtilServer.getPlayers()) for (Player p : UtilServer.getPlayers())

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/trackers/FlawlessTracker.java
View File

@ -34,6 +34,8 @@ public class FlawlessTracker extends StatTracker<Gladiators>
if (e.isCancelled()) if (e.isCancelled())
return; return;
System.out.println(e.getEventName() + " took damage by " + e.getCause().toString());
if (e.getEntity() instanceof Player) if (e.getEntity() instanceof Player)
{ {
_noWin.add(((Player)e.getEntity()).getName()); _noWin.add(((Player)e.getEntity()).getName());