ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4468 from LeviSchuck/xp-126

Browse Source 
Fix level 126 next goal to be max XP (200,000,000) instead of -1 xp
This commit is contained in:
Tomas Slusny
2018-07-25 11:05:24 +02:00
committed by GitHub
parent 08db5091af 96c3f07c4b
commit 3d46b17028
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/Experience.java
View File

@@ -40,6 +40,7 @@ public class Experience
* The maximum virtual skill level for any skill (200M experience). * The maximum virtual skill level for any skill (200M experience).
*/ */
public static final int MAX_VIRT_LEVEL = 126; public static final int MAX_VIRT_LEVEL = 126;
public static final int MAX_SKILL_XP = 200_000_000;
/** /**
* The total experience required for each skill level. * The total experience required for each skill level.

5
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
View File

@@ -41,6 +41,7 @@ import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Experience;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.game.SkillIconManager; import net.runelite.client.game.SkillIconManager;
import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.ColorScheme;
@@ -200,7 +201,9 @@ class XpInfoBox extends JPanel
progressBar.setValue(xpSnapshotSingle.getSkillProgressToGoal()); progressBar.setValue(xpSnapshotSingle.getSkillProgressToGoal());
progressBar.setCenterLabel(xpSnapshotSingle.getSkillProgressToGoal() + "%"); progressBar.setCenterLabel(xpSnapshotSingle.getSkillProgressToGoal() + "%");
progressBar.setLeftLabel("Lvl. " + xpSnapshotSingle.getStartLevel()); progressBar.setLeftLabel("Lvl. " + xpSnapshotSingle.getStartLevel());
progressBar.setRightLabel("Lvl. " + xpSnapshotSingle.getEndLevel()); progressBar.setRightLabel(xpSnapshotSingle.getEndGoalXp() == Experience.MAX_SKILL_XP
? "200M"
: "Lvl. " + xpSnapshotSingle.getEndLevel());
progressBar.setToolTipText(String.format( progressBar.setToolTipText(String.format(
HTML_TOOL_TIP_TEMPLATE, HTML_TOOL_TIP_TEMPLATE,

2
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpSnapshotSingle.java
View File

@@ -33,6 +33,8 @@ class XpSnapshotSingle
{ {
private int startLevel; private int startLevel;
private int endLevel; private int endLevel;
private int startGoalXp;
private int endGoalXp;
private int xpGainedInSession; private int xpGainedInSession;
private int xpRemainingToGoal; private int xpRemainingToGoal;
private int xpPerHour; private int xpPerHour;

6
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java
View File

@@ -220,7 +220,9 @@ class XpStateSingle
if (goalEndXp <= 0 || currentXp > goalEndXp) if (goalEndXp <= 0 || currentXp > goalEndXp)
{ {
int currentLevel = Experience.getLevelForXp(currentXp); int currentLevel = Experience.getLevelForXp(currentXp);
endLevelExp = currentLevel + 1 <= Experience.MAX_VIRT_LEVEL ? Experience.getXpForLevel(currentLevel + 1) : -1; endLevelExp = currentLevel + 1 <= Experience.MAX_VIRT_LEVEL
? Experience.getXpForLevel(currentLevel + 1)
: Experience.MAX_SKILL_XP;
} }
else else
{ {
@@ -253,6 +255,8 @@ class XpStateSingle
.actionsRemainingToGoal(getActionsRemaining()) .actionsRemainingToGoal(getActionsRemaining())
.actionsPerHour(getActionsHr()) .actionsPerHour(getActionsHr())
.timeTillGoal(getTimeTillLevel()) .timeTillGoal(getTimeTillLevel())
.startGoalXp(startLevelExp)
.endGoalXp(endLevelExp)
.build(); .build();
} }
} }