From 6468eed0f4ea4bb09801940ef000689d8aa23dcf Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 12 Jun 2018 15:51:21 -0700 Subject: [PATCH] Add Staff of the Dead timer Closes runelite/runelite#1728 --- .../main/java/net/runelite/api/GraphicID.java | 1 + .../client/plugins/timers/GameTimer.java | 3 ++- .../client/plugins/timers/TimersConfig.java | 11 +++++++++++ .../client/plugins/timers/TimersPlugin.java | 18 ++++++++++++++++++ .../client/plugins/timers/staffofthedead.png | Bin 0 -> 3077 bytes 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png 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 d6fc6a2fae..85253faad0 100644 --- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java +++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java @@ -36,6 +36,7 @@ public class GraphicID public static final int ICE_BLITZ = 367; public static final int ICE_BARRAGE = 369; public static final int VENGEANCE = 726; + public static final int STAFF_OF_THE_DEAD = 1228; public static final int IMBUED_HEART = 1316; public static final int FLYING_FISH = 1387; } 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 9a9ef15073..45b882fe99 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,8 @@ 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", 6, ChronoUnit.MINUTES); + CHARGE("charge", "Charge", 6, ChronoUnit.MINUTES), + STAFF_OF_THE_DEAD("staffofthedead", "Staff of the Dead", GraphicID.STAFF_OF_THE_DEAD, 1, ChronoUnit.MINUTES); @Getter private final String imageResource; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java index 310f7a9b42..0b97832aed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java @@ -287,4 +287,15 @@ public interface TimersConfig extends Config { return true; } + + @ConfigItem( + position = 23, + keyName = "showStaffOfTheDead", + name = "Staff of the Dead timer", + description = "Configures whether staff of the dead timer is displayed" + ) + default boolean showStaffOfTheDead() + { + return true; + } } 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 f493f65a7a..08472df809 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 @@ -72,6 +72,7 @@ import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD_RAID; import static net.runelite.client.plugins.timers.GameTimer.PRAYER_ENHANCE; import static net.runelite.client.plugins.timers.GameTimer.SANFEW; import static net.runelite.client.plugins.timers.GameTimer.SNARE; +import static net.runelite.client.plugins.timers.GameTimer.STAFF_OF_THE_DEAD; import static net.runelite.client.plugins.timers.GameTimer.STAMINA; import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIFIRE; import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIPOISON; @@ -84,6 +85,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; ) public class TimersPlugin extends Plugin { + private int lastEquippedWeapVarb; private int lastRaidVarb; @Inject @@ -110,6 +112,12 @@ public class TimersPlugin extends Plugin @Subscribe public void onVarbitChange(VarbitChanged event) { + int equippedWeap = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE); + if (lastEquippedWeapVarb != equippedWeap) + { + removeGameTimer(STAFF_OF_THE_DEAD); + } + int raidVarb = client.getVar(Varbits.IN_RAID); if (lastRaidVarb != raidVarb) { @@ -198,6 +206,11 @@ public class TimersPlugin extends Plugin removeGameTimer(IMBUEDHEART); } + if (!config.showStaffOfTheDead()) + { + removeGameTimer(STAFF_OF_THE_DEAD); + } + if (!config.showVengeance()) { removeGameTimer(VENGEANCE); @@ -451,6 +464,11 @@ public class TimersPlugin extends Plugin createGameTimer(VENGEANCE); } + if (config.showStaffOfTheDead() && actor.getGraphic() == STAFF_OF_THE_DEAD.getGraphicId()) + { + createGameTimer(STAFF_OF_THE_DEAD); + } + if (config.showFreezes()) { if (actor.getGraphic() == BIND.getGraphicId()) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png new file mode 100644 index 0000000000000000000000000000000000000000..76a2713ccea9f3bc31d0863e5140ef9e0a7c9df2 GIT binary patch literal 3077 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 literal 0 HcmV?d00001