From c2ec238af5434514e6b1084e9ac7a60e0f4f88ba Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 3 Sep 2013 12:13:15 -0700 Subject: [PATCH] Fixed kit purchase in SuperSmashMobs --- .../game/standalone/smash/kits/KitBlaze.java | 3 ++- .../game/standalone/smash/kits/KitChicken.java | 3 ++- .../game/standalone/smash/kits/KitEnderman.java | 3 ++- .../game/standalone/smash/kits/KitGolem.java | 3 ++- .../game/standalone/smash/kits/KitKnight.java | 3 ++- .../game/standalone/smash/kits/KitSkySquid.java | 3 ++- .../game/standalone/smash/kits/KitSlime.java | 3 ++- .../game/standalone/smash/kits/KitSnowman.java | 3 ++- .../game/standalone/smash/kits/KitSpider.java | 3 ++- .../src/nautilus/game/arcade/kit/Kit.java | 16 +++++++++++++++- .../src/nautilus/game/arcade/kit/SmashKit.java | 8 ++++++++ .../nautilus/game/arcade/shop/KitPackage.java | 5 +++-- 12 files changed, 44 insertions(+), 12 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java index 0764f64e3..dfba6bca1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java @@ -41,7 +41,8 @@ public class KitBlaze extends SmashKit new PerkFirefly() }, EntityType.BLAZE, - null); + null, + Material.BLAZE_ROD); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java index a595c4cf2..00fe74f8a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java @@ -35,7 +35,8 @@ public class KitChicken extends SmashKit }, EntityType.CHICKEN, - null); + null, + Material.EGG); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java index d5ed05510..51a52124f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java @@ -42,7 +42,8 @@ public class KitEnderman extends SmashKit new PerkBlockToss() }, EntityType.ENDERMAN, - null); + null, + Material.ENDER_PEARL); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java index fd5bfc20a..1078bc2eb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java @@ -33,7 +33,8 @@ public class KitGolem extends SmashKit }, EntityType.IRON_GOLEM, - null); + null, + Material.IRON_BLOCK); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java index b04fdc043..73bf1f258 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java @@ -31,7 +31,8 @@ public class KitKnight extends SmashKit new PerkDoubleJump("Double Jump", 0.9, 0.9, false), }, EntityType.HORSE, - null); + null, + Material.IRON_CHESTPLATE); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java index 0a2148362..87fcfc9ca 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java @@ -34,7 +34,8 @@ public class KitSkySquid extends SmashKit new PerkInkBlast(), }, EntityType.SQUID, - null); + null, + Material.INK_SACK); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java index cecab4e7d..ac52a1424 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java @@ -34,7 +34,8 @@ public class KitSlime extends SmashKit new PerkSlimeRocket(), }, EntityType.SLIME, - null); + null, + Material.SLIME_BALL); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java index aa2fba5b8..032d61b00 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java @@ -38,7 +38,8 @@ public class KitSnowman extends SmashKit new PerkIcePath(), }, EntityType.SNOWMAN, - null); + null, + Material.SNOW_BALL); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java index 406dde884..e927c3767 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java @@ -34,7 +34,8 @@ public class KitSpider extends SmashKit new PerkWebShot(), }, EntityType.SPIDER, - null); + null, + Material.STRING); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java index 884e498a0..9577595ec 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java @@ -9,6 +9,7 @@ import nautilus.game.arcade.ArcadeManager; import org.bukkit.ChatColor; import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; @@ -31,7 +32,9 @@ public abstract class Kit implements Listener protected EntityType _entityType; protected ItemStack _itemInHand; - public Kit(ArcadeManager manager, String name, KitAvailability kitAvailability, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand) + protected Material _displayItem; + + public Kit(ArcadeManager manager, String name, KitAvailability kitAvailability, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand, Material displayItem) { Manager = manager; @@ -46,6 +49,12 @@ public abstract class Kit implements Listener _entityType = entityType; _itemInHand = itemInHand; + _displayItem = displayItem; + } + + public Kit(ArcadeManager manager, String name, KitAvailability kitAvailability, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand) + { + this(manager, name, kitAvailability, kitDesc, kitPerks, entityType, itemInHand, itemInHand.getType()); } public String GetFormattedName() @@ -163,4 +172,9 @@ public abstract class Kit implements Listener { return 2000; } + + public Material getDisplayMaterial() + { + return _displayItem; + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java index 15d66c355..f36057093 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java @@ -5,6 +5,7 @@ import mineplex.core.common.util.UtilPlayer; import nautilus.game.arcade.ArcadeFormat; import nautilus.game.arcade.ArcadeManager; +import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -18,6 +19,13 @@ public abstract class SmashKit extends Kit { super(manager, name, kitAvailability, kitDesc, kitPerks, entityType, itemInHand); } + + public SmashKit(ArcadeManager manager, String name, + KitAvailability kitAvailability, String[] kitDesc, Perk[] kitPerks, + EntityType entityType, ItemStack itemInHand, Material displayItem) + { + super(manager, name, kitAvailability, kitDesc, kitPerks, entityType, itemInHand, displayItem); + } public void DisplayDesc(Player player) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java index af3095431..8abe36072 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java @@ -1,5 +1,6 @@ package nautilus.game.arcade.shop; +import org.bukkit.Material; import org.bukkit.entity.Player; import nautilus.game.arcade.kit.Kit; @@ -10,9 +11,9 @@ public class KitPackage extends SalesPackageBase { public KitPackage(String gameName, Kit kit) { - super(gameName + " " + kit.GetName(), kit.GetItemInHand().getType(), kit.GetDesc()); + super(gameName + " " + kit.GetName(), kit.getDisplayMaterial(), kit.GetDesc()); KnownPackage = false; - CurrencyCostMap.put(CurrencyType.Gems, 2000); + CurrencyCostMap.put(CurrencyType.Gems, kit.GetCost()); } @Override