Feature: Add Reminder to open Calendar for Temp Mayor (#2009)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
hannibal002 · Jun 8, 2024 · 7e1dc04 · 7e1dc04
1 parent d5667f8
commit 7e1dc04
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -266,6 +266,12 @@ public class MiscConfig {
     @FeatureToggle
     public boolean replaceRomanNumerals = false;
 
+    @Expose
+    @ConfigOption(name = "Unknown Perkpocalypse Mayor Warning", desc = "Show a warning when the Unknown Perkpocalypse Mayor is unknown.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean unknownPerkpocalypseMayorWarning = true;
+
     @ConfigOption(name = "Hide Far Entities", desc = "")
     @Accordion
     @Expose

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.events.DebugDataCollectEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
+import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.APIUtil
 import at.hannibal2.skyhanni.utils.ChatUtils
@@ -44,33 +45,51 @@ import kotlin.time.Duration.Companion.minutes
 object MayorAPI {
 
     private val group = RepoPattern.group("mayorapi")
+
+    // TODO: Add Regex-test
     val foxyExtraEventPattern by group.pattern(
         "foxy.extraevent",
         "Schedules an extra §.(?<event>.*) §.event during the year\\."
     )
+
+    /**
+     * REGEX-TEST: The election room is now closed. Clerk Seraphine is doing a final count of the votes...
+     */
     private val electionOverPattern by group.pattern(
         "election.over",
         "§eThe election room is now closed\\. Clerk Seraphine is doing a final count of the votes\\.\\.\\."
     )
+
+    /**
+     * REGEX-TEST: Calendar and Events
+     */
     private val calendarGuiPattern by group.pattern(
         "calendar.gui",
         "Calendar and Events"
     )
+
+    /**
+     * REGEX-TEST: §dMayor Jerry
+     */
     private val jerryHeadPattern by group.pattern(
         "jerry.head",
         "§dMayor Jerry"
     )
-    // TODO add regex tests
+
+    /**
+     * REGEX-TEST: §9Perkpocalypse Perks:
+     */
     private val perkpocalypsePerksPattern by group.pattern(
         "perkpocalypse",
         "§9Perkpocalypse Perks:"
     )
 
     var currentMayor: Mayor? = null
         private set
+    private var lastMayor: Mayor? = null
     var jerryExtraMayor: Pair<Mayor?, SimpleTimeMark> = null to SimpleTimeMark.farPast()
         private set
-    private var lastMayor: Mayor? = null
+    var lastJerryExtraMayorReminder = SimpleTimeMark.farPast()
 
     private var lastUpdate = SimpleTimeMark.farPast()
     private var dispatcher = Dispatchers.IO
@@ -108,7 +127,16 @@ object MayorAPI {
         if (jerryExtraMayor.first != null && jerryExtraMayor.second.isInPast() && Mayor.JERRY.isActive()) {
             jerryExtraMayor = null to SimpleTimeMark.farPast()
             ChatUtils.clickableChat(
-                "The Perkpocalypse Mayor has expired! Click here to update to the new temporary Mayor.",
+                "The Perkpocalypse Mayor has expired! Click here to update the new temporary Mayor.",
+                onClick = { HypixelCommands.calendar() }
+            )
+        }
+        if (Mayor.JERRY.isActive() && jerryExtraMayor.first == null && SkyHanniMod.feature.misc.unknownPerkpocalypseMayorWarning) {
+            if (lastJerryExtraMayorReminder.passedSince() < 5.minutes) return
+            if (ReminderUtils.isBusy()) return
+            lastJerryExtraMayorReminder = SimpleTimeMark.now()
+            ChatUtils.clickableChat(
+                "The Perkpocalypse Mayor is not known! Click here to update the temporary Mayor.",
                 onClick = { HypixelCommands.calendar() }
             )
         }