From bbe287e2aae14b3d6dd52d874fdc47506d39a122 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 24 Jul 2019 07:00:46 +0200 Subject: [PATCH 1/2] slayer: weakness overlay --- .../client/plugins/slayer/SlayerPlugin.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index 412d287277..036bf4c428 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -293,15 +293,18 @@ public class SlayerPlugin extends Plugin private int initialAmount; private int lastCertainAmount; + private boolean weaknessOverlayAttached; + @Override protected void startUp() throws Exception { updateConfig(); addSubscriptions(); + weaknessOverlayAttached = false; + overlayManager.add(overlay); overlayManager.add(targetClickboxOverlay); - overlayManager.add(targetWeaknessOverlay); overlayManager.add(targetMinimapOverlay); if (slayerXpDropLookup == null) @@ -1030,6 +1033,17 @@ public class SlayerPlugin extends Plugin rebuildTargetIds(task); rebuildCheckAsTokens(task); rebuildTargetList(); + + if (!weaknessOverlayAttached && task.getWeaknessItem() != -1 && task.getWeaknessThreshold() != -1) + { + overlayManager.add(targetWeaknessOverlay); + weaknessOverlayAttached = true; + } + else if (weaknessOverlayAttached && task.getWeaknessItem() == -1 && task.getWeaknessThreshold() == -1) + { + overlayManager.remove(targetWeaknessOverlay); + weaknessOverlayAttached = false; + } } AsyncBufferedImage getImageForTask(Task task) From 4b71f300c09f9f6ab78b2c96c32ea0aa5f53c159 Mon Sep 17 00:00:00 2001 From: Justin Date: Thu, 25 Jul 2019 18:51:49 +1000 Subject: [PATCH 2/2] slayerplugin: fixed Slayer Tracker not tracking fixed tests, made slayer tracker actually track kills --- .../runelite/client/plugins/slayer/SlayerPlugin.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index 036bf4c428..a3ef586d11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -442,7 +442,7 @@ public class SlayerPlugin extends Plugin } } - void onVarbitChanged(VarbitChanged event) + public void onVarbitChanged(VarbitChanged event) { if (client.getVar(Varbits.SLAYER_REWARD_POINTS) == cachedPoints) { @@ -556,7 +556,7 @@ public class SlayerPlugin extends Plugin private static final int FORCED_WAIT = 2; private int forcedWait = -1; - void onGameTick(GameTick tick) + public void onGameTick(GameTick tick) { loginTick = false; @@ -637,7 +637,7 @@ public class SlayerPlugin extends Plugin } } - void onChatMessage(ChatMessage event) + public void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) { @@ -722,7 +722,7 @@ public class SlayerPlugin extends Plugin } } - void onExperienceChanged(ExperienceChanged event) + public void onExperienceChanged(ExperienceChanged event) { if (event.getSkill() != SLAYER) { @@ -1005,7 +1005,7 @@ public class SlayerPlugin extends Plugin } } - void setTask(String name, int amt, int initAmt, boolean isNewAssignment, int lastCertainAmt) + public void setTask(String name, int amt, int initAmt, boolean isNewAssignment, int lastCertainAmt) { setTask(name, amt, initAmt, isNewAssignment, null, lastCertainAmt); } @@ -1307,4 +1307,4 @@ public class SlayerPlugin extends Plugin this.lastCertainAmount = config.lastCertainAmount(); this.taskLocation = config.taskLocation(); } -} \ No newline at end of file +}