From ff93ca9705554e161ee90b5fa54c86ec7c82a075 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 1 May 2017 13:48:49 +0100 Subject: [PATCH] Pig changes --- .../arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java | 2 +- .../game/games/smash/perks/pig/PerkPigBaconBounce.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java index d66e708c4..2160c60a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java @@ -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); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBounce.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBounce.java index 3fb5bd136..ff0a0b82f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBounce.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBounce.java @@ -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);