aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/gui
diff options
context:
space:
mode:
authorMTOnline69 <97001154+MTOnline69@users.noreply.github.com>2024-09-12 09:21:53 +0100
committerGitHub <noreply@github.com>2024-09-12 10:21:53 +0200
commit4e23db746f35965b84f8dd5be19b9883c67d8add (patch)
tree3df56c12f7e3766c33c64eb309136367e3009a42 /src/main/java/at/hannibal2/skyhanni/features/gui
parent996b70464766ca017de65b85b0574b0ed6eccab4 (diff)
downloadskyhanni-4e23db746f35965b84f8dd5be19b9883c67d8add.tar.gz
skyhanni-4e23db746f35965b84f8dd5be19b9883c67d8add.tar.bz2
skyhanni-4e23db746f35965b84f8dd5be19b9883c67d8add.zip
Feature: Broodmother alerts/messages and damage indicator support (#2325)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/gui')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
index efe7c953d..9f3c009e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.gui.customscoreboard
import at.hannibal2.skyhanni.data.HypixelData
import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.features.combat.SpidersDenAPI.isAtTopOfNest
import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.eventsConfig
import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.VOTING
@@ -121,7 +122,7 @@ enum class ScoreboardEvent(
),
BROODMOTHER(
::getBroodmotherLines,
- ::getBroodmotherShowWhen,
+ ::isAtTopOfNest,
"§4Broodmother§7: §eDormant",
),
MINING_EVENTS(
@@ -441,8 +442,6 @@ private fun getSoonEventShowWhen(): Boolean =
private fun getBroodmotherLines(): List<String> =
listOf(getSbLines().first { SbPattern.broodmotherPattern.matches(it) })
-private fun getBroodmotherShowWhen(): Boolean = getSbLines().any { SbPattern.broodmotherPattern.matches(it) }
-
private fun getMiningEventsLines() = buildList {
// Wind
if (getSbLines().any { SbPattern.windCompassPattern.matches(it) }