From 7680eaaedcd1fa25808e7b5e1465990bcc8bf46b Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 22 Apr 2014 11:20:00 -0700 Subject: [PATCH] Fixed non-Ultra being able to unlock spells/skills. Fixed Items that weren't free. --- .../minecraft/game/classcombat/Class/ClientClass.java | 2 -- .../Class/repository/token/CustomBuildToken.java | 3 --- .../minecraft/game/classcombat/item/Consume/Soup.java | 2 ++ .../mineplex/minecraft/game/classcombat/item/Item.java | 5 +++++ .../minecraft/game/classcombat/item/ItemFactory.java | 9 +++++++-- .../game/classcombat/item/Throwable/WaterBottle.java | 2 ++ .../minecraft/game/classcombat/item/Throwable/Web.java | 2 ++ .../game/classcombat/item/weapon/StandardAxe.java | 2 ++ .../game/classcombat/item/weapon/StandardBow.java | 2 ++ .../game/classcombat/item/weapon/StandardSword.java | 2 ++ .../classcombat/shop/salespackage/ItemSalesPackage.java | 2 +- .../classcombat/shop/salespackage/SkillSalesPackage.java | 2 +- 12 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java index 6746c195a..7629e7cc2 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java @@ -222,8 +222,6 @@ public class ClientClass public void EquipCustomBuild(CustomBuildToken customBuild, boolean notify) { - System.out.println("Equipped custombuild " + customBuild.CustomBuildId); - _lastClass = _classFactory.GetClass(customBuild.PvpClass); if (_lastClass == null) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java index 85cf6e7b0..29f4b1c22 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java @@ -355,8 +355,5 @@ public class CustomBuildToken token.Name = null; ItemTokens += item.getTokenCost(); - - System.out.println("Removed slot " + index); - token.printInfo(); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Consume/Soup.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Consume/Soup.java index 29473ecc5..8ae5341e3 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Consume/Soup.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Consume/Soup.java @@ -28,6 +28,8 @@ public class Soup extends ItemUsable useAction, useStock, useDelay, useEnergy, throwAction, throwStock, throwDelay, throwEnergy, throwPower, throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup); + + setFree(true); } @Override diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Item.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Item.java index 220f9cca7..2ba766a11 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Item.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Item.java @@ -82,6 +82,11 @@ public class Item implements IItem, Listener return _free; } + public void setFree(boolean free) + { + _free = free; + } + public int getTokenCost() { return _tokenCost; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java index cddbcd881..18eab90f8 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java @@ -161,8 +161,13 @@ public class ItemFactory extends MiniPlugin implements IItemFactory private void AddOther() { - AddItem(new Item(this, "Assassin Arrows", new String[] { "Arrows for your bow." }, Material.ARROW, 12, true, 0, 1)); - AddItem(new Item(this, "Ranger Arrows", new String[] { "Arrows for your bow." }, Material.ARROW, 24, true, 0, 1)); + Item assassinArrows = new Item(this, "Assassin Arrows", new String[] { "Arrows for your bow." }, Material.ARROW, 12, true, 0, 1); + Item rangerArrows = new Item(this, "Ranger Arrows", new String[] { "Arrows for your bow." }, Material.ARROW, 24, true, 0, 1); + assassinArrows.setFree(true); + rangerArrows.setFree(true); + + AddItem(assassinArrows); + AddItem(rangerArrows); } public IItem GetItem(String weaponName) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/WaterBottle.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/WaterBottle.java index d49efa22f..fe99e4f3a 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/WaterBottle.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/WaterBottle.java @@ -36,6 +36,8 @@ public class WaterBottle extends ItemUsable useAction, useStock, useDelay, useEnergy, throwAction, throwStock, throwDelay, throwEnergy, throwPower, throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup); + + setFree(true); } @Override diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java index fddcd6b14..c8540af14 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java @@ -28,6 +28,8 @@ public class Web extends ItemUsable useAction, useStock, useDelay, useEnergy, throwAction, throwStock, throwDelay, throwEnergy, throwPower, throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup); + + setFree(true); } @Override diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardAxe.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardAxe.java index bc1db61e1..e2a5eb413 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardAxe.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardAxe.java @@ -10,5 +10,7 @@ public class StandardAxe extends Item public StandardAxe(ItemFactory factory, int gemCost, int tokenCost) { super(factory, "Standard Axe", new String[] { "Pretty standard." }, Material.IRON_AXE, 1, true, gemCost, tokenCost); + + setFree(true); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardBow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardBow.java index db5c9ef16..53cb3b855 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardBow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardBow.java @@ -10,5 +10,7 @@ public class StandardBow extends Item public StandardBow(ItemFactory factory, int gemCost, int tokenCost) { super(factory, "Standard Bow", new String[] { "Pretty standard." }, Material.BOW, 1, true, gemCost, tokenCost); + + setFree(true); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardSword.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardSword.java index d84b296c0..dc3f642ec 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardSword.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/weapon/StandardSword.java @@ -10,5 +10,7 @@ public class StandardSword extends Item public StandardSword(ItemFactory factory, int gemCost, int tokenCost) { super(factory, "Standard Sword", new String[] { "Pretty standard." }, Material.IRON_SWORD, 1, true, gemCost, tokenCost); + + setFree(true); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java index c8ee6c1e4..d8f7a13d7 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java @@ -11,7 +11,7 @@ public class ItemSalesPackage extends SalesPackageBase { public ItemSalesPackage(Item item) { - super(item.GetName(), Material.BOOK, item.GetDesc()); + super("Champions " + item.GetName(), Material.BOOK, item.GetDesc()); Free = item.isFree(); KnownPackage = false; } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java index eb3df9e2b..faa75c909 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java @@ -11,7 +11,7 @@ public class SkillSalesPackage extends SalesPackageBase { public SkillSalesPackage(ISkill skill) { - super(skill.GetName(), Material.BOOK, skill.GetDesc(0)); + super("Champions " + skill.GetName(), Material.BOOK, skill.GetDesc(0)); Free = skill.IsFree(); KnownPackage = false; }