diff --git a/module/os/map.py b/module/os/map.py index 6d208caa8..f721fd313 100644 --- a/module/os/map.py +++ b/module/os/map.py @@ -912,6 +912,24 @@ class OSMap(OSFleet, Map, GlobeCamera, StorageHandler, StrategicSearchHandler): 'this might be 2 adjacent fleet mechanism, stopped') return False + def fleets_clear_question(self, drop=None): + """ + Call clear_question() for all fleets except current fleet. + + Args: + drop: + + Returns: + bool: If cleared + """ + logger.hr('Fleets Clear Question', level=2) + fleets = [fleet for fleet in range(1, 5) if fleet != self.config.OpsiFleet_Fleet] + for fleet in fleets: + self.fleet_set(fleet) + if self.clear_question(drop=drop): + return True + return False + def run_auto_search(self, question=True, rescan=None, after_auto_search=True, interrupt=None): """ Clear current zone by running auto search. diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index f7ece1041..212c3b769 100644 --- a/module/os/operation_siren.py +++ b/module/os/operation_siren.py @@ -578,7 +578,9 @@ class OperationSiren(OSMap): self.globe_goto(self.name_to_zone(zone), types='SAFE', refresh=True) self.fleet_set(self.config.OpsiFleet_Fleet) self.run_strategic_search() - + self.get_current_zone() + if self.is_zone_name_hidden and not len(self._solved_map_event): + self.fleets_clear_question() self.handle_after_auto_search() self.config.check_task_switch()