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

BH Updates

Browse Source
This commit is contained in:
Chiss 2013-11-16 13:15:16 +11:00
parent 29ce493f64
commit 2e6758e23c
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java
View File

@ -304,7 +304,7 @@ public class HideSeek extends TeamGame
return; return;
} }
if (!Recharge.Instance.use(player, "Change Form", 2000, true)) if (!Recharge.Instance.use(player, "Change Form", 6000, true))
return; return;
if (!(GetKit(player) instanceof KitHiderSwapper)) if (!(GetKit(player) instanceof KitHiderSwapper))
@ -334,7 +334,7 @@ public class HideSeek extends TeamGame
return; return;
} }
if (!Recharge.Instance.use(player, "Change Form", 2000, true)) if (!Recharge.Instance.use(player, "Change Form", 6000, true))
return; return;
if (!(GetKit(player) instanceof KitHiderSwapper)) if (!(GetKit(player) instanceof KitHiderSwapper))
@ -347,6 +347,34 @@ public class HideSeek extends TeamGame
_forms.put(player, new CreatureForm(this, player, event.getRightClicked().getType())); _forms.put(player, new CreatureForm(this, player, event.getRightClicked().getType()));
} }
@EventHandler
public void ChangeDisguise(CustomDamageEvent event)
{
Player player = event.GetDamagerPlayer(false);
if (player == null) return;
if (!UtilGear.isMat(player.getItemInHand(), Material.SLIME_BALL))
return;
if (!_allowedEnts.contains(event.GetDamageeEntity().getType()))
{
UtilPlayer.message(player, F.main("Game", "You cannot morph into " + F.elem(UtilEnt.getName(event.GetDamageeEntity())) + "."));
return;
}
if (!Recharge.Instance.use(player, "Change Form", 6000, true))
return;
if (!(GetKit(player) instanceof KitHiderSwapper))
UtilInv.remove(player, Material.SLIME_BALL, (byte)0, 1);
//Remove Old
_forms.get(player).Remove();
//Set New
_forms.put(player, new CreatureForm(this, player, event.GetDamageeEntity().getType()));
}
@EventHandler @EventHandler
public void FallingBlockBreak(ItemSpawnEvent event) public void FallingBlockBreak(ItemSpawnEvent event)
{ {
@ -506,10 +534,10 @@ public class HideSeek extends TeamGame
for (Creature ent : _mobs.keySet()) for (Creature ent : _mobs.keySet())
{ {
if (UtilMath.offset(ent.getLocation(), _mobs.get(ent)) < 8) if (UtilMath.offset(ent.getLocation(), _mobs.get(ent)) < 5)
continue; continue;
Location loc = _mobs.get(ent).add(UtilAlg.getTrajectory(_mobs.get(ent), ent.getLocation()).multiply(Math.random() * 6)); Location loc = _mobs.get(ent).add(UtilAlg.getTrajectory(_mobs.get(ent), ent.getLocation()).multiply(Math.random() * 3));
EntityCreature ec = ((CraftCreature)ent).getHandle(); EntityCreature ec = ((CraftCreature)ent).getHandle();
Navigation nav = ec.getNavigation(); Navigation nav = ec.getNavigation();

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -696,9 +696,12 @@ public class GameFlagManager implements Listener
} }
else else
{ {
UtilPlayer.message(player, C.cRed + C.Bold + "WARNING: " + C.cWhite + C.Bold +"RETURN TO PLAYABLE AREA!"); UtilPlayer.message(player, C.cRed + C.Bold + "WARNING: " + C.cWhite + C.Bold + "RETURN TO PLAYABLE AREA!");
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0.4, 0, 10, true); if (player.getLocation().getY() > game.WorldData.MaxY)
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0, 0, 10, true);
else
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0.4, 0, 10, true);
Manager.GetDamage().NewDamageEvent(player, null, null, Manager.GetDamage().NewDamageEvent(player, null, null,
DamageCause.VOID, 4, false, false, false, DamageCause.VOID, 4, false, false, false,