1
0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-07-06 21:15:07 +08:00

Refactor: separate submarine_mode for clearer semantics

This commit is contained in:
positnuec
2026-07-02 17:47:24 +08:00
parent d9a9b784af
commit bb8a6d6044
19 changed files with 364 additions and 239 deletions

View File

@@ -343,8 +343,8 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
self.submarine_call_reset()
submarine_mode = 'do_not_use'
if self.config.Submarine_Fleet:
submarine_mode = self.config.Submarine_Mode
force_call = battle[0] == battle[1] - 1 if battle is not None else False
submarine_mode = self.config.Submarine_CallMode
is_boss = battle[0] == battle[1] - 1 if battle is not None else False
self.combat_auto_reset()
self.combat_manual_reset()
self.device.stuck_record_clear()
@@ -358,7 +358,7 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
exp_confirm_timer = Timer(1, count=2)
for _ in self.loop():
if self.handle_submarine_call(submarine_mode, call=force_call):
if self.handle_submarine_call(call_mode=submarine_mode, is_boss=is_boss):
continue
if self.handle_combat_auto(auto):
continue