JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-03-29 18:45:53 -04:00
parent d227a6bd06 e1eda749a7
commit 06bdc22c89
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
View File

@ -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 + ")";

6
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java
View File

@ -133,9 +133,7 @@ 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);
System.out.println(name);
String name = (locked ? ChatColor.RED + skill.GetName() + " (Locked)" : skill.GetName() + " Level " + level);
if (locked)
{
@ -143,7 +141,7 @@ public class SkillPage extends ShopPageBase<ClassShopManager, ClassCombatShop>
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++)
{