Skip to content

Commit b41c437

Browse files
committed
Upd: clear question for all fleets after strategic search
1 parent f9dc16d commit b41c437

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

module/os/map.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,24 @@ def clear_question(self, drop=None):
912912
'this might be 2 adjacent fleet mechanism, stopped')
913913
return False
914914

915+
def fleets_clear_question(self, drop=None):
916+
"""
917+
Call clear_question() for all fleets except current fleet.
918+
919+
Args:
920+
drop:
921+
922+
Returns:
923+
bool: If cleared
924+
"""
925+
logger.hr('Fleets Clear Question', level=2)
926+
fleets = [fleet for fleet in range(1, 5) if fleet != self.config.OpsiFleet_Fleet]
927+
for fleet in fleets:
928+
self.fleet_set(fleet)
929+
if self.clear_question(drop=drop):
930+
return True
931+
return False
932+
915933
def run_auto_search(self, question=True, rescan=None, after_auto_search=True, interrupt=None):
916934
"""
917935
Clear current zone by running auto search.

module/os/operation_siren.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,9 @@ def os_hazard1_leveling(self):
578578
self.globe_goto(self.name_to_zone(zone), types='SAFE', refresh=True)
579579
self.fleet_set(self.config.OpsiFleet_Fleet)
580580
self.run_strategic_search()
581-
581+
self.get_current_zone()
582+
if self.is_zone_name_hidden and not len(self._solved_map_event):
583+
self.fleets_clear_question()
582584
self.handle_after_auto_search()
583585
self.config.check_task_switch()
584586

0 commit comments

Comments
 (0)