From 619d6f743c552be04f16dad45142533c39c2ec21 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:40:47 +0300
Subject: Fix prestige highlight not updating after a prestige

---
 .../skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java     | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
index 02e0e8af..176752fd 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
@@ -149,6 +149,7 @@ public class ChocolateFactorySolver extends ContainerSolver {
 			if (NumberUtils.isParsable(amountString)) {
 				requiredUntilNextPrestige = Long.parseLong(amountString) - currentChocolate.getAsLong();
 			}
+			canPrestige = false;
 		} else if (prestigeLore.endsWith("Click to prestige!")) {
 			canPrestige = true;
 			reachedMaxPrestige = false;
-- 
cgit 


From a5b0a8dee8a139dea47ef45f23f26cd010a8d7c5 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Thu, 6 Jun 2024 16:26:16 +0300
Subject: Fix time tower multiplier being wrong in the case of +0.7x multiplier
 from mythic rabbits

---
 .../skyblock/chocolatefactory/ChocolateFactorySolver.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
index 176752fd..69d2e532 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
@@ -36,6 +36,7 @@ public class ChocolateFactorySolver extends ContainerSolver {
 	private static final Pattern CHOCOLATE_PATTERN = Pattern.compile("^([\\d,]+) Chocolate$");
 	private static final Pattern PRESTIGE_REQUIREMENT_PATTERN = Pattern.compile("Chocolate this Prestige: ([\\d,]+) +Requires (\\S+) Chocolate this Prestige!");
 	private static final Pattern TIME_TOWER_STATUS_PATTERN = Pattern.compile("Status: (ACTIVE|INACTIVE)");
+	private static final Pattern TIME_TOWER_MULTIPLIER_PATTERN = Pattern.compile("by \\+([\\d.]+)x for \\dh\\.");
 
 	private static final ObjectArrayList<Rabbit> cpsIncreaseFactors = new ObjectArrayList<>(8);
 	private static long totalChocolate = -1L;
@@ -160,9 +161,11 @@ public class ChocolateFactorySolver extends ContainerSolver {
 
 		//Time Tower is in slot 39
 		isTimeTowerMaxed = StringUtils.substringAfterLast(slots.get(TIME_TOWER_SLOT).getName().getString(), ' ').equals("XV");
-		timeTowerMultiplier = RomanNumerals.romanToDecimal(StringUtils.substringAfterLast(slots.get(TIME_TOWER_SLOT).getName().getString(), ' ')) / 10.0; //The name holds the level, which is multiplier * 10 in roman numerals
-		Matcher timeTowerStatusMatcher = TIME_TOWER_STATUS_PATTERN.matcher(getConcatenatedLore(slots.get(TIME_TOWER_SLOT)));
-		if (timeTowerStatusMatcher.find()) {
+		String timeTowerLore = getConcatenatedLore(slots.get(TIME_TOWER_SLOT));
+		Matcher timeTowerMultiplierMatcher = TIME_TOWER_MULTIPLIER_PATTERN.matcher(timeTowerLore);
+		RegexUtils.getDoubleFromMatcher(timeTowerMultiplierMatcher).ifPresent(d -> timeTowerMultiplier = d);
+		Matcher timeTowerStatusMatcher = TIME_TOWER_STATUS_PATTERN.matcher(timeTowerLore);
+		if (timeTowerStatusMatcher.find(timeTowerMultiplierMatcher.hasMatch() ? timeTowerMultiplierMatcher.end() : 0)) {
 			isTimeTowerActive = timeTowerStatusMatcher.group(1).equals("ACTIVE");
 		}
 
-- 
cgit 


From 33f4ef7ba9d2b4ea6c54fc9d821010efdcb0c0df Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:20:53 +0300
Subject: Fix time tower reminder being sent multiple times

---
 .../skyblocker/skyblock/chocolatefactory/TimeTowerReminder.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/TimeTowerReminder.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/TimeTowerReminder.java
index c679f152..6ed11676 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/TimeTowerReminder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/TimeTowerReminder.java
@@ -83,6 +83,9 @@ public class TimeTowerReminder {
 		}
 
 		if (System.currentTimeMillis() - time >= 60 * 60 * 1000) sendMessage();
-		else Scheduler.INSTANCE.schedule(TimeTowerReminder::sendMessage, 60 * 60 * 20 - (int) ((System.currentTimeMillis() - time) / 50)); // 50 milliseconds is 1 tick
+		else {
+			Scheduler.INSTANCE.schedule(TimeTowerReminder::sendMessage, 60 * 60 * 20 - (int) ((System.currentTimeMillis() - time) / 50)); // 50 milliseconds is 1 tick
+			scheduled = true;
+		}
 	}
 }
-- 
cgit