sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 08:47:20 +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

8
campaign/campaign_main/campaign_2_1.py
View File

@@ -32,8 +32,8 @@ A4, B4, C4, D4, E4, F4, \
class Config:
FLEET_2 = 0
SUBMARINE = 0
FLEET_BOSS = 1
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 40),
'width': (1.5, 10),
@@ -59,7 +59,7 @@ class Campaign(CampaignBase):
def battle_2(self):
self.clear_all_mystery()
if not self.check_accessibility(D4):
if not self.check_accessibility(D4, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_2_2.py
View File

@@ -48,7 +48,7 @@ class Campaign(CampaignBase):
def battle_3(self):
self.clear_all_mystery()
if not self.check_accessibility(D1):
if not self.check_accessibility(D1, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_2_3.py
View File

@@ -48,7 +48,7 @@ class Campaign(CampaignBase):
def battle_3(self):
self.clear_all_mystery()
if not self.check_accessibility(E1):
if not self.check_accessibility(E1, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_2_4.py
View File

@@ -41,7 +41,7 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_3(self):
if not self.check_accessibility(G1):
if not self.check_accessibility(G1, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

8
campaign/campaign_main/campaign_3_1.py
View File

@@ -33,8 +33,8 @@ A4, B4, C4, D4, E4, F4, G4, \
class Config:
FLEET_2 = 0
SUBMARINE = 0
FLEET_BOSS = 1
MAP_MYSTERY_HAS_CARRIER = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 40),
@@ -61,7 +61,7 @@ class Campaign(CampaignBase):
def battle_3(self):
self.clear_all_mystery()
if not self.check_accessibility(G2):
return self.battle_default()
if not self.check_accessibility(G2, fleet='boss'):
return self.fleet_boss.battle_default()
return self.clear_boss()

4
campaign/campaign_main/campaign_3_2.py
View File

@@ -45,7 +45,7 @@ class Campaign(CampaignBase):
def battle_3(self):
self.clear_all_mystery()
if not self.check_accessibility(H1):
if not self.check_accessibility(H1, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_3_3.py
View File

@@ -47,7 +47,7 @@ class Campaign(CampaignBase):
def battle_3(self):
self.clear_all_mystery()
if not self.check_accessibility(A4):
if not self.check_accessibility(A4, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_3_4.py
View File

@@ -50,10 +50,10 @@ class Campaign(CampaignBase):
return self.battle_default()
def battle_3(self):
if not self.check_accessibility(H3):
if not self.check_accessibility(H3, fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()
def handle_boss_appear_refocus(self):
for data in self.map.spawn_data:

8
campaign/campaign_main/campaign_4_1.py
View File

@@ -39,8 +39,8 @@ A6, B6, C6, D6, E6, F6, \
class Config:
FLEET_2 = 0
SUBMARINE = 0
FLEET_BOSS = 1
MAP_MYSTERY_HAS_CARRIER = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 40),
@@ -72,7 +72,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_4_2.py
View File

@@ -58,7 +58,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_4_3.py
View File

@@ -54,7 +54,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_4_4.py
View File

@@ -65,10 +65,10 @@ class Campaign(CampaignBase):
def battle_4(self):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
if self.clear_roadblocks([road_main]):
return True
if self.clear_potential_roadblocks([road_main]):
return True
return self.clear_boss()
return self.fleet_boss.clear_boss()

8
campaign/campaign_main/campaign_5_1.py
View File

@@ -41,9 +41,9 @@ A6, B6, C6, D6, E6, F6, G6, H6, \
class Config:
FLEET_2 = 0
SUBMARINE = 0
FLEET_BOSS = 1
MAP_MYSTERY_HAS_CARRIER = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 40),
'width': (1.5, 10),
@@ -71,7 +71,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_5_2.py
View File

@@ -51,7 +51,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_5_3.py
View File

@@ -51,7 +51,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.battle_default()
return self.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_5_4.py
View File

@@ -62,10 +62,10 @@ class Campaign(CampaignBase):
def battle_4(self):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0]):
if not self.check_accessibility(boss[0], fleet='boss'):
if self.clear_roadblocks([road_center]):
return True
if self.clear_potential_roadblocks([road_ring]):
return True
return self.clear_boss()
return self.fleet_boss.clear_boss()

6
campaign/campaign_main/campaign_6_1.py
View File

@@ -42,7 +42,7 @@ road_mystery = RoadGrids([[C4, D5], D4, G2, [G1, H2]])
class Config:
SUBMARINE = 0
FLEET_BOSS = 1
MAP_MYSTERY_HAS_CARRIER = True
@@ -70,7 +70,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet=2):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.clear_roadblocks([road_boss])
return self.fleet_2.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_6_2.py
View File

@@ -64,7 +64,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet=2):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.clear_roadblocks([road_boss])
return self.fleet_2.clear_boss()
return self.fleet_boss.clear_boss()

4
campaign/campaign_main/campaign_6_3.py
View File

@@ -77,7 +77,7 @@ class Campaign(CampaignBase):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet=2):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.clear_roadblocks([road_boss])
return self.fleet_2.clear_boss()
return self.fleet_boss.clear_boss()

7
campaign/campaign_main/campaign_6_4.py
View File

@@ -68,9 +68,12 @@ class Campaign(CampaignBase):
def battle_5(self):
self.clear_all_mystery()
if not self.config.FLEET_2:
self.pick_up_ammo()
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet=2):
if not self.check_accessibility(boss[0], fleet='boss'):
return self.clear_roadblocks([road_boss])
return self.fleet_2.clear_boss()
return self.fleet_boss.clear_boss()