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 0000000000..76a2713cce Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png differ