From 77b6f0250eb3d8c344904edfd678a4005d459f1c Mon Sep 17 00:00:00 2001 From: CoderTim Date: Wed, 30 Jul 2014 23:56:40 -0400 Subject: [PATCH] Play zombie_unfect sound when PerkRevealer explodes PerkSmokeBomb also applies effects to NPCs PerkSmokeBomb now uses HUGE_EXPLOSION effect Set Sneaky Assassins PrepareFreeze flag to false --- .../games/sneakyassassins/SneakyAssassins.java | 1 + .../game/arcade/kit/perks/PerkRevealer.java | 2 ++ .../game/arcade/kit/perks/PerkSmokebomb.java | 16 +++++++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java index f8be8dbad..c68f5fa41 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java @@ -53,6 +53,7 @@ public class SneakyAssassins extends SoloGame this.DamageTeamSelf = true; this.HungerSet = 20; + this.PrepareFreeze = false; } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRevealer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRevealer.java index 4d6c903b4..4bb9fb629 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRevealer.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRevealer.java @@ -116,6 +116,8 @@ public class PerkRevealer extends Perk implements IThrown UtilFirework.playFirework(data.GetThrown().getLocation(), effect); + data.GetThrown().getLocation().getWorld().playSound(data.GetThrown().getLocation(), Sound.ZOMBIE_UNFECT, 2f, 0.5f); + for (Player player : Manager.GetGame().GetPlayers(true)) { if (player == data.GetThrower()) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSmokebomb.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSmokebomb.java index 094fdd7b8..fa906a767 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSmokebomb.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSmokebomb.java @@ -1,7 +1,7 @@ package nautilus.game.arcade.kit.perks; import org.bukkit.*; -import org.bukkit.entity.Player; +import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.PlayerDeathEvent; @@ -53,7 +53,7 @@ public class PerkSmokebomb extends Perk return activatorTypes; } - public int geteffectDuration() + public int getEffectDuration() { return effectDuration; } @@ -94,18 +94,20 @@ public class PerkSmokebomb extends Perk //Manager.GetCondition().Factory().Vulnerable(GetName(), player, player, 6, 3, false, false, true); //Blind - for (Player other : UtilPlayer.getNearby(player.getLocation(), 6)) + for (Entity other : player.getNearbyEntities(6, 6, 6)) { - if (other.equals(player)) + if (other.equals(player) || !(other instanceof LivingEntity)) continue; + + LivingEntity living = (LivingEntity) other; - Manager.GetCondition().Factory().Blind(GetName(), other, player, geteffectDuration(), 0, false, false, true); - Manager.GetCondition().Factory().Slow(GetName(), other, player, geteffectDuration(), 1, false, false, true, false); + Manager.GetCondition().Factory().Blind(GetName(), living, player, getEffectDuration(), 0, false, false, true); + Manager.GetCondition().Factory().Slow(GetName(), living, player, getEffectDuration(), 1, false, false, true, false); } //Effects player.getWorld().playSound(player.getLocation(), Sound.FIZZ, 2f, 0.5f); - UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, player.getLocation(), 0f, 0f, 0f, 0, 1); + UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, player.getLocation(), 0f, 0f, 0f, 0, 1); //Inform UtilPlayer.message(player, F.main("Skill", "You used " + F.skill(GetName()) + "."));