Add: BATTLE_STATUS_D withdraw

module/campaign/gems_farming.py

@@ -27,7 +27,6 @@ from module.retire.scanner import ShipScanner
 from module.ui.assets import (BACK_ARROW, FLEET_CHECK)
 import inflection
 from module.ui.page import page_fleet
-import time
 
 SIM_VALUE = 0.92
 
@@ -259,7 +258,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
 
         logger.hr('Change flagship', level=2)
         self._fleet_detail_enter()
-        time.sleep(2)
+        self.device.sleep(1)
         success = self.flagship_change_execute()
 
         if self.change_flagship_equip:
@@ -287,7 +286,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
 
         logger.hr('Change vanguard', level=2)
         self._fleet_detail_enter()
-        time.sleep(2)
+        self.device.sleep(1)
         success = self.vanguard_change_execute()
 
         if self.change_vanguard_equip:

module/combat/auto_search_combat.py

@@ -3,7 +3,7 @@ from module.campaign.campaign_status import CampaignStatus
 from module.combat.assets import *
 from module.combat.combat import Combat
 from module.exception import CampaignEnd
-from module.handler.assets import AUTO_SEARCH_MAP_OPTION_ON
+from module.handler.assets import GET_MISSION, AUTO_SEARCH_MAP_OPTION_ON
 from module.logger import logger
 from module.map.map_operation import MapOperation
 
@@ -11,6 +11,7 @@ from module.map.map_operation import MapOperation
 class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
     _auto_search_in_stage_timer = Timer(3, count=6)
     _auto_search_status_confirm = False
+    _withdraw = False
     auto_search_oil_limit_triggered = False
     auto_search_coin_limit_triggered = False
 
@@ -253,6 +254,7 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
             self.emotion.reduce(fleet_index)
         auto = self.config.Fleet_Fleet1Mode if fleet_index == 1 else self.config.Fleet_Fleet2Mode
 
+        timer = 0
         while 1:
             self.device.screenshot()
 
@@ -281,12 +283,18 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
             if self.handle_get_ship():
                 continue
             if self.appear(BATTLE_STATUS_S) or self.appear(BATTLE_STATUS_A) or self.appear(BATTLE_STATUS_B) \
-                    or self.appear(BATTLE_STATUS_C) or self.appear(BATTLE_STATUS_D) \
+                    or self.appear(BATTLE_STATUS_C) or self.appear(EXP_INFO_S) or self.appear(EXP_INFO_A) \
-                    or self.appear(EXP_INFO_S) or self.appear(EXP_INFO_A) or self.appear(EXP_INFO_B) \
+                    or self.appear(EXP_INFO_B) or self.appear(EXP_INFO_C) or self.is_auto_search_running():
-                    or self.appear(EXP_INFO_C) or self.appear(EXP_INFO_D) \
-                    or self.is_auto_search_running():
                 self.device.screenshot_interval_set()
                 break
+            if self.appear(BATTLE_STATUS_D) or self.appear(EXP_INFO_D) \
+                    or self.appear(OPTS_INFO_D) or timer >= 3:
+                self._withdraw = True
+                self.device.sleep(2)
+                self.device.click(OPTS_INFO_D)
+                self.device.screenshot_interval_set()
+                break
+            timer += 1
 
     def auto_search_combat_status(self, skip_first_screenshot=True):
         """
@@ -312,6 +320,13 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
             if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
                 raise CampaignEnd
 
+            if self._withdraw:
+                self._withdraw = False
+                self.device.sleep(2)
+                self.device.click(GET_MISSION)
+                self.withdraw()
+                break
+
             # Combat status
             if self.handle_get_ship():
                 continue