diff options
author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-05-29 09:37:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-29 09:37:42 +0200 |
commit | 5c991d02019249a42d8221fe7605f87e46164bb0 (patch) | |
tree | 670bf1e4b7adfcbe2061da904838b1ab5f5b9956 /src/main | |
parent | 8081f9d7a395960880114c4a2fd9f9fb169ff385 (diff) | |
download | skyhanni-5c991d02019249a42d8221fe7605f87e46164bb0.tar.gz skyhanni-5c991d02019249a42d8221fe7605f87e46164bb0.tar.bz2 skyhanni-5c991d02019249a42d8221fe7605f87e46164bb0.zip |
Improvement: Dungeon End Reminder (#1917)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt | 3 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fame/ReminderUtils.kt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt index d3eae0a2b..86def886d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt @@ -46,6 +46,7 @@ object DungeonAPI { var dungeonFloor: String? = null var started = false + var completed = false var inBossRoom = false var playerClass: DungeonClass? = null var playerClassLevel = -1 @@ -206,6 +207,7 @@ object DungeonAPI { isUniqueClass = false playerClass = null playerClassLevel = -1 + completed = false DungeonBlessings.reset() } @@ -230,6 +232,7 @@ object DungeonAPI { return } dungeonComplete.matchMatcher(event.message) { + completed = true DungeonCompleteEvent(floor).postAndCatch() return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/ReminderUtils.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/ReminderUtils.kt index 0cd7bc0da..19e0399ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/ReminderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/ReminderUtils.kt @@ -11,7 +11,7 @@ object ReminderUtils { // TODO: add arachne fight, add slayer boss spawned, add dragon fight fun isBusy(ignoreFarmingContest: Boolean = false): Boolean = - DungeonAPI.inDungeon() || LorenzUtils.inKuudraFight || (FarmingContestAPI.inContest && !ignoreFarmingContest) || + (DungeonAPI.inDungeon() && !DungeonAPI.completed) || LorenzUtils.inKuudraFight || (FarmingContestAPI.inContest && !ignoreFarmingContest) || RiftAPI.inRift() || IslandType.DARK_AUCTION.isInIsland() || IslandType.MINESHAFT.isInIsland() || IslandType.NONE.isInIsland() || IslandType.UNKNOWN.isInIsland() } |