ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Handle Deadman Tournament world type in plugins

Browse Source
This commit is contained in:
Jordan Atwood
2018-12-08 17:43:32 -08:00
parent 716144ff87
commit 374df55e41
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
View File

@@ -108,8 +108,12 @@ public class OpponentInfoPlugin extends Plugin
return; return;
} }
EnumSet<WorldType> worldType = client.getWorldType(); final EnumSet<WorldType> worldType = client.getWorldType();
if (worldType.contains(WorldType.SEASONAL_DEADMAN)) if (worldType.contains(WorldType.DEADMAN_TOURNAMENT))
{
hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT;
}
else if (worldType.contains(WorldType.SEASONAL_DEADMAN))
{ {
hiscoreEndpoint = HiscoreEndpoint.SEASONAL_DEADMAN; hiscoreEndpoint = HiscoreEndpoint.SEASONAL_DEADMAN;
} }

3
runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
View File

@@ -555,7 +555,8 @@ public class ScreenshotPlugin extends Plugin
final EnumSet<WorldType> worldTypes = client.getWorldType(); final EnumSet<WorldType> worldTypes = client.getWorldType();
final boolean dmm = worldTypes.contains(WorldType.DEADMAN); final boolean dmm = worldTypes.contains(WorldType.DEADMAN);
final boolean sdmm = worldTypes.contains(WorldType.SEASONAL_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(); String playerDir = client.getLocalPlayer().getName();
if (isDmmWorld) if (isDmmWorld)

12
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -438,7 +438,8 @@ public class TimersPlugin extends Plugin
if (config.showTeleblock() && event.getMessage().equals(HALF_TELEBLOCK_MESSAGE)) 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); createGameTimer(DMM_FULLTB);
} }
@@ -649,7 +650,8 @@ public class TimersPlugin extends Plugin
if (actor.getGraphic() == BIND.getGraphicId()) if (actor.getGraphic() == BIND.getGraphicId())
{ {
if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) 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); createGameTimer(HALFBIND);
} }
@@ -662,7 +664,8 @@ public class TimersPlugin extends Plugin
if (actor.getGraphic() == SNARE.getGraphicId()) if (actor.getGraphic() == SNARE.getGraphicId())
{ {
if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) 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); createGameTimer(HALFSNARE);
} }
@@ -675,7 +678,8 @@ public class TimersPlugin extends Plugin
if (actor.getGraphic() == ENTANGLE.getGraphicId()) if (actor.getGraphic() == ENTANGLE.getGraphicId())
{ {
if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) 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); createGameTimer(HALFENTANGLE);
} }

5
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java
View File

@@ -31,7 +31,8 @@ enum XpWorldType
NORMAL, NORMAL,
TOURNEY, TOURNEY,
DMM, DMM,
SDMM; SDMM,
DMMT;
static XpWorldType of(WorldType type) static XpWorldType of(WorldType type)
{ {
@@ -43,6 +44,8 @@ enum XpWorldType
return DMM; return DMM;
case SEASONAL_DEADMAN: case SEASONAL_DEADMAN:
return SDMM; return SDMM;
case DEADMAN_TOURNAMENT:
return DMMT;
default: default:
return NORMAL; return NORMAL;
} }