From 85f50e4d0c8e22e310cb7f066de3a6f14be624ba Mon Sep 17 00:00:00 2001 From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> Date: Tue, 23 Apr 2024 22:31:28 +0200 Subject: Fix: f7 bosses in Mob Detection (#1496) --- src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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+(?\\d+)\\] )?(?.Corrupted )?(?[^ᛤ]*)(?: ᛤ)? [\\dBMk.,❤]+" ) val slayerNameFilter by repoGroup.pattern("filter.slayer", "^. (?.*) (?[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+(?\\d+)\\] )?(?[^ᛤ]*)(?: ᛤ)? (?:[\\d\\/BMk.,❤]+|█+) .$" + "^. (?:\\[Lv(?\\d+)\\] )?(?[^ᛤ\n]*)(?: ᛤ)?(?: [\\d\\/BMk.,❤]+|█+)? .$" ) val dungeonNameFilter by repoGroup.pattern( "filter.dungeon", -- cgit