Fix: Double check background color of GUILD_DISPATCH_FLEET (#5173)

Author: LmeSzinc

module/guild/operations.py

@@ -364,15 +364,21 @@ def _guild_operations_dispatch_execute(self, skip_first_screenshot=True):
             else:
                 self.device.screenshot()
 
-            if self.appear(GUILD_DISPATCH_FLEET_UNFILLED, threshold=20, interval=5):
+            if self.appear(GUILD_DISPATCH_FLEET_UNFILLED, offset=(20, 20), interval=3):
                 # Don't use offset here, because GUILD_DISPATCH_FLEET_UNFILLED only has a difference in colors
                 # Use long interval because the game needs a few seconds to choose the ships
                 self.device.click(GUILD_DISPATCH_RECOMMEND)
                 continue
-            if not dispatched and self.appear_then_click(GUILD_DISPATCH_FLEET, threshold=20, interval=5):
-                # Don't use offset here, because GUILD_DISPATCH_FLEET only has a difference in colors
+            if not dispatched and self.appear(GUILD_DISPATCH_FLEET, offset=(20, 20), interval=3):
+                # GUILD_DISPATCH_FLEET and GUILD_DISPATCH_FLEET_UNFILLED has same feature but different colors
+                # check background blue for double check
+                if self.image_color_count(GUILD_DISPATCH_FLEET, color=(82, 93, 221), threshold=235, count=500):
+                    self.device.click(GUILD_DISPATCH_FLEET)
+                else:
+                    self.interval_clear(GUILD_DISPATCH_FLEET)
                 continue
             if self.handle_popup_confirm('GUILD_DISPATCH'):
+                self.interval_clear(GUILD_DISPATCH_FLEET)
                 dispatched = True
                 continue
 
@@ -381,13 +387,16 @@ def _guild_operations_dispatch_execute(self, skip_first_screenshot=True):
                 # In first dispatch, it will show GUILD_DISPATCH_IN_PROGRESS
                 logger.info('Fleet dispatched, dispatch in progress')
                 break
-            if dispatched and self.appear(GUILD_DISPATCH_FLEET, threshold=20, interval=0):
-                # In the rest of the dispatch, it will show GUILD_DISPATCH_FLEET
-                # We can't ensure that fleet has dispatched,
-                # because GUILD_DISPATCH_FLEET also shows after clicking recommend before dispatching
-                # _guild_operations_dispatch() will retry it if haven't dispatched
-                logger.info('Fleet dispatched')
-                break
+            if dispatched and self.appear(GUILD_DISPATCH_FLEET, offset=(20, 20), interval=3):
+                # GUILD_DISPATCH_FLEET and GUILD_DISPATCH_FLEET_UNFILLED has same feature but different colors
+                # check background blue for double check
+                if self.image_color_count(GUILD_DISPATCH_FLEET, color=(82, 93, 221), threshold=235, count=500):
+                    # In the rest of the dispatch, it will show GUILD_DISPATCH_FLEET
+                    # We can't ensure that fleet has dispatched,
+                    # because GUILD_DISPATCH_FLEET still shows after clicking recommend before dispatching
+                    # _guild_operations_dispatch() will retry it if haven't dispatched
+                    logger.info('Fleet dispatched')
+                    break
 
     def _guild_operations_dispatch_exit(self, skip_first_screenshot=True):
         """
@@ -473,9 +482,8 @@ def _guild_operations_boss_preparation(self, az, skip_first_screenshot=True):
             if self.appear_then_click(GUILD_BOSS_ENTER, interval=3):
                 continue
 
-            if self.appear(GUILD_DISPATCH_FLEET, threshold=20, interval=3):
-                # Button does not appear greyed out even
-                # when empty fleet composition
+            if self.appear(GUILD_DISPATCH_FLEET, offset=(20, 20), interval=3):
+                # Button does not appear greyed out even when empty fleet composition
                 if dispatch_count < 5:
                     self.device.click(GUILD_DISPATCH_FLEET)
                     dispatch_count += 1