From 88474c102eaec8d96096a8d58e6b0fbe90b959d0 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 27 May 2018 16:36:28 -0400 Subject: [PATCH] skill calculator: turn indicators orange for actions that will become available before target --- .../plugins/skillcalculator/SkillCalculator.java | 1 + .../plugins/skillcalculator/UIActionSlot.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index 8e6a864d14..5c750685b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -246,6 +246,7 @@ class SkillCalculator extends JPanel slot.setText("Lvl. " + action.getLevel() + " (" + formatXPActionString(xp, actionCount, "exp) - ")); slot.setAvailable(currentLevel >= action.getLevel()); + slot.setOverlapping(action.getLevel() < targetLevel); slot.setValue((int) xp); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java index 8a33d709cf..4c4dac32cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java @@ -75,6 +75,9 @@ class UIActionSlot extends JPanel @Getter(AccessLevel.PACKAGE) private boolean isSelected; + @Getter(AccessLevel.PACKAGE) + private boolean isOverlapping; + @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private int value = 0; @@ -152,6 +155,12 @@ class UIActionSlot extends JPanel this.updateBackground(); } + void setOverlapping(boolean overlapping) + { + isOverlapping = overlapping; + this.updateBackground(); + } + void setText(String text) { uiLabelActions.setText(text); @@ -163,6 +172,10 @@ class UIActionSlot extends JPanel { this.setBorder(GREEN_BORDER); } + else if (isOverlapping) + { + this.setBorder(ORANGE_BORDER); + } else { this.setBorder(RED_BORDER);