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

Fix: Now able to use 1 or 2 fleets in chapter 2 to 6

Browse Source 
- If using 1 fleet in 6-4, will pick up the ammo
This commit is contained in:
LmeSzinc
2020-06-03 23:11:31 +08:00
parent caee1450e6
commit 87127c882a
24 changed files with 71 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/map/fleet.py
View File

@@ -50,11 +50,18 @@ class Fleet(Camera, MapOperation, AmbushHandler):
@property
def fleet_boss(self):
if self.config.FLEET_BOSS == 2 and self.config.FLEET_2:
if self.config.FLEET_BOSS == 2 or self.config.FLEET_2:
return self.fleet_2
else:
return self.fleet_1
@property
def fleet_boss_index(self):
if self.config.FLEET_BOSS == 2 or self.config.FLEET_2:
return 1
else:
return 1
@property
def fleet_step(self):
if not self.config.MAP_HAS_FLEET_STEP:
@@ -410,13 +417,18 @@ class Fleet(Camera, MapOperation, AmbushHandler):
"""
Args:
grid (Grid):
fleet (int): 1, 2
fleet (int, str): 1, 2, 'boss'
Returns:
bool: If accessible.
"""
if fleet is None:
return grid.is_accessible
if isinstance(fleet, str) and fleet.isdigit():
fleet = int(fleet)
if fleet == 'boss':
fleet = self.fleet_boss_index
if fleet == self.fleet_current_index:
return grid.is_accessible
else: