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

Fix: Enemy genre selecting in Inverted Orthant D1 D3

Browse Source
This commit is contained in:
LmeSzinc
2021-01-01 18:45:31 +08:00
parent f7a7c1866e
commit fb70aa720d
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
campaign/event_20201229_cn/d1.py
View File

@@ -5,7 +5,7 @@ from module.logger import logger
MAP = CampaignMap('D1')
MAP.shape = 'I8'
MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
MAP.camera_data = ['D3', 'D6', 'F3', 'F6', 'D4', 'F4']
MAP.camera_data_spawn_point = ['D6']
MAP.map_data = """
-- -- ++ -- -- ME ++ ++ ++
@@ -94,9 +94,9 @@ class Campaign(CampaignBase):
return True
if self.clear_enemy(scale=(1,)):
return True
if self.clear_enemy(scale=(2,), genre=['light', 'main', 'enemy', 'carrier']):
if self.clear_enemy(scale=(2,), genre=['LightInvertedOrthant', 'MainInvertedOrthant', 'Enemy', 'CarrierInvertedOrthant']):
return True
if self.clear_enemy(genre=['light', 'main', 'enemy']):
if self.clear_enemy(genre=['LightInvertedOrthant', 'MainInvertedOrthant', 'Enemy', 'CarrierInvertedOrthant']):
return True
return self.battle_default()

8
campaign/event_20201229_cn/d3.py
View File

@@ -83,9 +83,9 @@ class Campaign(CampaignBase):
if self.clear_siren():
return True
if self.clear_enemy(scale=(2,), genre=['light', 'main', 'enemy', 'carrier']):
if self.clear_enemy(scale=(2,), genre=['MainPurple', 'Enemy', 'CarrierPurple']):
return True
if self.clear_enemy(genre=['light', 'main', 'enemy']):
if self.clear_enemy(genre=['MainPurple', 'Enemy', 'CarrierPurple']):
return True
return self.battle_default()
@@ -98,9 +98,9 @@ class Campaign(CampaignBase):
return True
if self.clear_enemy(scale=(1,)):
return True
if self.clear_enemy(scale=(2,), genre=['light', 'main', 'enemy', 'carrier']):
if self.clear_enemy(scale=(2,), genre=['MainPurple', 'Enemy', 'CarrierPurple']):
return True
if self.clear_enemy(genre=['light', 'main', 'enemy']):
if self.clear_enemy(genre=['MainPurple', 'Enemy', 'CarrierPurple']):
return True
return self.battle_default()

4
module/map/map.py
View File

@@ -121,7 +121,9 @@ class Map(Fleet):
if len(genre):
enemy = SelectedGrids([])
for enemy_genre in genre:
enemy = enemy.add(grids.select(enemy_genre=enemy_genre.capitalize()))
# enemy_genre should be camel case
enemy_genre = enemy_genre[0].upper() + enemy_genre[1:] if enemy_genre[0].islower() else enemy_genre
enemy = enemy.add(grids.select(enemy_genre=enemy_genre))
if isinstance(genre, list) and enemy:
break
grids = enemy