Skip to content

Commit abf96ca

Browse files
LmeSzincLmeSzinc
authored
Merge pull request #2713 from LmeSzinc/dev
Bug fix
2 parents 898a3e1 + 9d05c34 commit abf96ca

11 files changed

Lines changed: 42 additions & 54 deletions

File tree

‎.github/workflows/coding_mirror.yml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎campaign/event_20230525_cn/sp.py‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ def parse_move(movement: str, step: int):
110110
class Campaign(CampaignBase):
111111
MAP = MAP
112112
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
113+
siren_list = [C7, D6, G6, H7]
114+
patched = False
115+
action = []
113116

114117
def execute_actions(self, step):
115118
for action in self.action[step]:
@@ -140,26 +143,22 @@ def execute_actions(self, step):
140143
return True
141144

142145
def battle_0(self):
143-
self.action = actions[self.fleet_1_location[0]]
144-
return self.execute_actions(0)
145-
146-
def battle_1(self):
147-
return self.execute_actions(1)
148-
149-
def battle_2(self):
150-
return self.execute_actions(2)
151-
152-
def battle_3(self):
153-
return self.execute_actions(3)
154-
155-
def battle_4(self):
156-
return self.execute_actions(4)
157-
158-
def battle_5(self):
159-
return self.execute_actions(5)
160-
161-
def battle_6(self):
162-
return self.execute_actions(6)
146+
if not self.patched:
147+
for battle_count in range(1, 7):
148+
setattr(self, f'battle_{battle_count}', self.battle_0)
149+
self.patched = True
150+
151+
if self.map_is_clear_mode:
152+
if self.siren_list:
153+
self.fleet_1.clear_chosen_enemy(self.siren_list.pop())
154+
return True
155+
else:
156+
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
157+
return True
158+
else:
159+
if not self.action:
160+
self.action = actions[self.fleet_1_location[0]]
161+
return self.execute_actions(self.battle_count)
163162

164163
def battle_7(self):
165164
return self.fleet_boss.clear_boss()

‎config/deploy.template-AidLux-cn.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
66
Repository: https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features

‎config/deploy.template-AidLux.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
6-
Repository: https://github.com/LmeSzinc/AzurLaneAutoScript
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
6+
Repository: git://git.lyoko.io/AzurLaneAutoScript
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features
99
# [Other] Use 'master', the stable branch

‎config/deploy.template-cn.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
66
Repository: https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features

‎config/deploy.template-docker-cn.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
66
Repository: https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features

‎config/deploy.template-docker.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
6-
Repository: https://github.com/LmeSzinc/AzurLaneAutoScript
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
6+
Repository: git://git.lyoko.io/AzurLaneAutoScript
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features
99
# [Other] Use 'master', the stable branch

‎config/deploy.template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
6-
Repository: https://github.com/LmeSzinc/AzurLaneAutoScript
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
6+
Repository: git://git.lyoko.io/AzurLaneAutoScript
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features
99
# [Other] Use 'master', the stable branch

‎deploy/config.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,14 @@ def __init__(self, file=DEPLOY_CONFIG):
7171
self.file = file
7272
self.config = {}
7373
self.read()
74-
if self.Repository == 'https://gitee.com/LmeSzinc/AzurLaneAutoScript':
75-
self.Repository = 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git'
76-
if self.Repository == 'https://gitee.com/lmeszinc/azur-lane-auto-script-mirror':
77-
self.Repository = 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git'
74+
if self.Repository in [
75+
'https://gitee.com/LmeSzinc/AzurLaneAutoScript',
76+
'https://gitee.com/lmeszinc/azur-lane-auto-script-mirror',
77+
'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git',
78+
'https://e.coding.net/saarcenter/alas/AzurLaneAutoScript.git',
79+
'https://git.saarcenter.com/LmeSzinc/AzurLaneAutoScript.git',
80+
]:
81+
self.Repository = 'git://git.lyoko.io/AzurLaneAutoScript'
7882
self.write()
7983
self.show_config()
8084

‎deploy/template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Deploy:
22
Git:
33
# URL of AzurLaneAutoScript repository
44
# [CN user] Use 'https://e.coding.net/llop18870/alas/AzurLaneAutoScript.git' for faster and more stable download
5-
# [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript'
6-
Repository: 'https://github.com/LmeSzinc/AzurLaneAutoScript'
5+
# [Other] Use 'git://git.lyoko.io/AzurLaneAutoScript'
6+
Repository: 'git://git.lyoko.io/AzurLaneAutoScript'
77
# Branch of Alas
88
# [Developer] Use 'dev', 'app', etc, to try new features
99
# [Other] Use 'master', the stable branch

0 commit comments

Comments
 (0)