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

Merge pull request #6881 from Nightfirecat/add-dmmt-worldtypes

Browse Source 
Add DMMT world types, handle them in plugins, update SDMM teleblock timers
This commit is contained in:
Adam
2018-12-09 12:19:43 -05:00
committed by GitHub
parent e83e5024ce 7b7a0018b0
commit 3470cdbb9c
9 changed files with 32 additions and 11 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;
}
EnumSet<WorldType> worldType = client.getWorldType();
if (worldType.contains(WorldType.SEASONAL_DEADMAN))
final EnumSet<WorldType> worldType = client.getWorldType();
if (worldType.contains(WorldType.DEADMAN_TOURNAMENT))
{
hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT;
}
else if (worldType.contains(WorldType.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 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)

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

@@ -448,7 +448,9 @@ 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.SEASONAL_DEADMAN)
&& !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT))
{
createGameTimer(DMM_FULLTB);
}
@@ -673,7 +675,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);
}
@@ -686,7 +689,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);
}
@@ -699,7 +703,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);
}

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

@@ -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;
}