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

experiencedrop: Highlight only correct exp drops for prayer

Browse Source 
Prior to this commit, hitpoints exp drops (and combined exp drops
containing hitpoints) would be highlighted for any combat prayer. This
commit corrects this behavior so combined drops will only be highlighted
when containing the proper combat style prayer, and split exp drops will
only highlight hitpoints when the correct prayer type was active for the
experience drops which precede it.

Fixes runelite/runelite#1697
This commit is contained in:
Jordan Atwood
2019-01-02 19:03:42 -08:00
parent 487ec5fad3
commit 4f18a54c23
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
View File

@@ -64,6 +64,7 @@ public class XpDropPlugin extends Plugin
private int tickCounter = 0;
private int previousExpGained;
private boolean hasDropped = false;
private boolean correctPrayer;
private Skill lastSkill = null;
private Map<Skill, Integer> previousSkillExpTable = new EnumMap<>(Skill.class);
private PrayerType currentTickPrayer;
@@ -154,22 +155,24 @@ public class XpDropPlugin extends Plugin
case MELEE:
if (spriteIDs.anyMatch(id ->
id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE
|| id == SpriteID.SKILL_HITPOINTS))
|| correctPrayer))
{
color = config.getMeleePrayerColor().getRGB();
correctPrayer = true;
}
break;
case RANGE:
if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_RANGED || id == SpriteID.SKILL_HITPOINTS))
if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_RANGED || correctPrayer))
{
color = config.getRangePrayerColor().getRGB();
correctPrayer = true;
}
break;
case MAGIC:
if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_MAGIC || id == SpriteID.SKILL_HITPOINTS))
if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_MAGIC || correctPrayer))
{
color = config.getMagePrayerColor().getRGB();
correctPrayer = true;
}
break;
}
@@ -201,6 +204,7 @@ public class XpDropPlugin extends Plugin
public void onGameTick(GameTick tick)
{
currentTickPrayer = getActivePrayerType();
correctPrayer = false;
final int fakeTickDelay = config.fakeXpDropDelay();