diff options
author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-10-13 15:54:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-13 15:54:20 +0200 |
commit | c5915be522ccfb73feed69b8d0fa1b45420e78e3 (patch) | |
tree | 0fd6af41c1614fd4d060d63ae2c02c5a6093d182 | |
parent | e0ae2e8ad4602b3e96fb6ec39716709f225d2461 (diff) | |
download | skyhanni-c5915be522ccfb73feed69b8d0fa1b45420e78e3.tar.gz skyhanni-c5915be522ccfb73feed69b8d0fa1b45420e78e3.tar.bz2 skyhanni-c5915be522ccfb73feed69b8d0fa1b45420e78e3.zip |
Improvement: More Inquis messages (#2720)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt | 14 |
1 files changed, 14 insertions, 0 deletions
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 8e72e37d0..96f18ecd8 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", "(?<party>§9Party §8> )?(?<playerName>.+)§f: §rA MINOS INQUISITOR has spawned near \\[(?<area>.*)] at Coords (?<x>[^ ]+) (?<y>[^ ]+) (?<z>[^ ]+)" ) + + /** + * 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", + "(?<party>§9Party §8> )?(?<playerName>.+)§f: §rx: (?<x>[^ ]+), y: (?<y>[^ ]+), z: (?<z>[^ ]+) I dug up an inquisitor come over here!" + ) + private val diedPattern by patternGroup.pattern( "died", "(?<party>§9Party §8> )?(?<playerName>.*)§f: §rInquisitor dead!" @@ -238,6 +247,11 @@ object InquisitorWaypointShare { event.cancel() } } + odinPattern.matchMatcher(message) { + if (detectFromChat()) { + event.cancel() + } + } partyOnlyCoordsPattern.matchMatcher(message) { if (detectFromChat()) { |