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

Pig changes

Browse Source
This commit is contained in:
Sam 2017-05-01 13:48:49 +01:00
parent 5138e6ad54
commit ff93ca9705
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java
View File

@ -125,7 +125,7 @@ public class PerkPigBaconBomb extends SmashPerk
player.setExp(Math.max(0f, player.getExp() - energy));
// Velocity
UtilAction.velocity(player, player.getLocation().getDirection(), 0.8, true, 0.9, 0, 1, true);
UtilAction.velocity(player, player.getLocation().getDirection(), 0.8, true, 1.2, 0, 1, true);
// Sound
player.getWorld().playSound(player.getLocation(), Sound.PIG_IDLE, 2f, 0.75f);

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBounce.java
View File

@ -42,6 +42,7 @@ public class PerkPigBaconBounce extends SmashPerk implements IThrown
private float _energyBacon;
private float _energyBaconDisgtuiseFactor;
private float _energyBaconBack;
private int _cooldown;
private int _healthBacon;
private int _damageBacon;
@ -56,6 +57,7 @@ public class PerkPigBaconBounce extends SmashPerk implements IThrown
{
_energyBacon = getPerkFloat("Energy Per Bacon");
_energyBaconDisgtuiseFactor = getPerkFloat("Energy Per Bacon Disguise Factor");
_energyBaconBack = getPerkFloat("Energy Per Bacon Back");
_cooldown = getPerkInt("Cooldown (ms)");
_healthBacon = getPerkInt("Health Per Bacon");
_damageBacon = getPerkInt("Bacon Damage");
@ -119,7 +121,7 @@ public class PerkPigBaconBounce extends SmashPerk implements IThrown
// Launch
Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.PORK, (byte) 0, 1, "Bacon" + System.currentTimeMillis()));
UtilAction.velocity(ent, player.getLocation().getDirection(), 1.2, false, 0, 0.2, 10, false);
Manager.GetProjectile().AddThrow(ent, player, this, -1, true, true, true, false, 0.4f);
Manager.GetProjectile().AddThrow(ent, player, this, -1, true, true, true, false, 1f);
ent.setPickupDelay(9999);
// Sound
@ -191,7 +193,7 @@ public class PerkPigBaconBounce extends SmashPerk implements IThrown
event.getItem().remove();
// Restore Energy
event.getPlayer().setExp(Math.min(0.999f, event.getPlayer().getExp() + 0.05f));
event.getPlayer().setExp(Math.min(0.999f, event.getPlayer().getExp() + _energyBaconBack));
// Sound
event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.EAT, 2f, 1f);