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

npc indicators: add option to not highlight dead npcs

Browse Source
This commit is contained in:
Jesse Serrao
2020-05-30 16:52:59 +01:00
committed by GitHub
parent 27173d90b5
commit 869b1ba1d9
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
View File

@@ -100,6 +100,17 @@ public interface NpcIndicatorsConfig extends Config
@ConfigItem( @ConfigItem(
position = 6, position = 6,
keyName = "highlightDeadNPCs",
name = "Highlight dead NPCs",
description = "Highlight dead NPCs"
)
default boolean highlightDeadNpcs()
{
return false;
}
@ConfigItem(
position = 7,
keyName = "showRespawnTimer", keyName = "showRespawnTimer",
name = "Show respawn timer", name = "Show respawn timer",
description = "Show respawn timer of tagged NPCs") description = "Show respawn timer of tagged NPCs")

2
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
View File

@@ -260,7 +260,7 @@ public class NpcIndicatorsPlugin extends Plugin
if (config.highlightMenuNames() && if (config.highlightMenuNames() &&
NPC_MENU_ACTIONS.contains(MenuAction.of(type)) && 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(); MenuEntry[] menuEntries = client.getMenuEntries();
final MenuEntry menuEntry = menuEntries[menuEntries.length - 1]; final MenuEntry menuEntry = menuEntries[menuEntries.length - 1];

3
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
View File

@@ -68,7 +68,8 @@ public class NpcMinimapOverlay extends Overlay
private void renderNpcOverlay(Graphics2D graphics, NPC actor, String name, Color color) private void renderNpcOverlay(Graphics2D graphics, NPC actor, String name, Color color)
{ {
NPCComposition npcComposition = actor.getTransformedComposition(); NPCComposition npcComposition = actor.getTransformedComposition();
if (npcComposition == null || !npcComposition.isInteractible()) if (npcComposition == null || !npcComposition.isInteractible()
|| (actor.isDead() && !config.highlightDeadNpcs()))
{ {
return; return;
} }

3
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
View File

@@ -146,7 +146,8 @@ public class NpcSceneOverlay extends Overlay
private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color) private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color)
{ {
NPCComposition npcComposition = actor.getTransformedComposition(); NPCComposition npcComposition = actor.getTransformedComposition();
if (npcComposition == null || !npcComposition.isInteractible()) if (npcComposition == null || !npcComposition.isInteractible()
|| (actor.isDead() && !config.highlightDeadNpcs()))
{ {
return; return;
} }