From 78eb357bbfc1a960346992104a36bb01a10e4c92 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 21 Sep 2018 17:27:31 -0400 Subject: [PATCH] opponent info: add config opt to show health as percent --- .../plugins/opponentinfo/OpponentInfoConfig.java | 14 +++++++++++++- .../plugins/opponentinfo/OpponentInfoOverlay.java | 7 +++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java index 36ec066b31..0eb58787e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoConfig.java @@ -34,10 +34,22 @@ public interface OpponentInfoConfig extends Config @ConfigItem( keyName = "lookupOnInteraction", name = "Lookup players on interaction", - description = "Display a combat stat comparison panel on player interaction. (follow, trade, challenge, attack, etc.)" + description = "Display a combat stat comparison panel on player interaction. (follow, trade, challenge, attack, etc.)", + position = 0 ) default boolean lookupOnInteraction() { return false; } + + @ConfigItem( + keyName = "showPercent", + name = "Show percent", + description = "Shows hitpoints as a percentage even if hitpoints are known", + position = 1 + ) + default boolean showPercent() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java index c558d02ce5..1c637facaf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java @@ -55,6 +55,7 @@ class OpponentInfoOverlay extends Overlay private final Client client; private final OpponentInfoPlugin opponentInfoPlugin; + private final OpponentInfoConfig opponentInfoConfig; private final HiscoreManager hiscoreManager; private final PanelComponent panelComponent = new PanelComponent(); @@ -65,10 +66,12 @@ class OpponentInfoOverlay extends Overlay private String opponentsOpponentName; @Inject - private OpponentInfoOverlay(Client client, OpponentInfoPlugin opponentInfoPlugin, HiscoreManager hiscoreManager) + private OpponentInfoOverlay(Client client, OpponentInfoPlugin opponentInfoPlugin, + OpponentInfoConfig opponentInfoConfig, HiscoreManager hiscoreManager) { this.client = client; this.opponentInfoPlugin = opponentInfoPlugin; + this.opponentInfoConfig = opponentInfoConfig; this.hiscoreManager = hiscoreManager; setPosition(OverlayPosition.TOP_LEFT); @@ -147,7 +150,7 @@ class OpponentInfoOverlay extends Overlay progressBarComponent.setBackgroundColor(HP_RED); progressBarComponent.setForegroundColor(HP_GREEN); - if (lastMaxHealth != null) + if (lastMaxHealth != null && !opponentInfoConfig.showPercent()) { progressBarComponent.setLabelDisplayMode(ProgressBarComponent.LabelDisplayMode.FULL); progressBarComponent.setMaximum(lastMaxHealth);