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

screenshot plugin: block untradeable drops within the Gauntlet

Browse Source 
Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com>
This commit is contained in:
Damen
2020-05-13 16:34:46 -04:00
committed by GitHub
parent 7c9e193f80
commit 4817d8bdcd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,8 @@ public class ScreenshotPlugin extends Plugin
{ {
private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!"; private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!";
private static final Map<Integer, String> CHEST_LOOT_EVENTS = ImmutableMap.of(12127, "The Gauntlet"); private static final Map<Integer, String> CHEST_LOOT_EVENTS = ImmutableMap.of(12127, "The Gauntlet");
private static final int GAUNTLET_REGION = 7512;
private static final int CORRUPTED_GAUNTLET_REGION = 7768;
private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)"); private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)");
private static final Pattern LEVEL_UP_PATTERN = Pattern.compile(".*Your ([a-zA-Z]+) (?:level is|are)? now (\\d+)\\."); private static final Pattern LEVEL_UP_PATTERN = Pattern.compile(".*Your ([a-zA-Z]+) (?:level is|are)? now (\\d+)\\.");
private static final Pattern BOSSKILL_MESSAGE_PATTERN = Pattern.compile("Your (.+) kill count is: <col=ff0000>(\\d+)</col>."); private static final Pattern BOSSKILL_MESSAGE_PATTERN = Pattern.compile("Your (.+) kill count is: <col=ff0000>(\\d+)</col>.");
@@ -401,7 +403,7 @@ public class ScreenshotPlugin extends Plugin
} }
} }
if (config.screenshotUntradeableDrop()) if (config.screenshotUntradeableDrop() && !isInsideGauntlet())
{ {
Matcher m = UNTRADEABLE_DROP_PATTERN.matcher(chatMessage); Matcher m = UNTRADEABLE_DROP_PATTERN.matcher(chatMessage);
if (m.matches()) if (m.matches())
@@ -638,6 +640,14 @@ public class ScreenshotPlugin extends Plugin
imageCapture.takeScreenshot(screenshot, fileName, subDir, config.notifyWhenTaken(), config.uploadScreenshot()); imageCapture.takeScreenshot(screenshot, fileName, subDir, config.notifyWhenTaken(), config.uploadScreenshot());
} }
private boolean isInsideGauntlet()
{
return this.client.isInInstancedRegion()
&& this.client.getMapRegions().length > 0
&& (this.client.getMapRegions()[0] == GAUNTLET_REGION
|| this.client.getMapRegions()[0] == CORRUPTED_GAUNTLET_REGION);
}
@VisibleForTesting @VisibleForTesting
int getClueNumber() int getClueNumber()
{ {