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

screenshot plugin: Add Challenge Mode raid support

Browse Source 
Signed-off-by: Will Thomas <github@willthoms.org.uk>
This commit is contained in:
Will Thomas
2019-02-14 18:56:21 +00:00
parent 1b50e24738
commit 463e1d0da2
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,6 +145,8 @@ public class ScreenshotPlugin extends Plugin
private Integer chambersOfXericNumber; private Integer chambersOfXericNumber;
private Integer chambersOfXericChallengeNumber;
private Integer theatreOfBloodNumber; private Integer theatreOfBloodNumber;
private boolean shouldTakeScreenshot; private boolean shouldTakeScreenshot;
@@ -347,6 +349,16 @@ public class ScreenshotPlugin extends Plugin
} }
} }
if (chatMessage.startsWith("Your completed Chambers of Xeric Challenge Mode count is:"))
{
Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage));
if (m.find())
{
chambersOfXericChallengeNumber = Integer.valueOf(m.group());
return;
}
}
if (chatMessage.startsWith("Your completed Theatre of Blood count is:")) if (chatMessage.startsWith("Your completed Theatre of Blood count is:"))
{ {
Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage)); Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage));
@@ -453,14 +465,22 @@ public class ScreenshotPlugin extends Plugin
} }
case CHAMBERS_OF_XERIC_REWARD_GROUP_ID: case CHAMBERS_OF_XERIC_REWARD_GROUP_ID:
{ {
if (chambersOfXericNumber == null) if (chambersOfXericNumber != null)
{
fileName = "Chambers of Xeric(" + chambersOfXericNumber + ")";
chambersOfXericNumber = null;
break;
}
else if (chambersOfXericChallengeNumber != null)
{
fileName = "Chambers of Xeric Challenge Mode(" + chambersOfXericChallengeNumber + ")";
chambersOfXericChallengeNumber = null;
break;
}
else
{ {
return; return;
} }
fileName = "Chambers of Xeric(" + chambersOfXericNumber + ")";
chambersOfXericNumber = null;
break;
} }
case THEATRE_OF_BLOOD_REWARD_GROUP_ID: case THEATRE_OF_BLOOD_REWARD_GROUP_ID:
{ {
@@ -720,6 +740,12 @@ public class ScreenshotPlugin extends Plugin
return chambersOfXericNumber; return chambersOfXericNumber;
} }
@VisibleForTesting
int getChambersOfXericChallengeNumber()
{
return chambersOfXericChallengeNumber;
}
@VisibleForTesting @VisibleForTesting
int gettheatreOfBloodNumber() int gettheatreOfBloodNumber()
{ {