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

updated oppInfo to have Opponent HP percent

Browse Source
This commit is contained in:
noremac201
2017-02-05 13:37:48 -06:00
committed by Adam
parent 5d8396cf59
commit eb6b71616b
12 changed files with 1165 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfo.java
View File

@@ -25,6 +25,12 @@
package net.runelite.client.plugins.opponentinfo;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.util.Map;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.Overlay;
@@ -37,4 +43,13 @@ public class OpponentInfo extends Plugin
{
return overlay;
}
public static Map<String, Integer> loadNpcHealth()
{
Gson gson = new Gson();
Type type = new TypeToken<Map<String, Integer>>(){}.getType();
InputStream healthFile = OpponentInfo.class.getResourceAsStream("/npc_health.json");
return gson.fromJson(new InputStreamReader(healthFile), type);
}
}

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

@@ -31,11 +31,16 @@ import java.awt.FontMetrics;
import java.awt.Graphics2D;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Player;
import net.runelite.client.RuneLite;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import java.text.DecimalFormat;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
class OpponentInfoOverlay extends Overlay
{
@@ -51,6 +56,15 @@ class OpponentInfoOverlay extends Overlay
private static final Color HP_GREEN = new Color(0, 146, 54, 230);
private static final Color HP_RED = new Color(102, 15, 16, 230);
private static final Duration WAIT = Duration.ofSeconds(3);
private Integer lastMaxHealth;
private DecimalFormat df = new DecimalFormat("0.0");
private float lastRatio = 0;
private Instant lastTime = Instant.now();
private String opponentName;
private Map<String, Integer> oppInfoHealth = OpponentInfo.loadNpcHealth();
OpponentInfoOverlay()
{
super(OverlayPosition.TOP_LEFT, OverlayPriority.HIGH);
@@ -70,42 +84,42 @@ class OpponentInfoOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
Actor opponent = getOpponent();
if (opponent == null)
if (RuneLite.getClient().getGameState() != GameState.LOGGED_IN)
return null;
// int cur = opponent.getHealth();
// int max = opponent.getMaxHealth();
int cur = 0, max = 0; // XXX
Actor opponent = getOpponent();
if (opponent != null && opponent.getHealth() > 0)
{
lastTime = Instant.now();
lastRatio = (float) opponent.getHealthRatio() / (float) opponent.getHealth();
opponentName = opponent.getName();
lastMaxHealth = oppInfoHealth.get(opponent.getName() + "_" + opponent.getCombatLevel());
}
if (Duration.between(Instant.now(), lastTime).abs().compareTo(WAIT) > 0)
return null; //don't draw anything.
FontMetrics fm = graphics.getFontMetrics();
int height = TOP_BORDER
+ fm.getHeight(); // opponent name
if (max > 0)
height += 1 // between name and hp bar
int height = TOP_BORDER + fm.getHeight(); // opponent name
if (lastRatio >= 0)
{
height += 2 // between name and hp bar
+ BAR_HEIGHT; // bar
}
height += BOTTOM_BORDER;
graphics.setColor(BACKGROUND);
graphics.fillRect(0, 0, WIDTH, height);
String str = opponent.getName();
int x = (WIDTH - fm.stringWidth(str)) / 2;
int x = (WIDTH - fm.stringWidth(opponentName)) / 2;
graphics.setColor(Color.white);
graphics.drawString(str, x, fm.getHeight() + TOP_BORDER);
graphics.drawString(opponentName, x, fm.getHeight() + TOP_BORDER);
// hp bar
if (max > 0)
if (lastRatio >= 0)
{
float percent = (float) cur / (float) max;
if (percent > 100f)
percent = 100f;
int barWidth = (int) (percent * (float) BAR_WIDTH);
int barWidth = (int) (lastRatio * (float) BAR_WIDTH);
int barY = TOP_BORDER + fm.getHeight() + 1;
graphics.setColor(HP_GREEN);
@@ -114,10 +128,21 @@ class OpponentInfoOverlay extends Overlay
graphics.setColor(HP_RED);
graphics.fillRect(((WIDTH - BAR_WIDTH) / 2) + barWidth, barY, BAR_WIDTH - barWidth, BAR_HEIGHT);
str = cur + " / " + max;
x = (WIDTH - fm.stringWidth(str)) / 2;
graphics.setColor(Color.white);
graphics.drawString(str, x, barY + fm.getHeight());
String str;
if (lastMaxHealth != null)
{
int currHealth = (int) (lastRatio * lastMaxHealth);
str = currHealth + "/" + lastMaxHealth;
}
else
{
str = df.format(lastRatio * 100) + "%";
}
graphics.drawString(str, (WIDTH - fm.stringWidth(str)) / 2, barY + fm.getHeight());
}
return new Dimension(WIDTH, height);