From 75c2a5fd6e304df9a14ca1e5349ecf4f64aab0b6 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 16 Nov 2013 01:55:10 -0800 Subject: [PATCH] Added sound disguises Removed purchasable batgun. --- .../src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java | 2 +- .../game/arcade/game/games/hideseek/forms/BlockForm.java | 2 ++ .../game/arcade/game/games/hideseek/forms/CreatureForm.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java index 5fffd95ec..bc23449c7 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java @@ -44,7 +44,7 @@ public class Halloween2013_BatGun extends ItemGadget C.cWhite + "Launch waves of annoying bats", C.cWhite + "at people you don't like!", }, - 7500, + -1, Material.IRON_BARDING, (byte)0); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java index 27d81fc06..77adbba82 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java @@ -7,6 +7,7 @@ import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; +import mineplex.core.disguise.disguises.DisguiseCat; import mineplex.core.disguise.disguises.DisguiseChicken; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.recharge.Recharge; @@ -60,6 +61,7 @@ public class BlockForm extends Form //Player > Chicken DisguiseChicken disguise = new DisguiseChicken(Player); disguise.setBaby(); + disguise.setSoundDisguise(new DisguiseCat(Player)); Host.Manager.GetDisguise().disguise(disguise); //Apply Falling Block diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java index 3a5427830..388d5240b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java @@ -40,8 +40,9 @@ public class CreatureForm extends Form else if (_type == EntityType.SHEEP) {_disguise = new DisguiseSheep(Player); icon = Material.WOOL;} else if (_type == EntityType.PIG) {_disguise = new DisguisePig(Player); icon = Material.PORK;} + _disguise.setSoundDisguise(new DisguiseCat(Player)); Host.Manager.GetDisguise().disguise(_disguise); - + ((CraftEntity)Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0)); //Inform