sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 01:38:21 +08:00
Code Activity

Fix: SubmarineMode not working because handle_submarine_call() received None (#705)

Browse Source 
- Opt: Re-check if submarine is clear
This commit is contained in:
LmeSzinc
2021-11-06 22:43:37 +08:00
parent 08c033a6e1
commit 7f1227aabf
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module/map/map_fleet_preparation.py
View File

@@ -188,19 +188,25 @@ class FleetPreparation(ModuleBase):
# if not fleet_2.allow():
# self.config.FLEET_2 = 0
# Not using fleet 2.
if not self.config.Fleet_Fleet2:
if self.config.Fleet_Fleet2:
# Using both fleets.
# Force to set it again.
# Fleets may reversed, because AL no longer treat the fleet with smaller index as first fleet
fleet_2.clear()
fleet_1.ensure_to_be(self.config.Fleet_Fleet1)
fleet_2.ensure_to_be(self.config.Fleet_Fleet2)
else:
# Not using fleet 2.
if fleet_2.allow():
fleet_2.clear()
fleet_1.ensure_to_be(self.config.Fleet_Fleet1)
self.map_fleet_checked = True
return True
# Using both fleets.
# Force to set it again.
# Fleets may reversed, because AL no longer treat the fleet with smaller index as first fleet
fleet_2.clear()
fleet_1.ensure_to_be(self.config.Fleet_Fleet1)
fleet_2.ensure_to_be(self.config.Fleet_Fleet2)
# Check if submarine is empty again.
if submarine.allow():
if self.config.Submarine_Fleet:
pass
else:
submarine.clear()
self.map_fleet_checked = True
return True