Fixed non-Ultra being able to unlock spells/skills.
Fixed Items that weren't free.
This commit is contained in:
parent
2378df6191
commit
7680eaaedc
@ -222,8 +222,6 @@ public class ClientClass
|
|||||||
|
|
||||||
public void EquipCustomBuild(CustomBuildToken customBuild, boolean notify)
|
public void EquipCustomBuild(CustomBuildToken customBuild, boolean notify)
|
||||||
{
|
{
|
||||||
System.out.println("Equipped custombuild " + customBuild.CustomBuildId);
|
|
||||||
|
|
||||||
_lastClass = _classFactory.GetClass(customBuild.PvpClass);
|
_lastClass = _classFactory.GetClass(customBuild.PvpClass);
|
||||||
|
|
||||||
if (_lastClass == null)
|
if (_lastClass == null)
|
||||||
|
@ -355,8 +355,5 @@ public class CustomBuildToken
|
|||||||
token.Name = null;
|
token.Name = null;
|
||||||
|
|
||||||
ItemTokens += item.getTokenCost();
|
ItemTokens += item.getTokenCost();
|
||||||
|
|
||||||
System.out.println("Removed slot " + index);
|
|
||||||
token.printInfo();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,8 @@ public class Soup extends ItemUsable
|
|||||||
useAction, useStock, useDelay, useEnergy, throwAction, throwStock,
|
useAction, useStock, useDelay, useEnergy, throwAction, throwStock,
|
||||||
throwDelay, throwEnergy, throwPower,
|
throwDelay, throwEnergy, throwPower,
|
||||||
throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup);
|
throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup);
|
||||||
|
|
||||||
|
setFree(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -82,6 +82,11 @@ public class Item implements IItem, Listener
|
|||||||
return _free;
|
return _free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFree(boolean free)
|
||||||
|
{
|
||||||
|
_free = free;
|
||||||
|
}
|
||||||
|
|
||||||
public int getTokenCost()
|
public int getTokenCost()
|
||||||
{
|
{
|
||||||
return _tokenCost;
|
return _tokenCost;
|
||||||
|
@ -161,8 +161,13 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
|
|||||||
|
|
||||||
private void AddOther()
|
private void AddOther()
|
||||||
{
|
{
|
||||||
AddItem(new Item(this, "Assassin Arrows", new String[] { "Arrows for your bow." }, Material.ARROW, 12, true, 0, 1));
|
Item assassinArrows = 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 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)
|
public IItem GetItem(String weaponName)
|
||||||
|
@ -36,6 +36,8 @@ public class WaterBottle extends ItemUsable
|
|||||||
useAction, useStock, useDelay, useEnergy, throwAction, throwStock,
|
useAction, useStock, useDelay, useEnergy, throwAction, throwStock,
|
||||||
throwDelay, throwEnergy, throwPower,
|
throwDelay, throwEnergy, throwPower,
|
||||||
throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup);
|
throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup);
|
||||||
|
|
||||||
|
setFree(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -28,6 +28,8 @@ public class Web extends ItemUsable
|
|||||||
useAction, useStock, useDelay, useEnergy, throwAction, throwStock,
|
useAction, useStock, useDelay, useEnergy, throwAction, throwStock,
|
||||||
throwDelay, throwEnergy, throwPower,
|
throwDelay, throwEnergy, throwPower,
|
||||||
throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup);
|
throwExpire, throwPlayer, throwBlock, throwIdle, throwPickup);
|
||||||
|
|
||||||
|
setFree(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -10,5 +10,7 @@ public class StandardAxe extends Item
|
|||||||
public StandardAxe(ItemFactory factory, int gemCost, int tokenCost)
|
public StandardAxe(ItemFactory factory, int gemCost, int tokenCost)
|
||||||
{
|
{
|
||||||
super(factory, "Standard Axe", new String[] { "Pretty standard." }, Material.IRON_AXE, 1, true, gemCost, tokenCost);
|
super(factory, "Standard Axe", new String[] { "Pretty standard." }, Material.IRON_AXE, 1, true, gemCost, tokenCost);
|
||||||
|
|
||||||
|
setFree(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,5 +10,7 @@ public class StandardBow extends Item
|
|||||||
public StandardBow(ItemFactory factory, int gemCost, int tokenCost)
|
public StandardBow(ItemFactory factory, int gemCost, int tokenCost)
|
||||||
{
|
{
|
||||||
super(factory, "Standard Bow", new String[] { "Pretty standard." }, Material.BOW, 1, true, gemCost, tokenCost);
|
super(factory, "Standard Bow", new String[] { "Pretty standard." }, Material.BOW, 1, true, gemCost, tokenCost);
|
||||||
|
|
||||||
|
setFree(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,5 +10,7 @@ public class StandardSword extends Item
|
|||||||
public StandardSword(ItemFactory factory, int gemCost, int tokenCost)
|
public StandardSword(ItemFactory factory, int gemCost, int tokenCost)
|
||||||
{
|
{
|
||||||
super(factory, "Standard Sword", new String[] { "Pretty standard." }, Material.IRON_SWORD, 1, true, gemCost, tokenCost);
|
super(factory, "Standard Sword", new String[] { "Pretty standard." }, Material.IRON_SWORD, 1, true, gemCost, tokenCost);
|
||||||
|
|
||||||
|
setFree(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ public class ItemSalesPackage extends SalesPackageBase
|
|||||||
{
|
{
|
||||||
public ItemSalesPackage(Item item)
|
public ItemSalesPackage(Item item)
|
||||||
{
|
{
|
||||||
super(item.GetName(), Material.BOOK, item.GetDesc());
|
super("Champions " + item.GetName(), Material.BOOK, item.GetDesc());
|
||||||
Free = item.isFree();
|
Free = item.isFree();
|
||||||
KnownPackage = false;
|
KnownPackage = false;
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ public class SkillSalesPackage extends SalesPackageBase
|
|||||||
{
|
{
|
||||||
public SkillSalesPackage(ISkill skill)
|
public SkillSalesPackage(ISkill skill)
|
||||||
{
|
{
|
||||||
super(skill.GetName(), Material.BOOK, skill.GetDesc(0));
|
super("Champions " + skill.GetName(), Material.BOOK, skill.GetDesc(0));
|
||||||
Free = skill.IsFree();
|
Free = skill.IsFree();
|
||||||
KnownPackage = false;
|
KnownPackage = false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user