WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-09 05:47:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Opt: camera_data_spawn_point should reuse camera_data in W15

Browse Source
This commit is contained in:
LmeSzinc 2024-04-19 01:54:36 +08:00
parent 54ff40588c
commit 01a3c29c8b
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
campaign/campaign_main/campaign_15_1.py
View File

@ -8,7 +8,7 @@ from .campaign_15_base import Config as ConfigBase
MAP = CampaignMap('15-1')
MAP.shape = 'H7'
MAP.camera_data = ['C2', 'C5', 'E2', 'E5']
MAP.camera_data_spawn_point = ['D5']
MAP.camera_data_spawn_point = ['C5']
MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """
Me Me ME ++ ME MB ++ ++
@ -73,13 +73,13 @@ class Campaign(CampaignBase):
else:
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_1(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_5(self):

4
campaign/campaign_main/campaign_15_2.py
View File

@ -8,7 +8,7 @@ from .campaign_15_base import Config as ConfigBase
MAP = CampaignMap('15-2')
MAP.shape = 'I8'
MAP.camera_data = ['C2', 'C6', 'F2', 'F6']
MAP.camera_data_spawn_point = ['E5']
MAP.camera_data_spawn_point = ['F2']
MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """
ME -- ME ME Me -- ++ ++ ++
@ -81,7 +81,7 @@ class Campaign(CampaignBase):
def battle_1(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_5(self):

2
campaign/campaign_main/campaign_15_3.py
View File

@ -91,7 +91,7 @@ class Campaign(CampaignBase):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
return self.battle_default()
def battle_5(self):
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

5
campaign/campaign_main/campaign_15_base.py
View File

@ -64,12 +64,12 @@ class CampaignBase(CampaignBase_):
if not self.map[target].is_sea:
logger.error(f'{self.map[target]} is not a sea grid.')
movable = False
if not movable:
logger.error(f'Cannot move from {self.map[location]} to {self.map[target]}.')
return movable
def _mob_move(self, location, target):
"""
Move mob from location to target, and confirm if successfully moved.
@ -174,4 +174,3 @@ class CampaignBase(CampaignBase_):
self._mob_move_info_change(location, target)
self.map.show()
return result