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

Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2013-10-28 08:53:36 -05:00
commit 7279f58b92
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobZombie.java
View File

@ -73,11 +73,13 @@ public class MobZombie extends CreatureBase<Zombie> implements InterfaceMove
public void Speed() public void Speed()
{ {
if (GetEntity().getTicksLived() > 3600) if (GetEntity().getTicksLived() > 2400)
Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 3, false, false, false);
else if (GetEntity().getTicksLived() > 1800)
Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 2, false, false, false); Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 2, false, false, false);
else if (GetEntity().getTicksLived() > 2400)
Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 1, false, false, false);
else if (GetEntity().getTicksLived() > 1200) else if (GetEntity().getTicksLived() > 1200)
Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 1, false, false, false);
else if (GetEntity().getTicksLived() > 600)
Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 0, false, false, false); Host.Manager.GetCondition().Factory().Speed("Speed", GetEntity(), GetEntity(), 10, 0, false, false, false);
} }
} }

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/kits/KitRobinHood.java
View File

@ -91,7 +91,7 @@ public class KitRobinHood extends SmashKit
@EventHandler @EventHandler
public void Aura(UpdateEvent event) public void Aura(UpdateEvent event)
{ {
if (event.getType() != UpdateType.FAST) if (event.getType() != UpdateType.SLOW)
return; return;
for (Player player : Manager.GetGame().GetPlayers(true)) for (Player player : Manager.GetGame().GetPlayers(true))
@ -107,7 +107,7 @@ public class KitRobinHood extends SmashKit
if (UtilMath.offset(player, other) > 8) if (UtilMath.offset(player, other) > 8)
continue; continue;
Manager.GetCondition().Factory().Regen("Aura", other, player, 1.9, 0, false, false, false); Manager.GetCondition().Factory().Regen("Aura", other, player, 4.9, 0, false, false, false);
} }
} }
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/Wave2.java
View File

@ -10,7 +10,7 @@ public class Wave2 extends WaveBase
{ {
public Wave2(Halloween host) public Wave2(Halloween host)
{ {
super(host, "A GIANT!? Better kill that guy fast!", 60000, host.GetSpawnSet(0)); super(host, "A GIANT!? Better kill that guy fast!", 65000, host.GetSpawnSet(0));
} }
@Override @Override

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/Wave3.java
View File

@ -9,7 +9,7 @@ public class Wave3 extends WaveBase
{ {
public Wave3(Halloween host) public Wave3(Halloween host)
{ {
super(host, "Spiders Spiders Spiders!", 60000, host.GetSpawnSet(2)); super(host, "Spiders Spiders Spiders!", 70000, host.GetSpawnSet(2));
} }
@Override @Override

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/waves/WaveBoss.java
View File

@ -25,7 +25,7 @@ public class WaveBoss extends WaveBase
} }
//Increasing difficulty of mobs //Increasing difficulty of mobs
if (Host.GetCreatures().size() < 40 + (tick/200) && !_king.IsFinal()) if (Host.GetCreatures().size() < 20 + (tick/200) && !_king.IsFinal())
{ {
if (tick % Math.max(5, 15 - tick/400) == 0) if (tick % Math.max(5, 15 - tick/400) == 0)
if (Math.random() > 0.10) if (Math.random() > 0.10)
@ -34,8 +34,8 @@ public class WaveBoss extends WaveBase
Host.AddCreature(new MobCreeper(Host, Host.GetRandomSpawn())); Host.AddCreature(new MobCreeper(Host, Host.GetRandomSpawn()));
} }
//Giant every 1.5 minutes //Giant every 2.5 minutes
if (tick % 1800 == 0 && !_king.IsFinal()) if (tick % 3000 == 0 && !_king.IsFinal())
{ {
Host.AddCreature(new MobGiant(Host, GetSpawn())); Host.AddCreature(new MobGiant(Host, GetSpawn()));
} }