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

This commit is contained in:
Jonathan Williams 2013-10-12 01:55:52 -07:00
parent 42b932e612 c8386bbc40
commit 03c74aa419
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
View File

@ -63,7 +63,7 @@ public class ParkourManager extends MiniPlugin
"You will need to find the correct way through",
"the ruins, overcoming many challenging jumps.",
},
4000, new Location(Manager.GetSpawn().getWorld(), 115,70,-10), 50));
4000, new Location(Manager.GetSpawn().getWorld(), 115,70,-10), 60));
_parkour.add(new ParkourData("Lava Parkour", new String[]
@ -71,7 +71,7 @@ public class ParkourManager extends MiniPlugin
"This parkour is HOT! It's so hot that you",
"must keep sprinting for the entire course,",
"or you will die in flames!"
}, 1000, new Location(Manager.GetSpawn().getWorld(), -100,60,0), 50));
}, 1000, new Location(Manager.GetSpawn().getWorld(), -100,60,0), 60));
_lavaParkourReturn = new Location(Manager.GetSpawn().getWorld(), -89.5,68,36.5);
_lavaParkourReturn.setYaw(90);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWolf.java
View File

@ -30,7 +30,7 @@ public class KitWolf extends SmashKit
new Perk[]
{
new PerkSmashStats(4, 1.6, 0.3, 4.5),
new PerkSmashStats(5, 1.6, 0.3, 4.5),
new PerkDoubleJump("Wolf Jump", 1.0, 1.0, true),
new PerkWolf(),
},

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java
View File

@ -198,7 +198,7 @@ public class Snake extends SoloGame
{
int start = 0;
if (other.equals(player))
start = 2;
start = 4;
for (int i=start ; i < _tail.get(other).size() ; i++)
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitInvulnerable.java
View File

@ -17,7 +17,7 @@ public class KitInvulnerable extends Kit
{
public KitInvulnerable(ArcadeManager manager)
{
super(manager, "Super Snake", KitAvailability.Free,
super(manager, "Super Snake", KitAvailability.Blue,
new String[]
{

18
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolf.java
View File

@ -82,7 +82,7 @@ public class PerkWolf extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, "Cub Tackle", 5000, true))
if (!Recharge.Instance.use(player, "Cub Tackle", 8000, true))
return;
//Get Nearest Wolf
@ -152,10 +152,7 @@ public class PerkWolf extends Perk
_tackle.put(wolf, damagee);
wolf.setVelocity(new Vector(0,-0.6,0));
damagee.setVelocity(new Vector(0,-0.6,0));
//Teleport
wolf.teleport(damagee.getLocation().add(0,0.5,0));
damagee.setVelocity(new Vector(0,0,0));
//Damage
Manager.GetDamage().NewDamageEvent(damagee, damager, null,
@ -191,15 +188,18 @@ public class PerkWolf extends Perk
}
if (UtilMath.offset(wolf, ent) < 2.5)
{
Manager.GetCondition().Factory().Slow("Cub Table", ent, wolf, 0.9, 1, false, false, false, false);
ent.setVelocity(new Vector(0,-0.3,0));
}
//Move
Location loc = ent.getLocation();
loc.add(UtilAlg.getTrajectory2d(ent, wolf).multiply(1));
EntityCreature ec = ((CraftCreature)wolf).getHandle();
Navigation nav = ec.getNavigation();
nav.a(loc.getX(), loc.getY(), loc.getZ(), 1.5);
nav.a(loc.getX(), loc.getY(), loc.getZ(), 1);
}
}
@ -255,7 +255,7 @@ public class PerkWolf extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, "Wolf Strike", 4000, true))
if (!Recharge.Instance.use(player, "Wolf Strike", 8000, true))
return;
//Velocity
@ -384,7 +384,7 @@ public class PerkWolf extends Perk
}
int count = _repeat.get(damager).size();
Manager.GetGame().Announce("Repeat: " + count);
if (count > 0)
{
event.AddMod(damager.getName(), "Ravage", count, false);