aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-08-31 21:07:55 +0200
committerGitHub <noreply@github.com>2024-08-31 21:07:55 +0200
commitc1c3fcc963bbf79f75e33a9383431784f36bdf36 (patch)
tree784ed106691db5228803590ed73fe7eeed392e26 /src/main/java/at/hannibal2
parent8ac1f15304f50dc5c2e973dbae5bd7b1a0a31bd1 (diff)
downloadskyhanni-c1c3fcc963bbf79f75e33a9383431784f36bdf36.tar.gz
skyhanni-c1c3fcc963bbf79f75e33a9383431784f36bdf36.tar.bz2
skyhanni-c1c3fcc963bbf79f75e33a9383431784f36bdf36.zip
Fix: Autopet Rule Detection (#2430)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt7
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
index d6005776f..70638619b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experiments/GuardianReminder.kt
@@ -37,9 +37,14 @@ object GuardianReminder {
"mainmenu",
"Experimentation Table",
)
+
+ /**
+ * REGEX-TEST: §dGuardian
+ * REGEX-TEST: §9Guardian§e
+ */
private val petNamePattern by patternGroup.pattern(
"guardianpet",
- "§[956d]Guardian",
+ "§[956d]Guardian.*",
)
@SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
index f0fef91de..1c93d6b3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
@@ -35,9 +35,14 @@ object CurrentPetDisplay {
"chat.despawn",
"§aYou despawned your §r.*§r§a!"
)
+
+ /**
+ * REGEX-TEST: §cAutopet §eequipped your §7[Lvl 100] §6Griffin§4 ✦§e! §a§lVIEW RULE
+ * REGEX-TEST: §cAutopet §eequipped your §7[Lvl 100] §6Elephant§e! §a§lVIEW RULE
+ */
private val chatPetRulePattern by patternGroup.pattern(
"chat.rule",
- "§cAutopet §eequipped your §7\\[Lvl .*] (?<pet>.*)! §a§lVIEW RULE"
+ "§cAutopet §eequipped your §7\\[Lvl .*] (?<pet>.*)§e! §a§lVIEW RULE"
)
@SubscribeEvent