diff --git a/module/coalition/combat.py b/module/coalition/combat.py index ed6728ad7..9dd430979 100644 --- a/module/coalition/combat.py +++ b/module/coalition/combat.py @@ -54,6 +54,11 @@ class CoalitionCombat(CoalitionUI, CampaignBase): self.device.click(BATTLE_STATUS) click_timer.reset() + def auto_search_combat_end(self): + if self.appear(BATTLE_STATUS, offset=(80, 20)): + return True + return False + def coalition_combat(self): """ Pages: diff --git a/module/combat/auto_search_combat.py b/module/combat/auto_search_combat.py index 5dbf43393..fcd6e49a5 100644 --- a/module/combat/auto_search_combat.py +++ b/module/combat/auto_search_combat.py @@ -199,6 +199,12 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus): if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing(): raise CampaignEnd + def auto_search_combat_end(self): + """ + A custom combat end that used in coalition + """ + return False + def auto_search_combat_execute(self, emotion_reduce, fleet_index): """ Args: @@ -281,6 +287,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus): or self.is_auto_search_running(): self.device.screenshot_interval_set() break + if self.auto_search_combat_end(): + break def auto_search_combat_status(self): """