LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 06:29:30 +08:00
Code Activity

Add(tmp): Tempesta and the Fountain of Youth

Browse Source
This commit is contained in:
LA-DI-DA
2023-10-27 15:54:14 +08:00
parent 527d067e3f
commit 9c0d07ae66
20 changed files with 905 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/campaign/campaign_ui.py
View File

@@ -83,9 +83,11 @@ class CampaignUI(CampaignEvent, CampaignOcr):
if mode == 'ex':
logger.warning('Trying to goto EX, but no EX mode switch')
elif mode == 'normal':
MODE_SWITCH_1.set('hard', main=self)
if self.appear(SWITCH_1_NORMAL):
MODE_SWITCH_1.set('hard', main=self)
elif mode == 'hard':
MODE_SWITCH_1.set('normal', main=self)
if self.appear(SWITCH_1_HARD):
MODE_SWITCH_1.set('normal', main=self)
else:
logger.warning(f'Unknown campaign mode: {mode}')
else:

12
module/campaign/run.py
View File

@@ -231,7 +231,8 @@ class CampaignRun(CampaignEvent, ShopStatus):
'event_20200917_cn',
'event_20221124_cn',
'event_20230525_cn',
'event_20211125_cn', # chapter T
'event_20211125_cn',
'event_20231026_cn',# chapter T
]:
name = convert.get(name, name)
else:
@@ -388,6 +389,15 @@ class CampaignRun(CampaignEvent, ShopStatus):
self.device.click_record_clear()
try:
self.campaign.run()
if self.config.task.command in ['ResearchFarm', 'ResearchFarm2', 'ResearchFarm3', 'ResearchFarm4', 'ResearchFarm5', 'ResearchFarm6']:
CurrentTimes = deep_get(self.config.data, "ResearchFarmingSetting.ResearchFarmingSetting.CurrentCampaignTimes") + 1
CheckInterval = deep_get(self.config.data, "ResearchFarmingSetting.ResearchFarmingSetting.CheckInterval")
self.config.modified["ResearchFarmingSetting.ResearchFarmingSetting.CurrentCampaignTimes"] = CurrentTimes
if CurrentTimes % CheckInterval == 0:
from module.research_farming.farming import ResearchFarming
ResearchFarming(config=self.config, device=self.device).CheckResearchShipExperience()
self.config.update()
except ScriptEnd as e:
logger.hr('Script end')
logger.info(str(e))

63
module/config/argument/args.json
View File

@@ -1694,13 +1694,14 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"display": "hide",
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -2016,12 +2017,13 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -2452,12 +2454,13 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20220915_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -2888,12 +2891,13 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -4237,13 +4241,14 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"display": "disabled",
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -4691,13 +4696,14 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"display": "disabled",
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -5145,13 +5151,14 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"display": "disabled",
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -5599,13 +5606,14 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"display": "disabled",
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",
@@ -6043,13 +6051,14 @@
"event_20230525_cn",
"event_20230803_cn",
"event_20230817_cn",
"event_20230914_cn"
"event_20230914_cn",
"event_20231026_cn"
],
"display": "disabled",
"cn": "event_20230914_cn",
"cn": "event_20231026_cn",
"en": "event_20230914_cn",
"jp": "event_20230914_cn",
"tw": "event_20201229_cn"
"tw": "event_20231026_cn"
},
"Mode": {
"type": "select",

1
module/config/i18n/en-US.json
View File

@@ -724,6 +724,7 @@
"event_20230803_cn": "Anthem of Remembrance",
"event_20230817_cn": "The Fools Scales",
"event_20230914_cn": "Effulgence Before Eclipse",
"event_20231026_cn": "飓风与青春之泉",
"raid_20200624": "Air Raid Drills with Essex Rerun",
"raid_20210708": "Cross Wave rerun",
"raid_20220127": "Mystery Investigation",

1
module/config/i18n/ja-JP.json
View File

@@ -724,6 +724,7 @@
"event_20230803_cn": "燃ゆる聖都の回想曲",
"event_20230817_cn": "愚者の天秤",
"event_20230914_cn": "須臾望月抄",
"event_20231026_cn": "飓风与青春之泉",
"raid_20200624": "特別演習超空強襲波（復刻）",
"raid_20210708": "交錯する新たな波 (復刻)",
"raid_20220127": "秘密事件調査",

1
module/config/i18n/zh-CN.json
View File

@@ -724,6 +724,7 @@
"event_20230803_cn": "奏响鸢尾之歌",
"event_20230817_cn": "愚者的天平",
"event_20230914_cn": "须臾望月抄",
"event_20231026_cn": "飓风与青春之泉",
"raid_20200624": "复刻特别演习埃塞克斯级",
"raid_20210708": "复刻穿越彼方的水线",
"raid_20220127": "演习神秘事件调查",

1
module/config/i18n/zh-TW.json
View File

@@ -724,6 +724,7 @@
"event_20230803_cn": "Anthem of Remembrance",
"event_20230817_cn": "The Fools Scales",
"event_20230914_cn": "Effulgence Before Eclipse",
"event_20231026_cn": "復刻-負象限作戰",
"raid_20200624": "特別演習埃塞克斯級(復刻)",
"raid_20210708": "復刻穿越彼方的水線",
"raid_20220127": "演習神秘事件調查",

2
module/template/assets.py
View File

@@ -89,6 +89,8 @@ TEMPLATE_SIREN_DogPink = Template(file={'cn': './assets/cn/template/TEMPLATE_SIR
TEMPLATE_SIREN_Dorsetshire = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Dorsetshire.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Dorsetshire.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Dorsetshire.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Dorsetshire.gif'})
TEMPLATE_SIREN_DukeOfYork = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_DukeOfYork.gif', 'en': './assets/en/template/TEMPLATE_SIREN_DukeOfYork.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_DukeOfYork.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_DukeOfYork.gif'})
TEMPLATE_SIREN_ELpurple = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_ELpurple.gif', 'en': './assets/en/template/TEMPLATE_SIREN_ELpurple.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_ELpurple.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_ELpurple.gif'})
TEMPLATE_SIREN_fengfan_ghost_xl = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_fengfan_ghost_xl.png', 'en': './assets/cn/template/TEMPLATE_SIREN_fengfan_ghost_xl.png', 'jp': './assets/cn/template/TEMPLATE_SIREN_fengfan_ghost_xl.png', 'tw': './assets/cn/template/TEMPLATE_SIREN_fengfan_ghost_xl.png'})
TEMPLATE_SIREN_fengfan_xl = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_fengfan_xl.png', 'en': './assets/cn/template/TEMPLATE_SIREN_fengfan_xl.png', 'jp': './assets/cn/template/TEMPLATE_SIREN_fengfan_xl.png', 'tw': './assets/cn/template/TEMPLATE_SIREN_fengfan_xl.png'})
TEMPLATE_SIREN_Formidable = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Formidable.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Formidable.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Formidable.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Formidable.gif'})
TEMPLATE_SIREN_Gascogne = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Gascogne.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Gascogne.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Gascogne.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Gascogne.gif'})
TEMPLATE_SIREN_Gloucester = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Gloucester.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Gloucester.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Gloucester.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Gloucester.gif'})