Merge pull request #1703 from LmeSzinc/bug_fix

Bug fix

Author: LmeSzinc

assets/cn/os/TEMPLATE_ExplorationReward.png

@@ -18,6 +18,7 @@ class OSGridInfo(GridInfo):
     is_akashi = False  # White question mark '?'
     is_scanning_device = False
     is_logging_tower = False
+    is_exploration_reward = False
     is_fleet_mechanism = False
 
     is_fleet = False
@@ -35,6 +36,7 @@ def encode(self):
             'AK': 'is_akashi',
             'SD': 'is_scanning_device',
             'LT': 'is_logging_tower',
+            'ER': 'is_exploration_reward',
             'FM': 'is_fleet_mechanism',
         }
         for key, value in dic.items():
@@ -88,6 +90,9 @@ def merge(self, info, mode='normal'):
         if info.is_logging_tower:
             self.is_logging_tower = True
             return True
+        if info.is_exploration_reward:
+            self.is_exploration_reward = True
+            return True
         if info.is_fleet_mechanism:
             self.is_fleet_mechanism = True
             return True
@@ -131,6 +136,7 @@ def wipe_out(self):
         self.is_question = False
         self.is_scanning_device = False
         self.is_logging_tower = False
+        self.is_exploration_reward = False
         self.is_fleet_mechanism = False
 
     def reset(self):
@@ -154,6 +160,7 @@ def predict(self):
         self.is_akashi = self.enemy_genre == 'Akashi'
         self.is_scanning_device = self.enemy_genre == 'ScanningDevice'
         self.is_logging_tower = self.enemy_genre == 'LoggingTower'
+        self.is_exploration_reward = self.enemy_genre == 'ExplorationReward'
         self.is_current_fleet = self.predict_current_fleet()
         self.is_fleet = self.is_current_fleet
         self.is_fleet_mechanism = self.predict_fleet_mechanism()
@@ -202,6 +209,7 @@ def predict_sea(self):
         'Akashi': TEMPLATE_SIREN_Akashi,
         'ScanningDevice': TEMPLATE_ScanningDevice,
         'LoggingTower': TEMPLATE_LoggingTower,
+        'ExplorationReward': TEMPLATE_ExplorationReward,
     }
     _os_template_enemy_upper = {
         'ScanningDevice': TEMPLATE_ScanningDeviceUpper,

assets/en/os/TEMPLATE_ExplorationReward.png

@@ -1,5 +1,6 @@
 from module.base.button import ButtonGrid
 from module.base.timer import Timer
+from module.handler.assets import GAME_TIPS
 from module.logger import logger
 from module.meowfficer.assets import *
 from module.meowfficer.base import MeowfficerBase
@@ -246,6 +247,9 @@ def meow_enhance_enter(self, skip_first_screenshot=True):
                 continue
             if self.meow_additional():
                 continue
+            # Meowfficer enhance tips
+            if self.appear_then_click(GAME_TIPS, offset=(20, 20), interval=2):
+                continue
 
     def _meow_enhance(self):
         """

assets/jp/os/TEMPLATE_ExplorationReward.png

@@ -25,6 +25,7 @@
 SELECT_STRONGHOLD = Button(area={'cn': (89, 251, 166, 269), 'en': (81, 252, 175, 272), 'jp': (89, 251, 167, 269), 'tw': (88, 250, 167, 270)}, color={'cn': (113, 114, 118), 'en': (81, 83, 87), 'jp': (115, 116, 119), 'tw': (103, 105, 108)}, button={'cn': (89, 251, 166, 269), 'en': (81, 252, 175, 272), 'jp': (89, 251, 167, 269), 'tw': (88, 250, 167, 270)}, file={'cn': './assets/cn/os/SELECT_STRONGHOLD.png', 'en': './assets/en/os/SELECT_STRONGHOLD.png', 'jp': './assets/jp/os/SELECT_STRONGHOLD.png', 'tw': './assets/tw/os/SELECT_STRONGHOLD.png'})
 STRONGHOLD_PERCENTAGE = Button(area={'cn': (293, 125, 340, 143), 'en': (293, 125, 340, 143), 'jp': (293, 125, 340, 143), 'tw': (293, 125, 340, 143)}, color={'cn': (132, 135, 146), 'en': (132, 135, 146), 'jp': (132, 135, 146), 'tw': (132, 135, 146)}, button={'cn': (293, 125, 340, 143), 'en': (293, 125, 340, 143), 'jp': (293, 125, 340, 143), 'tw': (293, 125, 340, 143)}, file={'cn': './assets/cn/os/STRONGHOLD_PERCENTAGE.png', 'en': './assets/en/os/STRONGHOLD_PERCENTAGE.png', 'jp': './assets/jp/os/STRONGHOLD_PERCENTAGE.png', 'tw': './assets/tw/os/STRONGHOLD_PERCENTAGE.png'})
 TEMPLATE_EMPTY_HP = Template(file={'cn': './assets/cn/os/TEMPLATE_EMPTY_HP.png', 'en': './assets/en/os/TEMPLATE_EMPTY_HP.png', 'jp': './assets/jp/os/TEMPLATE_EMPTY_HP.png', 'tw': './assets/tw/os/TEMPLATE_EMPTY_HP.png'})
+TEMPLATE_ExplorationReward = Template(file={'cn': './assets/cn/os/TEMPLATE_ExplorationReward.png', 'en': './assets/en/os/TEMPLATE_ExplorationReward.png', 'jp': './assets/jp/os/TEMPLATE_ExplorationReward.png', 'tw': './assets/tw/os/TEMPLATE_ExplorationReward.png'})
 TEMPLATE_FleetMechanism = Template(file={'cn': './assets/cn/os/TEMPLATE_FleetMechanism.png', 'en': './assets/en/os/TEMPLATE_FleetMechanism.png', 'jp': './assets/jp/os/TEMPLATE_FleetMechanism.png', 'tw': './assets/tw/os/TEMPLATE_FleetMechanism.png'})
 TEMPLATE_LoggingTower = Template(file={'cn': './assets/cn/os/TEMPLATE_LoggingTower.png', 'en': './assets/en/os/TEMPLATE_LoggingTower.png', 'jp': './assets/jp/os/TEMPLATE_LoggingTower.png', 'tw': './assets/tw/os/TEMPLATE_LoggingTower.png'})
 TEMPLATE_LoggingTowerUpper = Template(file={'cn': './assets/cn/os/TEMPLATE_LoggingTowerUpper.png', 'en': './assets/en/os/TEMPLATE_LoggingTowerUpper.png', 'jp': './assets/jp/os/TEMPLATE_LoggingTowerUpper.png', 'tw': './assets/tw/os/TEMPLATE_LoggingTowerUpper.png'})

assets/tw/os/TEMPLATE_ExplorationReward.png

@@ -160,7 +160,9 @@ def os_map_goto_globe(self, *args, **kwargs):
                 super().os_map_goto_globe(*args, **kwargs)
                 return
             except RewardUncollectedError:
-                self.run_auto_search()
+                # Disable after_auto_search since it will exit current zone.
+                # Or will cause RecursionError: maximum recursion depth exceeded
+                self.run_auto_search(rescan=True, after_auto_search=False)
                 continue
 
         logger.error('Failed to solve uncollected rewards')
@@ -384,7 +386,7 @@ def os_auto_search_daemon(self, drop=None, skip_first_screenshot=True):
         """
         logger.hr('OS auto search', level=2)
         self._auto_search_battle_count = 0
-        unlock_checked = True
+        unlock_checked = False
         unlock_check_timer = Timer(5, count=10).start()
         self.ash_popup_canceled = False
 
@@ -501,7 +503,7 @@ def clear_question(self, drop):
                        'this might be 2 adjacent fleet mechanism, stopped')
         return False
 
-    def run_auto_search(self, question=True, rescan=None):
+    def run_auto_search(self, question=True, rescan=None, after_auto_search=True):
         """
         Clear current zone by running auto search.
         OpSi story mode must be cleared to unlock auto search.
@@ -514,6 +516,8 @@ def run_auto_search(self, question=True, rescan=None):
                 visit akashi's shop that auto search missed, and unlock mechanism that requires 2 fleets.
 
                 This option should be disabled in special tasks like OpsiObscure, OpsiAbyssal, OpsiStronghold.
+            after_auto_search (bool):
+                Whether to call handle_after_auto_search() after auto search
         """
         if rescan is None:
             rescan = self.config.OpsiGeneral_DoRandomMapEvent
@@ -532,11 +536,12 @@ def run_auto_search(self, question=True, rescan=None):
 
                 self.hp_reset()
                 self.hp_get()
-                if self.is_in_task_explore and not self.zone.is_port:
-                    prev = self.zone
-                    if self.handle_after_auto_search():
-                        self.globe_goto(prev, types='DANGEROUS')
-                        continue
+                if after_auto_search:
+                    if self.is_in_task_explore and not self.zone.is_port:
+                        prev = self.zone
+                        if self.handle_after_auto_search():
+                            self.globe_goto(prev, types='DANGEROUS')
+                            continue
                 break
 
             # Rescan
@@ -562,6 +567,17 @@ def map_rescan_current(self, drop=None):
         Returns:
             bool: If solved a map random event
         """
+        grids = self.view.select(is_exploration_reward=True)
+        if 'is_exploration_reward' not in self._solved_map_event and grids and grids[0].is_exploration_reward:
+            grid = grids[0]
+            logger.info(f'Found exploration reward on {grid}')
+            result = self.wait_until_walk_stable(drop=drop, walk_out_of_step=False, confirm_timer=Timer(1.5, count=4))
+            if 'event' in result:
+                self._solved_map_event.add('is_exploration_reward')
+                return True
+            else:
+                return False
+
         grids = self.view.select(is_akashi=True)
         if 'is_akashi' not in self._solved_map_event and grids and grids[0].is_akashi:
             grid = grids[0]

module/map_detection/os_grid.py

@@ -208,6 +208,8 @@ def end():
             with self.config.multi_set():
                 self.config.OpsiExplore_LastZone = 0
                 self.config.task_delay(target=next_reset)
+                self.config.task_call('OpsiDaily', force_call=False)
+                self.config.task_call('OpsiShop', force_call=False)
             self.config.task_stop()
 
         logger.hr('OS explore', level=1)