xpglobes: don't break at virt level 126
This commit is contained in:
@@ -32,7 +32,7 @@ public class Experience
|
||||
/**
|
||||
* Maximum level under 200m xp
|
||||
*/
|
||||
private static final int MAX_VIRT_LEVEL = 126;
|
||||
public static final int MAX_VIRT_LEVEL = 126;
|
||||
|
||||
private static final int[] XP_FOR_LEVEL = new int[MAX_VIRT_LEVEL];
|
||||
|
||||
|
||||
@@ -229,7 +229,6 @@ public class XpGlobesOverlay extends Overlay
|
||||
|
||||
DecimalFormat decimalFormat = new DecimalFormat("###,###,###");
|
||||
String skillCurrentXp = decimalFormat.format(mouseOverSkill.getCurrentXp());
|
||||
String skillXpToLvl = decimalFormat.format(mouseOverSkill.getGoalXp() - mouseOverSkill.getCurrentXp());
|
||||
|
||||
PanelComponent xpTooltip = new PanelComponent();
|
||||
xpTooltip.setPosition(new java.awt.Point(x, y));
|
||||
@@ -237,15 +236,20 @@ public class XpGlobesOverlay extends Overlay
|
||||
List<PanelComponent.Line> lines = xpTooltip.getLines();
|
||||
lines.add(new PanelComponent.Line(skillName, Color.WHITE, skillLevel, Color.WHITE));
|
||||
lines.add(new PanelComponent.Line("Current xp:", Color.ORANGE, skillCurrentXp, Color.WHITE));
|
||||
lines.add(new PanelComponent.Line("Xp to level: ", Color.ORANGE, skillXpToLvl, Color.WHITE));
|
||||
if (mouseOverSkill.getGoalXp() != -1)
|
||||
{
|
||||
String skillXpToLvl = decimalFormat.format(mouseOverSkill.getGoalXp() - mouseOverSkill.getCurrentXp());
|
||||
lines.add(new PanelComponent.Line("Xp to level: ", Color.ORANGE, skillXpToLvl, Color.WHITE));
|
||||
|
||||
//Create progress bar for skill.
|
||||
ProgressBarComponent progressBar = new ProgressBarComponent();
|
||||
double progress = mouseOverSkill.getSkillProgress(Experience.getXpForLevel(mouseOverSkill.getCurrentLevel()),
|
||||
//Create progress bar for skill.
|
||||
ProgressBarComponent progressBar = new ProgressBarComponent();
|
||||
double progress = mouseOverSkill.getSkillProgress(Experience.getXpForLevel(mouseOverSkill.getCurrentLevel()),
|
||||
mouseOverSkill.getCurrentXp(), mouseOverSkill.getGoalXp());
|
||||
progressBar.setProgress(progress);
|
||||
progressBar.setProgress(progress);
|
||||
|
||||
xpTooltip.setProgressBar(progressBar);
|
||||
}
|
||||
|
||||
xpTooltip.setProgressBar(progressBar);
|
||||
xpTooltip.render(graphics, parent);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,12 +100,8 @@ public class XpGlobesPlugin extends Plugin
|
||||
return;
|
||||
}
|
||||
|
||||
int startingXp = 0;
|
||||
if (currentLevel > 1)
|
||||
{
|
||||
startingXp = Experience.getXpForLevel(currentLevel);
|
||||
}
|
||||
int goalXp = Experience.getXpForLevel(currentLevel + 1);
|
||||
int startingXp = Experience.getXpForLevel(currentLevel);
|
||||
int goalXp = currentLevel + 1 <= Experience.MAX_VIRT_LEVEL ? Experience.getXpForLevel(currentLevel + 1) : -1;
|
||||
|
||||
if (cachedGlobe != null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user