fix(api): fix event bounties and improve perf

aentwist · Aug 1, 2024 · 4259c29 · 4259c29
1 parent 0ca7f24
commit 4259c29
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/api/autoafk/activities.py b/api/autoafk/activities.py
@@ -160,14 +160,16 @@ def dispatch_bounties(settings: DispatchBountiesSettings) -> None:
         touch_img_when_visible("buttons/dispatch")
         touch_img_when_visible("buttons/confirm")
 
-    # TODO::imgs-untested
-    if settings["event_bounties"]:
-        if touch_img_wait("labels/event_bounty"):
-            touch_img_wait("buttons/collect_all", seconds=2)
-            while touch_img_wait("buttons/dispatch_bounties"):
-                touch_xy_wait(530, 1030, seconds=2)
-                touch_xy_wait(120, 1500)
-                touch_img_wait("buttons/dispatch", confidence=0.8, grayscale=True)
+    if settings["event_bounties"] and touch_img_when_visible(
+        "labels/event_bounty", timeout_s=0.1
+    ):
+        touch_img_when_visible("buttons/collect_all", timeout_s=1)
+        while touch_img_when_visible_after_wait(
+            "buttons/dispatch_bounties", timeout_s=1, seconds=0.1
+        ):
+            touch_xy_after_wait(530, 1030, seconds=0.25)
+            touch_xy_after_wait(120, 1500, seconds=0.25)
+            touch_img_when_visible("buttons/dispatch")
 
     logger.info("Bounties dispatched")
 

diff --git a/api/autoafk/img/labels/event_bounty.png b/api/autoafk/img/labels/event_bounty.png
diff --git a/api/test/ss-imgs-map.json b/api/test/ss-imgs-map.json
@@ -54,6 +54,7 @@
   "dark-forest/bounty-board/solo-dispatch": ["buttons/dispatch"],
   "dark-forest/bounty-board/team-collect": ["buttons/collect_all"],
   "dark-forest/bounty-board/team": ["buttons/dispatch", "buttons/back"],
+  "dark-forest/bounty-board/team-with-event": ["labels/event_bounty"],
   "dark-forest/bounty-board/team-dispatch": ["buttons/confirm"],
   "dark-forest/roamer": ["buttons/exitmenu"],
   "dark-forest/towers/kings-tower": ["buttons/back"],

diff --git a/api/test/ss/dark-forest/bounty-board/team-with-event.png b/api/test/ss/dark-forest/bounty-board/team-with-event.png