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

Merge pull request #7160 from Nightfirecat/correct-exp-drop-highlighting

Browse Source 
experiencedrop: Highlight only correct exp drops for prayer
This commit is contained in:
Tomas Slusny
2019-01-04 06:26:26 +01:00
committed by GitHub
parent 8e5da844b6 4f18a54c23
commit 2ba6978f0e
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 tickCounter = 0;
private int previousExpGained; private int previousExpGained;
private boolean hasDropped = false; private boolean hasDropped = false;
private boolean correctPrayer;
private Skill lastSkill = null; private Skill lastSkill = null;
private Map<Skill, Integer> previousSkillExpTable = new EnumMap<>(Skill.class); private Map<Skill, Integer> previousSkillExpTable = new EnumMap<>(Skill.class);
private PrayerType currentTickPrayer; private PrayerType currentTickPrayer;
@@ -154,22 +155,24 @@ public class XpDropPlugin extends Plugin
case MELEE: case MELEE:
if (spriteIDs.anyMatch(id -> if (spriteIDs.anyMatch(id ->
id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE
|| id == SpriteID.SKILL_HITPOINTS)) || correctPrayer))
{ {
color = config.getMeleePrayerColor().getRGB(); color = config.getMeleePrayerColor().getRGB();
correctPrayer = true;
} }
break; break;
case RANGE: 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(); color = config.getRangePrayerColor().getRGB();
correctPrayer = true;
} }
break; break;
case MAGIC: 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(); color = config.getMagePrayerColor().getRGB();
correctPrayer = true;
} }
break; break;
} }
@@ -201,6 +204,7 @@ public class XpDropPlugin extends Plugin
public void onGameTick(GameTick tick) public void onGameTick(GameTick tick)
{ {
currentTickPrayer = getActivePrayerType(); currentTickPrayer = getActivePrayerType();
correctPrayer = false;
final int fakeTickDelay = config.fakeXpDropDelay(); final int fakeTickDelay = config.fakeXpDropDelay();