From c5915be522ccfb73feed69b8d0fa1b45420e78e3 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Sun, 13 Oct 2024 15:54:20 +0200 Subject: [PATCH] Improvement: More Inquis messages (#2720) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Co-authored-by: Cal --- .../event/diana/InquisitorWaypointShare.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt index 8e72e37d00f8..96f18ecd8ab4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt @@ -58,6 +58,15 @@ object InquisitorWaypointShare { "party.inquisitorchecker", "(?§9Party §8> )?(?.+)§f: §rA MINOS INQUISITOR has spawned near \\[(?.*)] at Coords (?[^ ]+) (?[^ ]+) (?[^ ]+)" ) + + /** + * REGEX-TEST: §9Party §8> §b[MVP§9+§b] _088§f: §rx: 86, y: 73, z: -29 I dug up an inquisitor come over here! + */ + private val odinPattern by patternGroup.pattern( + "party.odin", + "(?§9Party §8> )?(?.+)§f: §rx: (?[^ ]+), y: (?[^ ]+), z: (?[^ ]+) I dug up an inquisitor come over here!" + ) + private val diedPattern by patternGroup.pattern( "died", "(?§9Party §8> )?(?.*)§f: §rInquisitor dead!" @@ -238,6 +247,11 @@ object InquisitorWaypointShare { event.cancel() } } + odinPattern.matchMatcher(message) { + if (detectFromChat()) { + event.cancel() + } + } partyOnlyCoordsPattern.matchMatcher(message) { if (detectFromChat()) {