Merge pull request #4683 from deathbeam/add-tourney-world-type

Add Tournament world type
This commit is contained in:
Tomas Slusny
2018-08-05 12:06:29 +02:00
committed by GitHub
4 changed files with 10 additions and 1 deletions

View File

@@ -32,6 +32,7 @@ public enum WorldType
SKILL_TOTAL, SKILL_TOTAL,
PVP_HIGH_RISK, PVP_HIGH_RISK,
LAST_MAN_STANDING, LAST_MAN_STANDING,
TOURNAMENT,
DEADMAN, DEADMAN,
SEASONAL_DEADMAN SEASONAL_DEADMAN
} }

View File

@@ -34,13 +34,14 @@ enum ServiceWorldType
SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7), SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7),
PVP_HIGH_RISK(WorldType.PVP_HIGH_RISK, 1 << 10), PVP_HIGH_RISK(WorldType.PVP_HIGH_RISK, 1 << 10),
LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14), LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14),
TOURNAMENT(WorldType.TOURNAMENT, 1 << 25),
DEADMAN(WorldType.DEADMAN, 1 << 29), DEADMAN(WorldType.DEADMAN, 1 << 29),
SEASONAL_DEADMAN(WorldType.SEASONAL_DEADMAN, 1 << 30); SEASONAL_DEADMAN(WorldType.SEASONAL_DEADMAN, 1 << 30);
private final WorldType apiType; private final WorldType apiType;
private final int mask; private final int mask;
private ServiceWorldType(WorldType apiType, int mask) ServiceWorldType(WorldType apiType, int mask)
{ {
this.apiType = apiType; this.apiType = apiType;
this.mask = mask; this.mask = mask;

View File

@@ -55,6 +55,10 @@ public enum WorldType
* Last man standing world type. * Last man standing world type.
*/ */
LAST_MAN_STANDING(1 << 14), LAST_MAN_STANDING(1 << 14),
/**
* Tournament world type.
*/
TOURNAMENT(1 << 25),
/** /**
* Deadman world type. * Deadman world type.
*/ */

View File

@@ -29,6 +29,7 @@ import net.runelite.api.WorldType;
enum XpWorldType enum XpWorldType
{ {
NORMAL, NORMAL,
TOURNEY,
DMM, DMM,
SDMM; SDMM;
@@ -36,6 +37,8 @@ enum XpWorldType
{ {
switch (type) switch (type)
{ {
case TOURNAMENT:
return TOURNEY;
case DEADMAN: case DEADMAN:
return DMM; return DMM;
case SEASONAL_DEADMAN: case SEASONAL_DEADMAN: