From 835b18b81955ccf54c5942fdbace657680ed5111 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 28 Jun 2018 16:11:21 -0700 Subject: [PATCH 1/3] Update Veng Other / Energy Transfer animation ID Both the Vengeance Other and Energy Transfer spells use the same animation. --- runelite-api/src/main/java/net/runelite/api/AnimationID.java | 2 +- .../java/net/runelite/client/plugins/timers/TimersPlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index bcab9326a8..c3e0ba8e1b 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -124,7 +124,6 @@ public final class AnimationID public static final int USING_GILDED_ALTAR = 3705; public static final int LOOKING_INTO = 832; public static final int DIG = 830; - public static final int VENGEANCE_OTHER = 4411; public static final int DEMONIC_GORILLA_MAGIC_ATTACK = 7225; public static final int DEMONIC_GORILLA_MELEE_ATTACK = 7226; public static final int DEMONIC_GORILLA_RANGED_ATTACK = 7227; @@ -148,6 +147,7 @@ public final class AnimationID public static final int FARMING_HARVEST_FLOWER = 2292; // Lunar spellbook + public static final int ENERGY_TRANSFER_VENGEANCE_OTHER = 4411; public static final int MAGIC_LUNAR_FERTILE_SOIL = 4413; public static final int MAGIC_LUNAR_CURE_PLANT = 4432; public static final int MAGIC_LUNAR_GEOMANCY = 7118; 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 f1109c8381..50e82883b2 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 @@ -445,7 +445,7 @@ public class TimersPlugin extends Plugin return; } - if (config.showVengeanceOther() && actor.getAnimation() == AnimationID.VENGEANCE_OTHER) + if (config.showVengeanceOther() && actor.getAnimation() == AnimationID.ENERGY_TRANSFER_VENGEANCE_OTHER) { createGameTimer(VENGEANCEOTHER); } From 31082ad85a2edf90c61b16c5d9de974a2697bee9 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 28 Jun 2018 16:11:27 -0700 Subject: [PATCH 2/3] Add Vengeance Other graphic ID --- runelite-api/src/main/java/net/runelite/api/GraphicID.java | 1 + 1 file changed, 1 insertion(+) 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 85253faad0..4e0d556794 100644 --- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java +++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java @@ -35,6 +35,7 @@ public class GraphicID public static final int ICE_BURST = 363; public static final int ICE_BLITZ = 367; public static final int ICE_BARRAGE = 369; + public static final int VENGEANCE_OTHER = 725; public static final int VENGEANCE = 726; public static final int STAFF_OF_THE_DEAD = 1228; public static final int IMBUED_HEART = 1316; From cb2884b1ac281c8870bb1668b69e11fb433f0164 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 28 Jun 2018 16:11:56 -0700 Subject: [PATCH 3/3] timers plugin: Check for Vengeance Other graphic Fixes runelite/runelite#4052 --- .../java/net/runelite/client/plugins/timers/GameTimer.java | 2 +- .../java/net/runelite/client/plugins/timers/TimersPlugin.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 45b882fe99..df6a39cb07 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 @@ -60,7 +60,7 @@ public enum GameTimer ICEBARRAGE("icebarrage", "Ice barrage", GraphicID.ICE_BARRAGE, 20, ChronoUnit.SECONDS), IMBUEDHEART("imbuedheart", "Imbued heart", GraphicID.IMBUED_HEART, 420, ChronoUnit.SECONDS), VENGEANCE("vengeance", "Vengeance", GraphicID.VENGEANCE, 30, ChronoUnit.SECONDS), - VENGEANCEOTHER("vengeanceother", "Vengeance Other", -1, 30, ChronoUnit.SECONDS), + VENGEANCEOTHER("vengeanceother", "Vengeance Other", GraphicID.VENGEANCE_OTHER, 30, ChronoUnit.SECONDS), ANTIDOTEPLUS("antidoteplus", "Antidote+", 518, ChronoUnit.SECONDS), ANTIVENOM("antivenom", "Anti-venom", 12, ChronoUnit.MINUTES), EXSUPERANTIFIRE("exsuperantifire", "Extended Super AntiFire", 6, ChronoUnit.MINUTES), 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 50e82883b2..0782958a6c 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 @@ -445,7 +445,9 @@ public class TimersPlugin extends Plugin return; } - if (config.showVengeanceOther() && actor.getAnimation() == AnimationID.ENERGY_TRANSFER_VENGEANCE_OTHER) + if (config.showVengeanceOther() + && actor.getAnimation() == AnimationID.ENERGY_TRANSFER_VENGEANCE_OTHER + && actor.getInteracting().getGraphic() == VENGEANCEOTHER.getGraphicId()) { createGameTimer(VENGEANCEOTHER); }