From 95029eebcc73feac8842e953239cb71a0c1d1b48 Mon Sep 17 00:00:00 2001 From: martimavocado <39881008+martimavocado@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:04:10 +0000 Subject: Bug Fix: Fix pets menu detection for /ff (#970) Fixing pets menu detection for /ff #970 --- .../skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni') 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(?.*)§6/(?.*)" ) + private val petMenuPattern by patternGroup.pattern( + "petsmenu", + "Pets(?: \\(\\d+/\\d+\\) )?" + ) companion object { private val strengthPattern = " Strength: §r§c❁(?.*)".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) -- cgit