Remove SEASONAL_DEADMAN world type
Co-authored-by: Hydrox6 <ikada@protonmail.ch>
This commit is contained in:
@@ -35,7 +35,6 @@ public enum HiscoreEndpoint
|
|||||||
HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"),
|
HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"),
|
||||||
ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"),
|
ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"),
|
||||||
DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"),
|
DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"),
|
||||||
SEASONAL_DEADMAN("Seasonal Deadman", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.ws"),
|
|
||||||
DEADMAN_TOURNAMENT("Deadman Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws");
|
DEADMAN_TOURNAMENT("Deadman Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws");
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|||||||
@@ -34,6 +34,5 @@ public enum WorldType
|
|||||||
LAST_MAN_STANDING,
|
LAST_MAN_STANDING,
|
||||||
TOURNAMENT,
|
TOURNAMENT,
|
||||||
DEADMAN,
|
DEADMAN,
|
||||||
SEASONAL_DEADMAN,
|
|
||||||
DEADMAN_TOURNAMENT
|
DEADMAN_TOURNAMENT
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,8 +36,7 @@ enum ServiceWorldType
|
|||||||
LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14),
|
LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14),
|
||||||
TOURNAMENT(WorldType.TOURNAMENT, 1 << 25),
|
TOURNAMENT(WorldType.TOURNAMENT, 1 << 25),
|
||||||
DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26),
|
DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26),
|
||||||
DEADMAN(WorldType.DEADMAN, 1 << 29),
|
DEADMAN(WorldType.DEADMAN, 1 << 29);
|
||||||
SEASONAL_DEADMAN(WorldType.SEASONAL_DEADMAN, 1 << 30);
|
|
||||||
|
|
||||||
private final WorldType apiType;
|
private final WorldType apiType;
|
||||||
private final int mask;
|
private final int mask;
|
||||||
|
|||||||
@@ -67,11 +67,7 @@ public enum WorldType
|
|||||||
/**
|
/**
|
||||||
* Deadman world type.
|
* Deadman world type.
|
||||||
*/
|
*/
|
||||||
DEADMAN(1 << 29),
|
DEADMAN(1 << 29);
|
||||||
/**
|
|
||||||
* Seasonal deadman world type.
|
|
||||||
*/
|
|
||||||
SEASONAL_DEADMAN(1 << 30);
|
|
||||||
|
|
||||||
private final int mask;
|
private final int mask;
|
||||||
|
|
||||||
@@ -83,8 +79,7 @@ public enum WorldType
|
|||||||
private static final EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
|
private static final EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
|
||||||
DEADMAN,
|
DEADMAN,
|
||||||
DEADMAN_TOURNAMENT,
|
DEADMAN_TOURNAMENT,
|
||||||
PVP,
|
PVP
|
||||||
SEASONAL_DEADMAN
|
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -651,10 +651,6 @@ public class HiscorePanel extends PluginPanel
|
|||||||
{
|
{
|
||||||
return HiscoreEndpoint.DEADMAN_TOURNAMENT;
|
return HiscoreEndpoint.DEADMAN_TOURNAMENT;
|
||||||
}
|
}
|
||||||
else if (wTypes.contains(WorldType.SEASONAL_DEADMAN))
|
|
||||||
{
|
|
||||||
return HiscoreEndpoint.SEASONAL_DEADMAN;
|
|
||||||
}
|
|
||||||
else if (wTypes.contains(WorldType.DEADMAN))
|
else if (wTypes.contains(WorldType.DEADMAN))
|
||||||
{
|
{
|
||||||
return HiscoreEndpoint.DEADMAN;
|
return HiscoreEndpoint.DEADMAN;
|
||||||
|
|||||||
@@ -117,10 +117,6 @@ public class OpponentInfoPlugin extends Plugin
|
|||||||
{
|
{
|
||||||
hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT;
|
hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT;
|
||||||
}
|
}
|
||||||
else if (worldType.contains(WorldType.SEASONAL_DEADMAN))
|
|
||||||
{
|
|
||||||
hiscoreEndpoint = HiscoreEndpoint.SEASONAL_DEADMAN;
|
|
||||||
}
|
|
||||||
else if (worldType.contains(WorldType.DEADMAN))
|
else if (worldType.contains(WorldType.DEADMAN))
|
||||||
{
|
{
|
||||||
hiscoreEndpoint = HiscoreEndpoint.DEADMAN;
|
hiscoreEndpoint = HiscoreEndpoint.DEADMAN;
|
||||||
|
|||||||
@@ -616,9 +616,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 dmmt = worldTypes.contains(WorldType.DEADMAN_TOURNAMENT);
|
final boolean dmmt = worldTypes.contains(WorldType.DEADMAN_TOURNAMENT);
|
||||||
final boolean isDmmWorld = dmm || sdmm || dmmt;
|
final boolean isDmmWorld = dmm || dmmt;
|
||||||
|
|
||||||
String playerDir = client.getLocalPlayer().getName();
|
String playerDir = client.getLocalPlayer().getName();
|
||||||
if (isDmmWorld)
|
if (isDmmWorld)
|
||||||
|
|||||||
@@ -542,7 +542,6 @@ public class TimersPlugin extends Plugin
|
|||||||
else if (HALF_TELEBLOCK_PATTERN.matcher(event.getMessage()).find())
|
else if (HALF_TELEBLOCK_PATTERN.matcher(event.getMessage()).find())
|
||||||
{
|
{
|
||||||
if (client.getWorldType().contains(WorldType.DEADMAN)
|
if (client.getWorldType().contains(WorldType.DEADMAN)
|
||||||
&& !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN)
|
|
||||||
&& !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT))
|
&& !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT))
|
||||||
{
|
{
|
||||||
createGameTimer(DMM_FULLTB);
|
createGameTimer(DMM_FULLTB);
|
||||||
|
|||||||
@@ -245,8 +245,7 @@ class WorldTableRow extends JPanel
|
|||||||
}
|
}
|
||||||
else if (world.getTypes().contains(WorldType.PVP)
|
else if (world.getTypes().contains(WorldType.PVP)
|
||||||
|| world.getTypes().contains(WorldType.HIGH_RISK)
|
|| world.getTypes().contains(WorldType.HIGH_RISK)
|
||||||
|| world.getTypes().contains(WorldType.DEADMAN)
|
|| world.getTypes().contains(WorldType.DEADMAN))
|
||||||
|| world.getTypes().contains(WorldType.SEASONAL_DEADMAN))
|
|
||||||
{
|
{
|
||||||
activityField.setForeground(DANGEROUS_WORLD);
|
activityField.setForeground(DANGEROUS_WORLD);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ enum XpWorldType
|
|||||||
NORMAL,
|
NORMAL,
|
||||||
TOURNEY,
|
TOURNEY,
|
||||||
DMM,
|
DMM,
|
||||||
SDMM,
|
|
||||||
DMMT;
|
DMMT;
|
||||||
|
|
||||||
static XpWorldType of(WorldType type)
|
static XpWorldType of(WorldType type)
|
||||||
@@ -42,8 +41,6 @@ enum XpWorldType
|
|||||||
return TOURNEY;
|
return TOURNEY;
|
||||||
case DEADMAN:
|
case DEADMAN:
|
||||||
return DMM;
|
return DMM;
|
||||||
case SEASONAL_DEADMAN:
|
|
||||||
return SDMM;
|
|
||||||
case DEADMAN_TOURNAMENT:
|
case DEADMAN_TOURNAMENT:
|
||||||
return DMMT;
|
return DMMT;
|
||||||
default:
|
default:
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 311 B |
Reference in New Issue
Block a user