Add: Extract additional sirens after auto search

This commit is contained in:
LmeSzinc 2022-07-28 21:25:16 +08:00
parent a417692569
commit 51df1c4790
16 changed files with 20 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -57,7 +57,7 @@ A8, B8, C8, D8, E8, F8, G8, H8, \
class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['DD']
MAP_SIREN_TEMPLATE = ['DD', 'Juno_ghost']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True

View File

@ -54,7 +54,7 @@ A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, L7, \
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['CL']
MAP_SIREN_TEMPLATE = ['CL', 'Juno_ghost']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True

View File

@ -58,7 +58,7 @@ A8, B8, C8, D8, E8, F8, G8, H8, I8, \
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['CA']
MAP_SIREN_TEMPLATE = ['CA', 'Neptune_ghost']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True

View File

@ -57,7 +57,7 @@ A8, B8, C8, D8, E8, F8, G8, H8, \
class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['CL', 'CA']
MAP_SIREN_TEMPLATE = ['CL', 'CA', 'Juno_ghost', 'Neptune_ghost']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True

View File

@ -54,7 +54,7 @@ A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, L7, \
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['CA', 'BB']
MAP_SIREN_TEMPLATE = ['CA', 'BB', 'Juno_ghost', 'Neptune_ghost']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True

View File

@ -59,7 +59,7 @@ A8, B8, C8, D8, E8, F8, G8, H8, I8, \
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['CA', 'BB']
MAP_SIREN_TEMPLATE = ['CA', 'BB', 'Juno_ghost', 'Neptune_ghost']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True

View File

@ -166,6 +166,13 @@ DIC_SIREN_NAME_CHI_TO_ENG = {
# Pledge of the Radiant Court
'sizhannvshen': 'Bellona',
'fuchou': 'Revenge',
# Aquilifer's Ballade
'tianhou_ghost': 'Juno_ghost',
'haiwangxing_ghost': 'Neptune_ghost',
'lemaer_ghost': 'LeMars_ghost',
'jingjishen_ghost': 'Hermes_ghost',
'qiubite_ghost': 'Jupiter_ghost',
}
@ -239,7 +246,11 @@ class MapData:
# config
self.MAP_SIREN_TEMPLATE = []
self.MOVABLE_ENEMY_TURN = set()
for siren_id in data['ai_expedition_list'].values():
# Aquilifers Ballade (event_20220728_cn) has different sirens in clear mode
sirens = list(data['ai_expedition_list'].values())
if data_loop is not None and data_loop['ai_expedition_list'] is not None:
sirens += list(data_loop['ai_expedition_list'].values())
for siren_id in sirens:
if siren_id == 1:
continue
exped_data = EXPECTATION_DATA.get(siren_id, {})

View File

@ -92,6 +92,7 @@ TEMPLATE_SIREN_Intruder = Template(file={'cn': './assets/cn/template/TEMPLATE_SI
TEMPLATE_SIREN_IoriMinase = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_IoriMinase.gif', 'en': './assets/en/template/TEMPLATE_SIREN_IoriMinase.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_IoriMinase.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_IoriMinase.gif'})
TEMPLATE_SIREN_Ise = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Ise.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Ise.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Ise.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Ise.gif'})
TEMPLATE_SIREN_Jintsuu = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Jintsuu.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Jintsuu.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Jintsuu.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Jintsuu.gif'})
TEMPLATE_SIREN_Juno_ghost = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Juno_ghost.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Juno_ghost.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Juno_ghost.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Juno_ghost.gif'})
TEMPLATE_SIREN_Junyo = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Junyo.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Junyo.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Junyo.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Junyo.gif'})
TEMPLATE_SIREN_Kasumi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Kasumi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Kasumi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Kasumi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Kasumi.gif'})
TEMPLATE_SIREN_KasumiDOA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_KasumiDOA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_KasumiDOA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_KasumiDOA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_KasumiDOA.gif'})
@ -112,6 +113,7 @@ TEMPLATE_SIREN_Maya = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_
TEMPLATE_SIREN_MisakiDOA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_MisakiDOA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_MisakiDOA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_MisakiDOA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_MisakiDOA.gif'})
TEMPLATE_SIREN_NagisaDOA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_NagisaDOA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_NagisaDOA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_NagisaDOA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_NagisaDOA.gif'})
TEMPLATE_SIREN_Nelson = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Nelson.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Nelson.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Nelson.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Nelson.gif'})
TEMPLATE_SIREN_Neptune_ghost = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Neptune_ghost.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Neptune_ghost.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Neptune_ghost.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Neptune_ghost.gif'})
TEMPLATE_SIREN_Northampton = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Northampton.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Northampton.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Northampton.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Northampton.gif'})
TEMPLATE_SIREN_Nuremberg = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Nuremberg.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Nuremberg.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Nuremberg.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Nuremberg.gif'})
TEMPLATE_SIREN_NyotenguDOA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_NyotenguDOA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_NyotenguDOA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_NyotenguDOA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_NyotenguDOA.gif'})