From beef77b1c79eaa4a3c768764ed498f7683d3e7ee Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 23 May 2018 19:28:40 -0400 Subject: [PATCH] skill calculator: add ignore bonus --- .../client/plugins/skillcalculator/SkillCalculator.java | 2 +- .../client/plugins/skillcalculator/beans/SkillDataEntry.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 bdf3a496b5..9cb38e66a0 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 @@ -243,7 +243,7 @@ class SkillCalculator extends JPanel { int actionCount = 0; int neededXP = targetXP - currentXP; - double xp = slot.action.getXp() * xpFactor; + double xp = (slot.action.isIgnoreBonus()) ? slot.action.getXp() : slot.action.getXp() * xpFactor; if (neededXP > 0) actionCount = (int) Math.ceil(neededXP / xp); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java index 6a1ea58f18..b21188d913 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java @@ -34,4 +34,5 @@ public class SkillDataEntry private double xp; private Integer icon; private Integer sprite; + private boolean ignoreBonus; } \ No newline at end of file