From cd317996dbb5b039ac29de9f034f407e71e91f39 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sun, 3 Jun 2018 12:40:28 +0100 Subject: [PATCH 1/2] Fix Charge timer showing with every teleport Turns out a lot of things reuse that animation --- .../src/main/java/net/runelite/api/GraphicID.java | 2 +- .../net/runelite/client/plugins/timers/GameTimer.java | 2 +- .../runelite/client/plugins/timers/TimersPlugin.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/GraphicID.java b/runelite-api/src/main/java/net/runelite/api/GraphicID.java index d13f5b9396..f770d39ada 100644 --- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java +++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java @@ -26,7 +26,7 @@ package net.runelite.api; public class GraphicID { - public static final int CHARGE = 111; + public static final int TELEPORT = 111; public static final int ENTANGLE = 179; public static final int SNARE = 180; public static final int BIND = 181; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index 988fc90706..9a9ef15073 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -70,7 +70,7 @@ public enum GameTimer GOD_WARS_ALTAR("altar", "God wars altar", 10, ChronoUnit.MINUTES), ANTIPOISON("antipoison", "Antipoison", 90, ChronoUnit.SECONDS), SUPERANTIPOISON("superantipoison", "Superantipoison", 346, ChronoUnit.SECONDS), - CHARGE("charge", "Charge", GraphicID.CHARGE, 6, ChronoUnit.MINUTES); + CHARGE("charge", "Charge", 6, ChronoUnit.MINUTES); @Getter private final String imageResource; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 31f9603fb1..c7ca2124e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -402,6 +402,11 @@ public class TimersPlugin extends Plugin { createGameTimer(PRAYER_ENHANCE); } + + if (config.showCharge() && event.getMessage().equals("You feel charged with magic power.")) + { + createGameTimer(CHARGE); + } } @Subscribe @@ -431,11 +436,6 @@ public class TimersPlugin extends Plugin return; } - if (config.showCharge() && actor.getGraphic() == CHARGE.getGraphicId()) - { - createGameTimer(CHARGE); - } - if (config.showImbuedHeart() && actor.getGraphic() == IMBUEDHEART.getGraphicId()) { createGameTimer(IMBUEDHEART); From aa98f50a4e5c3517ec31b30b23d1683cae25c307 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sun, 3 Jun 2018 13:16:01 +0100 Subject: [PATCH 2/2] Remove Charge Timer when the effect ends For Clarity, and just in case the client goes really far off for some reason. --- .../net/runelite/client/plugins/timers/TimersPlugin.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index c7ca2124e2..f493f65a7a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -407,6 +407,11 @@ public class TimersPlugin extends Plugin { createGameTimer(CHARGE); } + + if (event.getMessage().equals("Your magical charge fades away.")) + { + removeGameTimer(CHARGE); + } } @Subscribe