From af7c8336959d159dac087ba3fd777299ef5880e8 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 4 Jun 2020 22:39:21 -0400 Subject: [PATCH] npc indicators: rename highlight dead npcs to ignore dead npcs --- .../plugins/npchighlight/NpcIndicatorsConfig.java | 10 +++++----- .../plugins/npchighlight/NpcIndicatorsPlugin.java | 2 +- .../client/plugins/npchighlight/NpcMinimapOverlay.java | 2 +- .../client/plugins/npchighlight/NpcSceneOverlay.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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 6ef25f3bb3..029d67d6ba 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,13 +100,13 @@ public interface NpcIndicatorsConfig extends Config @ConfigItem( position = 6, - keyName = "highlightDeadNPCs", - name = "Highlight dead NPCs", - description = "Highlight dead NPCs" + keyName = "ignoreDeadNpcs", + name = "Ignore dead NPCs", + description = "Prevents highlighting NPCs after they are dead" ) - default boolean highlightDeadNpcs() + default boolean ignoreDeadNpcs() { - return false; + return true; } @ConfigItem( 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 fc7cf4ac91..ed8a577880 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 @@ -261,7 +261,7 @@ public class NpcIndicatorsPlugin extends Plugin if (config.highlightMenuNames() && NPC_MENU_ACTIONS.contains(MenuAction.of(type)) && - highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier() && (!npc.isDead() || config.highlightDeadNpcs()))) + highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier() && (!npc.isDead() || !config.ignoreDeadNpcs()))) { 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 dc6871cfcb..01af41f6ad 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 @@ -69,7 +69,7 @@ public class NpcMinimapOverlay extends Overlay { NPCComposition npcComposition = actor.getTransformedComposition(); if (npcComposition == null || !npcComposition.isInteractible() - || (actor.isDead() && !config.highlightDeadNpcs())) + || (actor.isDead() && config.ignoreDeadNpcs())) { 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 a1d1bffda9..f3befac1e2 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 @@ -147,7 +147,7 @@ public class NpcSceneOverlay extends Overlay { NPCComposition npcComposition = actor.getTransformedComposition(); if (npcComposition == null || !npcComposition.isInteractible() - || (actor.isDead() && !config.highlightDeadNpcs())) + || (actor.isDead() && config.ignoreDeadNpcs())) { return; }