aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authormartimavocado <39881008+martimavocado@users.noreply.github.com>2024-02-05 11:04:10 +0000
committerGitHub <noreply@github.com>2024-02-05 12:04:10 +0100
commit95029eebcc73feac8842e953239cb71a0c1d1b48 (patch)
tree0ad09a7d571db9121a577cdd9af9085d16bfbb13 /src/main/java
parent426fb7ed6d266f14ff98c61c5346955b5b3fdc3b (diff)
downloadskyhanni-95029eebcc73feac8842e953239cb71a0c1d1b48.tar.gz
skyhanni-95029eebcc73feac8842e953239cb71a0c1d1b48.tar.bz2
skyhanni-95029eebcc73feac8842e953239cb71a0c1d1b48.zip
Bug Fix: Fix pets menu detection for /ff (#970)
Fixing pets menu detection for /ff #970
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index dd457688a..f93192a3d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -49,6 +49,10 @@ class CaptureFarmingGear {
"uniquevisitors.tierprogress",
".* §e(?<having>.*)§6/(?<total>.*)"
)
+ private val petMenuPattern by patternGroup.pattern(
+ "petsmenu",
+ "Pets(?: \\(\\d+/\\d+\\) )?"
+ )
companion object {
private val strengthPattern = " Strength: §r§c❁(?<strength>.*)".toPattern()
@@ -127,9 +131,12 @@ class CaptureFarmingGear {
val farmingItems = farmingItems ?: return
val outdatedItems = outdatedItems ?: return
val items = event.inventoryItems
+ petMenuPattern.matchMatcher(event.inventoryName) {
+ pets(farmingItems, items, outdatedItems)
+ return
+ }
when (event.inventoryName) {
"Your Equipment and Stats" -> equipmentAndStats(items, farmingItems, outdatedItems)
- "Pets" -> pets(farmingItems, items, outdatedItems)
"Your Skills" -> skills(items, storage)
"Community Shop" -> communityShop(items)
"Configure Plots" -> configurePlots(items, storage)