Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
This commit is contained in:
commit
06bdc22c89
|
@ -161,17 +161,9 @@ public abstract class Skill implements ISkill, Listener
|
|||
//Parse Level Token
|
||||
if (token.charAt(0) == '#')
|
||||
{
|
||||
System.out.println("Parsing A: " + line);
|
||||
System.out.println("Token: " + token);
|
||||
|
||||
token = token.substring(1, token.length());
|
||||
String[] numberToks = token.split("\\#");
|
||||
|
||||
for (String cur : numberToks)
|
||||
{
|
||||
System.out.println("Sub-Token: " + cur);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
double base = Double.parseDouble(numberToks[0]);
|
||||
|
@ -184,11 +176,16 @@ public abstract class Skill implements ISkill, Listener
|
|||
plusMinus = '-';
|
||||
|
||||
//Only display what you'd get with level 1
|
||||
if (level == 0)
|
||||
if (level == 0 )
|
||||
{
|
||||
levelValue = base + ((double)1 * bonus);
|
||||
token = C.cYellow + levelValue + C.cGray;
|
||||
}
|
||||
//Maxed
|
||||
else if (level == getMaxLevel())
|
||||
{
|
||||
token = C.cYellow + levelValue + C.cGray;
|
||||
}
|
||||
else
|
||||
{
|
||||
token = C.cYellow + levelValue + C.cGray + " (" + C.cGreen + plusMinus + bonus + C.cGray + ")";
|
||||
|
|
|
@ -133,17 +133,15 @@ public class SkillPage extends ShopPageBase<ClassShopManager, ClassCombatShop>
|
|||
Material material = locked ? Material.EMERALD : (clientClass.GetSavingCustomBuild().hasSkill(skill) ? Material.WRITTEN_BOOK : Material.BOOK);
|
||||
boolean hasSkill = clientClass.GetSavingCustomBuild().hasSkill(skill);
|
||||
int level = hasSkill ? clientClass.GetSavingCustomBuild().getLevel(skill) : 1;
|
||||
String name = (locked ? ChatColor.RED + skill.GetName() + " (Locked)" : skill.GetName() + " Lvl " + level);
|
||||
String name = (locked ? ChatColor.RED + skill.GetName() + " (Locked)" : skill.GetName() + " Level " + level);
|
||||
|
||||
System.out.println(name);
|
||||
|
||||
if (locked)
|
||||
{
|
||||
skillLore.add(C.cYellow + skill.GetCost() + " Gems");
|
||||
skillLore.add(C.cBlack);
|
||||
}
|
||||
|
||||
skillLore.addAll(java.util.Arrays.asList(skill.GetDesc(level)));
|
||||
skillLore.addAll(java.util.Arrays.asList(skill.GetDesc(hasSkill ? level : 0)));
|
||||
|
||||
for (int i = 0; i < skillLore.size(); i++)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue