fix(api): update autopush

aentwist · Jan 10, 2025 · c9a6cbb · c9a6cbb
1 parent d062ca8
commit c9a6cbb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/api/autoafk/activities.py b/api/autoafk/activities.py
@@ -466,9 +466,14 @@ def run_autobattle(settings: PushSettings, open_mode: Callable[[], None]) -> Non
             touch_img_when_visible("buttons/tryagain")
 
             # Clear popup spam. These episodes occur about every 20 stages.
+            # For campaign, they show up here.
             touch_img_when_visible("labels/tap-anywhere-to-close", timeout_s=3)
 
             config_battle_formation(settings)
+
+            # Annoyingly, for tower, they show up here.
+            touch_img_when_visible("labels/tap-anywhere-to-close", timeout_s=3)
+
             touch_img_when_visible("buttons/autobattle")
             touch_img_when_visible("buttons/activate")
 
@@ -478,6 +483,8 @@ def run_autobattle(settings: PushSettings, open_mode: Callable[[], None]) -> Non
 
 
 def open_tower(tower: str) -> None:
+    reset_to_screen(Screen.DARK_FOREST)
+
     touch_xy(500, 870)
     wait_until_img_visible("labels/kingstower")
     wait()

diff --git a/api/autoafk/img/buttons/autobattle.png b/api/autoafk/img/buttons/autobattle.png
diff --git a/api/autoafk/img/buttons/darkforest_unselected.png b/api/autoafk/img/buttons/darkforest_unselected.png
diff --git a/api/test/ss-imgs-map.json b/api/test/ss-imgs-map.json
@@ -27,18 +27,19 @@
   "campaign/multi-battle": [
     "buttons/heroclassselect",
     "buttons/beginbattle",
+    "buttons/autobattle",
     "buttons/back"
   ],
   "campaign/single-battle": [
     "buttons/heroclassselect",
     "buttons/battle",
+    "buttons/autobattle",
     "buttons/back"
   ],
 
   "dark-forest/tab": [
     "buttons/campaign_unselected",
     "buttons/darkforest_selected",
-    "buttons/ranhorn_unselected",
 
     "buildings/trift"
   ],
@@ -62,8 +63,6 @@
   "dark-forest/arena/menu": ["buttons/back"],
 
   "ranhorn/tab": [
-    "buttons/campaign_unselected",
-    "buttons/darkforest_unselected",
     "buttons/ranhorn_selected",
 
     "buildings/store"

diff --git a/api/test/ss/campaign/multi-battle.png b/api/test/ss/campaign/multi-battle.png
diff --git a/api/test/ss/campaign/single-battle.png b/api/test/ss/campaign/single-battle.png
diff --git a/api/test/ss/campaign/tab.png b/api/test/ss/campaign/tab.png