diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java index 1ef10c50d8..6ef25f3bb3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java @@ -100,6 +100,17 @@ public interface NpcIndicatorsConfig extends Config @ConfigItem( position = 6, + keyName = "highlightDeadNPCs", + name = "Highlight dead NPCs", + description = "Highlight dead NPCs" + ) + default boolean highlightDeadNpcs() + { + return false; + } + + @ConfigItem( + position = 7, keyName = "showRespawnTimer", name = "Show respawn timer", description = "Show respawn timer of tagged NPCs") diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 8b19b4ca91..200eedfd8b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -260,7 +260,7 @@ public class NpcIndicatorsPlugin extends Plugin if (config.highlightMenuNames() && NPC_MENU_ACTIONS.contains(MenuAction.of(type)) && - highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier())) + highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier() && (!npc.isDead() || config.highlightDeadNpcs()))) { MenuEntry[] menuEntries = client.getMenuEntries(); final MenuEntry menuEntry = menuEntries[menuEntries.length - 1]; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java index fd036adb95..dc6871cfcb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java @@ -68,7 +68,8 @@ public class NpcMinimapOverlay extends Overlay private void renderNpcOverlay(Graphics2D graphics, NPC actor, String name, Color color) { NPCComposition npcComposition = actor.getTransformedComposition(); - if (npcComposition == null || !npcComposition.isInteractible()) + if (npcComposition == null || !npcComposition.isInteractible() + || (actor.isDead() && !config.highlightDeadNpcs())) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java index b1a5ed8ada..a1d1bffda9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java @@ -146,7 +146,8 @@ public class NpcSceneOverlay extends Overlay private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color) { NPCComposition npcComposition = actor.getTransformedComposition(); - if (npcComposition == null || !npcComposition.isInteractible()) + if (npcComposition == null || !npcComposition.isInteractible() + || (actor.isDead() && !config.highlightDeadNpcs())) { return; }