From c5a52754e06abfc0f7dc35be0e86e3ec604d5040 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 5 Jan 2021 14:50:52 -0500 Subject: [PATCH] Fix Zalcano damage overlay to only show during Zalcano This varp is for the hp hud, and applies to more content than just Zalcano, so verify that the hp hud is for Zalcano --- runelite-api/src/main/java/net/runelite/api/VarPlayer.java | 6 ++---- .../net/runelite/client/plugins/zalcano/ZalcanoPlugin.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java index d4653aeb9c..c11574e662 100644 --- a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java +++ b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java @@ -188,11 +188,9 @@ public enum VarPlayer MOUSE_BUTTONS(170), /** - * Zalcano's form - * -1 : Player is outside or Zalcano is dead i.e. there's no healthbar to show - * Anything else : The {@link NpcID} of the current form + * {@link NpcID} for the HP HUD */ - ZALCANO_FORM(1683); + HP_HUD_NPC_ID(1683); private final int id; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java index fdaa151b29..b529c54aef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java @@ -265,6 +265,7 @@ public class ZalcanoPlugin extends Plugin private boolean isHealthbarActive() { - return client.getVar(VarPlayer.ZALCANO_FORM) != -1; + int npcId = client.getVar(VarPlayer.HP_HUD_NPC_ID); + return npcId == ZALCANO_WEAKENED || npcId == ZALCANO; } }