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

speccounter: support fake xpdrops

Browse Source
This commit is contained in:
Adam
2019-11-08 10:34:20 -05:00
parent 3775bdacab
commit e12d0bd23b
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
View File

@@ -40,9 +40,11 @@ import net.runelite.api.NPCComposition;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.api.VarPlayer; import net.runelite.api.VarPlayer;
import net.runelite.api.events.FakeXpDrop;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.StatChanged;
import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.VarbitChanged;
import net.runelite.client.callback.ClientThread; import net.runelite.client.callback.ClientThread;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
@@ -65,6 +67,7 @@ public class SpecialCounterPlugin extends Plugin
private int currentWorld = -1; private int currentWorld = -1;
private int specialPercentage = -1; private int specialPercentage = -1;
private int specialHitpointsExperience = -1; private int specialHitpointsExperience = -1;
private int specialHitpointsGained = -1;
private boolean specialUsed; private boolean specialUsed;
private double modifier = 1d; private double modifier = 1d;
@@ -138,6 +141,25 @@ public class SpecialCounterPlugin extends Plugin
specialUsed = true; specialUsed = true;
specialHitpointsExperience = client.getSkillExperience(Skill.HITPOINTS); specialHitpointsExperience = client.getSkillExperience(Skill.HITPOINTS);
specialHitpointsGained = -1;
}
@Subscribe
public void onStatChanged(StatChanged statChanged)
{
if (specialUsed && statChanged.getSkill() == Skill.HITPOINTS)
{
specialHitpointsGained = statChanged.getXp() - specialHitpointsExperience;
}
}
@Subscribe
public void onFakeXpDrop(FakeXpDrop fakeXpDrop)
{
if (specialUsed && fakeXpDrop.getSkill() == Skill.HITPOINTS)
{
specialHitpointsGained = fakeXpDrop.getXp();
}
} }
@Subscribe @Subscribe
@@ -149,13 +171,11 @@ public class SpecialCounterPlugin extends Plugin
} }
int interactingId = checkInteracting(); int interactingId = checkInteracting();
if (interactingId > -1 && specialUsed)
if (interactingId > -1 && specialHitpointsExperience != -1 && specialUsed)
{ {
int deltaExperience = specialHitpointsGained;
specialUsed = false; specialUsed = false;
int hpXp = client.getSkillExperience(Skill.HITPOINTS);
int deltaExperience = hpXp - specialHitpointsExperience;
specialHitpointsExperience = -1;
if (deltaExperience > 0) if (deltaExperience > 0)
{ {