From 374df55e418945590fb8b03cf9fef21fb4e5af2c Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sat, 8 Dec 2018 17:43:32 -0800 Subject: [PATCH] Handle Deadman Tournament world type in plugins --- .../plugins/opponentinfo/OpponentInfoPlugin.java | 8 ++++++-- .../client/plugins/screenshot/ScreenshotPlugin.java | 3 ++- .../runelite/client/plugins/timers/TimersPlugin.java | 12 ++++++++---- .../client/plugins/xptracker/XpWorldType.java | 5 ++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index d52bdc7f43..6e36665a8b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -108,8 +108,12 @@ public class OpponentInfoPlugin extends Plugin return; } - EnumSet worldType = client.getWorldType(); - if (worldType.contains(WorldType.SEASONAL_DEADMAN)) + final EnumSet worldType = client.getWorldType(); + if (worldType.contains(WorldType.DEADMAN_TOURNAMENT)) + { + hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT; + } + else if (worldType.contains(WorldType.SEASONAL_DEADMAN)) { hiscoreEndpoint = HiscoreEndpoint.SEASONAL_DEADMAN; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index c15db92117..9cfd1c8d68 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -555,7 +555,8 @@ public class ScreenshotPlugin extends Plugin final EnumSet worldTypes = client.getWorldType(); final boolean dmm = worldTypes.contains(WorldType.DEADMAN); final boolean sdmm = worldTypes.contains(WorldType.SEASONAL_DEADMAN); - final boolean isDmmWorld = dmm || sdmm; + final boolean dmmt = worldTypes.contains(WorldType.DEADMAN_TOURNAMENT); + final boolean isDmmWorld = dmm || sdmm || dmmt; String playerDir = client.getLocalPlayer().getName(); if (isDmmWorld) 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 2e19d6e8e2..388e1c9124 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 @@ -438,7 +438,8 @@ public class TimersPlugin extends Plugin if (config.showTeleblock() && event.getMessage().equals(HALF_TELEBLOCK_MESSAGE)) { - if (client.getWorldType().contains(WorldType.DEADMAN)) + if (client.getWorldType().contains(WorldType.DEADMAN) + && !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT)) { createGameTimer(DMM_FULLTB); } @@ -649,7 +650,8 @@ public class TimersPlugin extends Plugin if (actor.getGraphic() == BIND.getGraphicId()) { if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN)) + && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN) + && !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT)) { createGameTimer(HALFBIND); } @@ -662,7 +664,8 @@ public class TimersPlugin extends Plugin if (actor.getGraphic() == SNARE.getGraphicId()) { if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN)) + && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN) + && !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT)) { createGameTimer(HALFSNARE); } @@ -675,7 +678,8 @@ public class TimersPlugin extends Plugin if (actor.getGraphic() == ENTANGLE.getGraphicId()) { if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN)) + && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN) + && !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT)) { createGameTimer(HALFENTANGLE); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java index e411024326..a907381347 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java @@ -31,7 +31,8 @@ enum XpWorldType NORMAL, TOURNEY, DMM, - SDMM; + SDMM, + DMMT; static XpWorldType of(WorldType type) { @@ -43,6 +44,8 @@ enum XpWorldType return DMM; case SEASONAL_DEADMAN: return SDMM; + case DEADMAN_TOURNAMENT: + return DMMT; default: return NORMAL; }