sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-09 03:33:30 +08:00
Code Activity

Merge pull request #1400 from bookbug666/dev_alt

Browse Source 
Add: Submarine supports in GemsFarming;EnemyFilter in SOS;Replace old EventAb and Cd with individual EventABCD
This commit is contained in:
LmeSzinc
2022-07-28 23:10:44 +08:00
committed by GitHub
parent 7ca4b9cb5f c294c7a7e2
commit 679a22c509
28 changed files with 1353 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
campaign/campaign_sos/campaign_10_5.py
View File

@@ -62,9 +62,19 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.clear_enemy(scale=(1,)):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
if self.clear_enemy(scale=(2,), genre=['light', 'carrier', 'enemy', 'treasure', 'main']):
return self.battle_default()
def battle_3(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_5(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

8
campaign/campaign_sos/campaign_3_5.py
View File

@@ -69,7 +69,13 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.clear_enemy(scale=(2, 3), genre=['light', 'carrier', 'enemy', 'main']):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_2(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

8
campaign/campaign_sos/campaign_4_5.py
View File

@@ -79,7 +79,13 @@ class Campaign(CampaignBase):
MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD = 0.65
def battle_0(self):
if self.clear_enemy(scale=(2, 3), genre=['light', 'carrier', 'enemy', 'main']):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_3(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

8
campaign/campaign_sos/campaign_5_5.py
View File

@@ -73,7 +73,13 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.clear_enemy(scale=(2, 3), genre=['light', 'carrier', 'enemy', 'main']):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_3(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

8
campaign/campaign_sos/campaign_6_5.py
View File

@@ -61,7 +61,13 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.clear_enemy(scale=(2, 3), genre=['light', 'carrier', 'enemy', 'main']):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_4(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

8
campaign/campaign_sos/campaign_7_5.py
View File

@@ -64,7 +64,13 @@ class Campaign(CampaignBase):
if self.fleet_2_push_forward():
return True
if self.clear_enemy(scale=(2, 3), genre=['light', 'carrier', 'enemy', 'main']):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_4(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

7
campaign/campaign_sos/campaign_8_5.py
View File

@@ -75,10 +75,13 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.fleet_2_push_forward():
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
if self.clear_enemy(scale=(2, 3), genre=['light', 'carrier', 'enemy', 'main']):
return self.battle_default()
def battle_3(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

8
campaign/campaign_sos/campaign_9_5.py
View File

@@ -60,9 +60,13 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.clear_enemy(scale=(1,)):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
if self.clear_enemy(scale=(2,), genre=['light', 'carrier', 'enemy', 'treasure', 'main']):
return self.battle_default()
def battle_4(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

2
campaign/campaign_sos/campaign_base.py
View File

@@ -6,6 +6,8 @@ from module.template.assets import TEMPLATE_STAGE_SOS
class CampaignBase(CampaignBase_):
ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M'
def campaign_get_entrance(self, name):
"""
SOS stages don't have names in game, although players call them X-5 or X-sos.