aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThunderblade73 <85900443+Thunderblade73@users.noreply.github.com>2024-04-23 22:31:28 +0200
committerGitHub <noreply@github.com>2024-04-23 22:31:28 +0200
commit85f50e4d0c8e22e310cb7f066de3a6f14be624ba (patch)
treeacd664d2fb23c612d3be49d2f815d9e4c5bd6eae /src
parent62cd934e231b6f76c5014c4568237222ba81b3aa (diff)
downloadskyhanni-85f50e4d0c8e22e310cb7f066de3a6f14be624ba.tar.gz
skyhanni-85f50e4d0c8e22e310cb7f066de3a6f14be624ba.tar.bz2
skyhanni-85f50e4d0c8e22e310cb7f066de3a6f14be624ba.zip
Fix: f7 bosses in Mob Detection (#1496)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
index 0f5c1b325..c539ccb31 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
@@ -54,9 +54,19 @@ object MobFilter {
"(?:\\[\\w+(?<level>\\d+)\\] )?(?<corrupted>.Corrupted )?(?<name>[^ᛤ]*)(?: ᛤ)? [\\dBMk.,❤]+"
)
val slayerNameFilter by repoGroup.pattern("filter.slayer", "^. (?<name>.*) (?<tier>[IV]+) \\d+.*")
+
+ /** REGEX-TEST: ﴾ Storm ﴿
+ * REGEX-TEST: ﴾ [Lv200] aMage Outlawa 70M/70M❤ ﴿
+ * REGEX-TEST: ﴾ [Lv500] Magma Boss █████████████████████████ ﴿
+ * REGEX-TEST: ﴾ [Lv200] Bladesoul 50M/50M❤ ﴿
+ * REGEX-TEST: ﴾ [Lv300] Arachne 20,000/20,000❤ ﴿
+ * REGEX-TEST: ﴾ [Lv500] Arachne 100k/100k❤ ﴿
+ * REGEX-TEST: ﴾ [Lv200] Barbarian Duke X 70M/70M❤ ﴿
+ * REGEX-TEST: ﴾ [Lv100] Endstone Protector 4.6M/5M❤ ﴿
+ * */
val bossMobNameFilter by repoGroup.pattern(
"filter.boss",
- "^. (?:\\[\\w+(?<level>\\d+)\\] )?(?<name>[^ᛤ]*)(?: ᛤ)? (?:[\\d\\/BMk.,❤]+|█+) .$"
+ "^. (?:\\[Lv(?<level>\\d+)\\] )?(?<name>[^ᛤ\n]*)(?: ᛤ)?(?: [\\d\\/BMk.,❤]+|█+)? .$"
)
val dungeonNameFilter by repoGroup.pattern(
"filter.dungeon",