From 14ebdfce401ff955d6d00bf00684ac1058d26259 Mon Sep 17 00:00:00 2001
From: Planterror <47764567+Plantterror@users.noreply.github.com>
Date: Sat, 11 Mar 2023 07:55:22 -0700
Subject: Merge pull request #624

* fixed experiments saying it's available when the wrong time is reached

* NPC Buy limit timer part 1

* Cookie buff now gains more accurate info

* scrapped accurate god potion

* small tweaks

* fix stupid mistakes I made

* fixed commissions never being recognized as completed

* Quest timer now shows how many quests are uncompleted

* added cookie menu as place to test for cookie buff

* accept review changes, add .intern to container name

* proper formatting hopefully

* restrict checking quest progress to crimson isle

* fix election candidates counting as CI quests

* paul's name twice whoops, formatting fixes

* Merge pull request #2 from Plantterror/master

* Fixed an NPE
---
 src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
index a89b281d..9d2d1056 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
@@ -308,7 +308,8 @@ public class SBInfo {
 
 	private static final String profilePrefix = "\u00a7r\u00a7e\u00a7lProfile: \u00a7r\u00a7a";
 	private static final String skillsPrefix = "\u00a7r\u00a7e\u00a7lSkills: \u00a7r\u00a7a";
-	private static final String completedFactionQuests = "\u00a7r \u00a7r\u00a7a";
+	private static final String completedFactionQuests =
+		"\u00a7r \u00a7r\u00a7a(?!(Paul|Finnegan|Aatrox|Cole|Diana|Diaz|Foxy|Marina)).*";
 	public ArrayList<String> completedQuests = new ArrayList<>();
 
 	private static final Pattern SKILL_LEVEL_PATTERN = Pattern.compile("([^0-9:]+) (\\d{1,2})");
@@ -353,7 +354,7 @@ public class SBInfo {
 						} catch (Exception ignored) {
 						}
 					}
-				} else if (name.startsWith(completedFactionQuests)) {
+				} else if (name.matches(completedFactionQuests) && "crimson_isle".equals(mode)) {
 					if (completedQuests.isEmpty()) {
 						completedQuests.add(name);
 					} else if (!completedQuests.contains(name)) {
-- 
cgit