Opt: search archives entrance (#4284)

* Upd: re-crop war_archives templates to reduce height * Opt: full scan archives_entrance twice
LmeSzinc · Oct 16, 2024 · b5dd289 · b5dd289
1 parent 7e47138
commit b5dd289
Show file tree

Hide file tree

Showing 52 changed files with 5 additions and 2 deletions.
diff --git a/assets/cn/war_archives/TEMPLATE_ASHEN_SIMULACRUM.png b/assets/cn/war_archives/TEMPLATE_ASHEN_SIMULACRUM.png
diff --git a/assets/cn/war_archives/TEMPLATE_AURORA_NOCTIS.png b/assets/cn/war_archives/TEMPLATE_AURORA_NOCTIS.png
diff --git a/assets/cn/war_archives/TEMPLATE_COUNTERATTACK_WITHIN_THE_FJORD.png b/assets/cn/war_archives/TEMPLATE_COUNTERATTACK_WITHIN_THE_FJORD.png
diff --git a/assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png b/assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
diff --git a/assets/cn/war_archives/TEMPLATE_CRIMSON_ECHOES.png b/assets/cn/war_archives/TEMPLATE_CRIMSON_ECHOES.png
diff --git a/assets/cn/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png b/assets/cn/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
diff --git a/assets/cn/war_archives/TEMPLATE_DREAMWAKERS_BUTTERFLY.png b/assets/cn/war_archives/TEMPLATE_DREAMWAKERS_BUTTERFLY.png
diff --git a/assets/cn/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png b/assets/cn/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png
diff --git a/assets/cn/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png b/assets/cn/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
diff --git a/assets/cn/war_archives/TEMPLATE_FALLEN_WINGS.png b/assets/cn/war_archives/TEMPLATE_FALLEN_WINGS.png
diff --git a/assets/cn/war_archives/TEMPLATE_GLORIOUS_BATTLE.png b/assets/cn/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
diff --git a/assets/cn/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png b/assets/cn/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
diff --git a/assets/cn/war_archives/TEMPLATE_INVERTED_ORTHANT.png b/assets/cn/war_archives/TEMPLATE_INVERTED_ORTHANT.png
diff --git a/assets/cn/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png b/assets/cn/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
diff --git a/assets/cn/war_archives/TEMPLATE_KHOROVOD_OF_DAWNS_RIME.png b/assets/cn/war_archives/TEMPLATE_KHOROVOD_OF_DAWNS_RIME.png
diff --git a/assets/cn/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png b/assets/cn/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png
diff --git a/assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png b/assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png
diff --git a/assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png b/assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png
diff --git a/assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png b/assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png
diff --git a/assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png b/assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png
diff --git a/assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png b/assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png
diff --git a/assets/cn/war_archives/TEMPLATE_STARS_OF_THE_SHIMMERING_FJORD.png b/assets/cn/war_archives/TEMPLATE_STARS_OF_THE_SHIMMERING_FJORD.png
diff --git a/assets/cn/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png b/assets/cn/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
diff --git a/assets/cn/war_archives/TEMPLATE_SWIRLING_CHERRY_BLOSSOMS.png b/assets/cn/war_archives/TEMPLATE_SWIRLING_CHERRY_BLOSSOMS.png
diff --git a/assets/cn/war_archives/TEMPLATE_THE_ENIGMA_AND_THE_SHARK.png b/assets/cn/war_archives/TEMPLATE_THE_ENIGMA_AND_THE_SHARK.png
diff --git a/assets/cn/war_archives/TEMPLATE_THE_SOLOMON_RANGER.png b/assets/cn/war_archives/TEMPLATE_THE_SOLOMON_RANGER.png
diff --git a/assets/cn/war_archives/TEMPLATE_THE_WAY_HOME_IN_THE_NIGHT.png b/assets/cn/war_archives/TEMPLATE_THE_WAY_HOME_IN_THE_NIGHT.png
diff --git a/assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png b/assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
diff --git a/assets/cn/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png b/assets/cn/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
diff --git a/assets/cn/war_archives/TEMPLATE_WINTERS_CROWN.png b/assets/cn/war_archives/TEMPLATE_WINTERS_CROWN.png
diff --git a/assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png b/assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
diff --git a/assets/jp/war_archives/TEMPLATE_CRIMSON_ECHOES.png b/assets/jp/war_archives/TEMPLATE_CRIMSON_ECHOES.png
diff --git a/assets/jp/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png b/assets/jp/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
diff --git a/assets/jp/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png b/assets/jp/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
diff --git a/assets/jp/war_archives/TEMPLATE_FALLEN_WINGS.png b/assets/jp/war_archives/TEMPLATE_FALLEN_WINGS.png
diff --git a/assets/jp/war_archives/TEMPLATE_GLORIOUS_BATTLE.png b/assets/jp/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
diff --git a/assets/jp/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png b/assets/jp/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
diff --git a/assets/jp/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png b/assets/jp/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
diff --git a/assets/jp/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png b/assets/jp/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
diff --git a/assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png b/assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
diff --git a/assets/jp/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png b/assets/jp/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
diff --git a/assets/jp/war_archives/TEMPLATE_WINTERS_CROWN.png b/assets/jp/war_archives/TEMPLATE_WINTERS_CROWN.png
diff --git a/assets/tw/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png b/assets/tw/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
diff --git a/assets/tw/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png b/assets/tw/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
diff --git a/assets/tw/war_archives/TEMPLATE_FALLEN_WINGS.png b/assets/tw/war_archives/TEMPLATE_FALLEN_WINGS.png
diff --git a/assets/tw/war_archives/TEMPLATE_GLORIOUS_BATTLE.png b/assets/tw/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
diff --git a/assets/tw/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png b/assets/tw/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png
diff --git a/assets/tw/war_archives/TEMPLATE_STARS_OF_THE_SHIMMERING_FJORD.png b/assets/tw/war_archives/TEMPLATE_STARS_OF_THE_SHIMMERING_FJORD.png
diff --git a/assets/tw/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png b/assets/tw/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
diff --git a/assets/tw/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png b/assets/tw/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
diff --git a/assets/tw/war_archives/TEMPLATE_WINTERS_CROWN.png b/assets/tw/war_archives/TEMPLATE_WINTERS_CROWN.png
diff --git a/campaign/campaign_war_archives/campaign_base.py b/campaign/campaign_war_archives/campaign_base.py
@@ -58,12 +58,15 @@ def _search_archives_entrance(self, name, skip_first_screenshot=True):
         Fixed number of scrolls until give up, may need to
         increase as more war archives campaigns are added
         """
-        for _ in range(10):
+        for _ in range(20):
             if skip_first_screenshot:
                 skip_first_screenshot = False
             else:
                 self.device.screenshot()
 
+            while self.device.click_record and self.device.click_record[-1] == 'WAR_ARCHIVES_SCROLL':
+                self.device.click_record.pop()
+
             # Drag may result in accidental exit, recover
             # before starting next search attempt
             while not self.appear(WAR_ARCHIVES_CHECK):
@@ -80,7 +83,7 @@ def _search_archives_entrance(self, name, skip_first_screenshot=True):
                 if WAR_ARCHIVES_SCROLL.at_bottom(main=self):
                     WAR_ARCHIVES_SCROLL.set_top(main=self)
                 else:
-                    WAR_ARCHIVES_SCROLL.next_page(main=self)
+                    WAR_ARCHIVES_SCROLL.next_page(main=self, page=0.66)
                 continue
             else:
                 break