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

skillcalculator: Don't clear fields when re-loading current skill

Browse Source 
Previously, clicking on the active calculator's skill would reset the
goal level and experience text input fields. This commit prevents that
reset when selecting the already-active skill, and only resets them when
viewing a different skill's calculator.
This commit is contained in:
Daniel
2020-03-17 17:34:46 -04:00
committed by GitHub
parent 9ac4592a63
commit 84a23cb59d
1 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
View File

@@ -74,6 +74,7 @@ class SkillCalculator extends JPanel
private final IconTextField searchBar = new IconTextField(); private final IconTextField searchBar = new IconTextField();
private SkillData skillData; private SkillData skillData;
private Skill currentSkill;
private int currentLevel = 1; private int currentLevel = 1;
private int currentXP = Experience.getXpForLevel(currentLevel); private int currentXP = Experience.getXpForLevel(currentLevel);
private int targetLevel = currentLevel + 1; private int targetLevel = currentLevel + 1;
@@ -123,48 +124,54 @@ class SkillCalculator extends JPanel
void openCalculator(CalculatorType calculatorType) void openCalculator(CalculatorType calculatorType)
{ {
// Load the skill data.
skillData = cacheSkillData.getSkillData(calculatorType.getDataFile());
// Reset the XP factor, removing bonuses.
xpFactor = 1.0f;
// Update internal skill/XP values. // Update internal skill/XP values.
currentXP = client.getSkillExperience(calculatorType.getSkill()); currentXP = client.getSkillExperience(calculatorType.getSkill());
currentLevel = Experience.getLevelForXp(currentXP); currentLevel = Experience.getLevelForXp(currentXP);
VarPlayer endGoalVarp = endGoalVarpForSkill(calculatorType.getSkill());
int endGoal = client.getVar(endGoalVarp); if (currentSkill != calculatorType.getSkill())
if (endGoal != -1)
{ {
targetLevel = Experience.getLevelForXp(endGoal); currentSkill = calculatorType.getSkill();
targetXP = endGoal;
// Load the skill data.
skillData = cacheSkillData.getSkillData(calculatorType.getDataFile());
// Reset the XP factor, removing bonuses.
xpFactor = 1.0f;
VarPlayer endGoalVarp = endGoalVarpForSkill(calculatorType.getSkill());
int endGoal = client.getVar(endGoalVarp);
if (endGoal != -1)
{
targetLevel = Experience.getLevelForXp(endGoal);
targetXP = endGoal;
}
else
{
targetLevel = enforceSkillBounds(currentLevel + 1);
targetXP = Experience.getXpForLevel(targetLevel);
}
// Remove all components (action slots) from this panel.
removeAll();
// Clear the search bar
searchBar.setText(null);
// Clear the combined action slots
clearCombinedSlots();
// Add in checkboxes for available skill bonuses.
renderBonusOptions();
// Add the combined action slot.
add(combinedActionSlot);
// Add the search bar
add(searchBar);
// Create action slots for the skill actions.
renderActionSlots();
} }
else
{
targetLevel = enforceSkillBounds(currentLevel + 1);
targetXP = Experience.getXpForLevel(targetLevel);
}
// Remove all components (action slots) from this panel.
removeAll();
// Clear the search bar
searchBar.setText(null);
// Clear the combined action slots
clearCombinedSlots();
// Add in checkboxes for available skill bonuses.
renderBonusOptions();
// Add the combined action slot.
add(combinedActionSlot);
// Add the search bar
add(searchBar);
// Create action slots for the skill actions.
renderActionSlots();
// Update the input fields. // Update the input fields.
updateInputFields(); updateInputFields();