From 463e1d0da20d2386df5cb7d13d6f53ecfe417745 Mon Sep 17 00:00:00 2001
From: Will Thomas <github@willthoms.org.uk>
Date: Thu, 14 Feb 2019 18:56:21 +0000
Subject: [PATCH] screenshot plugin: Add Challenge Mode raid support

Signed-off-by: Will Thomas <github@willthoms.org.uk>
---
 .../plugins/screenshot/ScreenshotPlugin.java  | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
index e4c6fd2ec9..ee78f3cc22 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
@@ -145,6 +145,8 @@ public class ScreenshotPlugin extends Plugin
 
 	private Integer chambersOfXericNumber;
 
+	private Integer chambersOfXericChallengeNumber;
+
 	private Integer theatreOfBloodNumber;
 
 	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:"))
 		{
 			Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage));
@@ -453,14 +465,22 @@ public class ScreenshotPlugin extends Plugin
 			}
 			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;
 				}
-
-				fileName = "Chambers of Xeric(" + chambersOfXericNumber + ")";
-				chambersOfXericNumber = null;
-				break;
 			}
 			case THEATRE_OF_BLOOD_REWARD_GROUP_ID:
 			{
@@ -720,6 +740,12 @@ public class ScreenshotPlugin extends Plugin
 		return chambersOfXericNumber;
 	}
 
+	@VisibleForTesting
+	int getChambersOfXericChallengeNumber()
+	{
+		return chambersOfXericChallengeNumber;
+	}
+
 	@VisibleForTesting
 	int gettheatreOfBloodNumber()
 	{