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

opponent info overlay: use last opponent if no opponent is targeted

Browse Source
This commit is contained in:
Adam
2018-03-10 09:57:34 -05:00
parent e8d232de72
commit 652dd91211
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
View File

@@ -37,6 +37,7 @@ import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Actor; import net.runelite.api.Actor;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
@@ -60,6 +61,8 @@ class OpponentInfoOverlay extends Overlay
private static final Duration WAIT = Duration.ofSeconds(3); private static final Duration WAIT = Duration.ofSeconds(3);
private final Client client; private final Client client;
private final NPC[] clientNpcs;
private Integer lastMaxHealth; private Integer lastMaxHealth;
private DecimalFormat df = new DecimalFormat("0.0"); private DecimalFormat df = new DecimalFormat("0.0");
private float lastRatio = 0; private float lastRatio = 0;
@@ -67,6 +70,7 @@ class OpponentInfoOverlay extends Overlay
private String opponentName; private String opponentName;
private String opponentsOpponentName; private String opponentsOpponentName;
private Map<String, Integer> oppInfoHealth = OpponentInfoPlugin.loadNpcHealth(); private Map<String, Integer> oppInfoHealth = OpponentInfoPlugin.loadNpcHealth();
private NPC lastOpponent;
@Inject @Inject
OpponentInfoOverlay(Client client) OpponentInfoOverlay(Client client)
@@ -74,6 +78,7 @@ class OpponentInfoOverlay extends Overlay
setPosition(OverlayPosition.TOP_LEFT); setPosition(OverlayPosition.TOP_LEFT);
setPriority(OverlayPriority.HIGH); setPriority(OverlayPriority.HIGH);
this.client = client; this.client = client;
this.clientNpcs = client.getCachedNPCs();
} }
private Actor getOpponent() private Actor getOpponent()
@@ -92,6 +97,25 @@ class OpponentInfoOverlay extends Overlay
{ {
Actor opponent = getOpponent(); Actor opponent = getOpponent();
// If opponent is null, try to use last opponent
if (opponent == null)
{
if (lastOpponent != null && clientNpcs[lastOpponent.getIndex()] != lastOpponent)
{
// lastOpponent is no longer valid
lastOpponent = null;
}
else
{
opponent = lastOpponent;
}
}
else
{
// Update last opponent
lastOpponent = opponent instanceof NPC ? (NPC) opponent : null;
}
if (opponent != null && opponent.getHealth() > 0) if (opponent != null && opponent.getHealth() > 0)
{ {
lastTime = Instant.now(); lastTime = Instant.now();