From 58ddb019769bff1a7c04e9b68908866bf9af4e79 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Sun, 23 Nov 2025 01:51:02 +0800 Subject: [PATCH] Tmp: general config modification for coalition_20251120 --- config/template.json | 4 +-- module/config/argument/args.json | 40 ++++++++++++++++++--------- module/config/argument/argument.yaml | 4 +-- module/config/argument/override.yaml | 6 ++-- module/config/config_generated.py | 2 +- module/config/config_updater.py | 6 ++-- module/config/i18n/en-US.json | 17 ++++++++---- module/config/i18n/ja-JP.json | 17 ++++++++---- module/config/i18n/zh-CN.json | 17 ++++++++---- module/config/i18n/zh-TW.json | 17 ++++++++---- module/config/redirect_utils/utils.py | 6 ++++ module/ui/page.py | 11 ++++++-- 12 files changed, 101 insertions(+), 46 deletions(-) diff --git a/config/template.json b/config/template.json index 057350edb..0ad93e028 100644 --- a/config/template.json +++ b/config/template.json @@ -615,7 +615,7 @@ "AmbushEvade": true }, "Coalition": { - "Mode": "hard", + "Mode": "area1-normal", "Fleet": "single" }, "StopCondition": { @@ -1186,7 +1186,7 @@ "AmbushEvade": true }, "Coalition": { - "Mode": "sp", + "Mode": "area1-normal", "Fleet": "single" }, "StopCondition": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 12f1f01f6..d9998c1f6 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3188,12 +3188,20 @@ "Coalition": { "Mode": { "type": "select", - "value": "hard", + "value": "area1-normal", "option": [ - "easy", - "normal", - "hard", - "ex" + "area1-normal", + "area1-hard", + "area2-normal", + "area2-hard", + "area3-normal", + "area3-hard", + "area4-normal", + "area4-hard", + "area5-normal", + "area5-hard", + "area6-normal", + "area6-hard" ] }, "Fleet": { @@ -6366,15 +6374,21 @@ "Coalition": { "Mode": { "type": "select", - "value": "sp", + "value": "area1-normal", "option": [ - "easy", - "normal", - "hard", - "sp", - "ex" - ], - "display": "hide" + "area1-normal", + "area1-hard", + "area2-normal", + "area2-hard", + "area3-normal", + "area3-hard", + "area4-normal", + "area4-hard", + "area5-normal", + "area5-hard", + "area6-normal", + "area6-hard" + ] }, "Fleet": { "type": "select", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index cd58de8ea..61514799a 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -308,8 +308,8 @@ MaritimeEscort: Enable: true Coalition: Mode: - value: hard - option: [ easy, normal, hard, sp, ex ] + value: area1-normal + option: [ area1-normal, area1-hard, area2-normal, area2-hard, area3-normal, area3-hard, area4-normal, area4-hard, area5-normal, area5-hard, area6-normal, area6-hard ] Fleet: value: single option: [ single, multi ] diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 5e42dcd92..70c88aca1 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -238,9 +238,9 @@ Coalition: UseAutoSearch: false Use2xBook: false AmbushEvade: true - Coalition: - Mode: - option: [ easy, normal, hard, ex ] +# Coalition: +# Mode: +# option: [ easy, normal, hard, ex ] StopCondition: MapAchievement: non_stop StageIncrease: false diff --git a/module/config/config_generated.py b/module/config/config_generated.py index f52ad1544..0c93cb63f 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -181,7 +181,7 @@ class GeneratedConfig: MaritimeEscort_Enable = True # Group `Coalition` - Coalition_Mode = 'hard' # easy, normal, hard, sp, ex + Coalition_Mode = 'area1-normal' # area1-normal, area1-hard, area2-normal, area2-hard, area3-normal, area3-hard, area4-normal, area4-hard, area5-normal, area5-hard, area6-normal, area6-hard Coalition_Fleet = 'single' # single, multi # Group `Commission` diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 8b9d42210..d0399aada 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -595,7 +595,9 @@ class ConfigUpdater: # 2025.04.17 # ('Coalition.Coalition.Mode', 'Coalition.Coalition.Mode', coalition_to_frostfall), # 2025.06.26 - ('Coalition.Coalition.Mode', 'Coalition.Coalition.Mode', coalition_to_little_academy), + # ('Coalition.Coalition.Mode', 'Coalition.Coalition.Mode', coalition_to_little_academy), + # 2025.11.20 + ('Coalition.Coalition.Mode', 'Coalition.Coalition.Mode', coalition_to_dal), ] # redirection += [ @@ -670,7 +672,7 @@ class ConfigUpdater: for task in EVENTS + WAR_ARCHIVES: default_stage(task, 'D3') for task in COALITIONS: - default_stage(task, 'hard') + default_stage(task, 'area1-normal') if not is_template: new = self.config_redirect(old, new) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 80dd414e3..a244d4e73 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1321,11 +1321,18 @@ "Mode": { "name": "Mode", "help": "SP needs to use event daily SP to run", - "easy": "Easy", - "normal": "Normal", - "hard": "Hard", - "sp": "SP", - "ex": "EX" + "area1-normal": "area1-normal", + "area1-hard": "area1-hard", + "area2-normal": "area2-normal", + "area2-hard": "area2-hard", + "area3-normal": "area3-normal", + "area3-hard": "area3-hard", + "area4-normal": "area4-normal", + "area4-hard": "area4-hard", + "area5-normal": "area5-normal", + "area5-hard": "area5-hard", + "area6-normal": "area6-normal", + "area6-hard": "area6-hard" }, "Fleet": { "name": "Fleet", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 39fdc0590..08f563362 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1321,11 +1321,18 @@ "Mode": { "name": "Coalition.Mode.name", "help": "Coalition.Mode.help", - "easy": "easy", - "normal": "normal", - "hard": "hard", - "sp": "sp", - "ex": "ex" + "area1-normal": "area1-normal", + "area1-hard": "area1-hard", + "area2-normal": "area2-normal", + "area2-hard": "area2-hard", + "area3-normal": "area3-normal", + "area3-hard": "area3-hard", + "area4-normal": "area4-normal", + "area4-hard": "area4-hard", + "area5-normal": "area5-normal", + "area5-hard": "area5-hard", + "area6-normal": "area6-normal", + "area6-hard": "area6-hard" }, "Fleet": { "name": "Coalition.Fleet.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 7e67ddc5a..a341c3deb 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1321,11 +1321,18 @@ "Mode": { "name": "难度", "help": "SP图需要使用活动每日SP运行", - "easy": "简单", - "normal": "普通", - "hard": "困难", - "sp": "SP", - "ex": "EX" + "area1-normal": "area1-normal", + "area1-hard": "area1-hard", + "area2-normal": "area2-normal", + "area2-hard": "area2-hard", + "area3-normal": "area3-normal", + "area3-hard": "area3-hard", + "area4-normal": "area4-normal", + "area4-hard": "area4-hard", + "area5-normal": "area5-normal", + "area5-hard": "area5-hard", + "area6-normal": "area6-normal", + "area6-hard": "area6-hard" }, "Fleet": { "name": "出击队伍", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 944082b89..b5406e96c 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1321,11 +1321,18 @@ "Mode": { "name": "難度", "help": "SP圖需要使用活動每日SP運行", - "easy": "簡單", - "normal": "普通", - "hard": "困難", - "sp": "sp", - "ex": "EX" + "area1-normal": "area1-normal", + "area1-hard": "area1-hard", + "area2-normal": "area2-normal", + "area2-hard": "area2-hard", + "area3-normal": "area3-normal", + "area3-hard": "area3-hard", + "area4-normal": "area4-normal", + "area4-hard": "area4-hard", + "area5-normal": "area5-normal", + "area5-hard": "area5-hard", + "area6-normal": "area6-normal", + "area6-hard": "area6-hard" }, "Fleet": { "name": "出擊隊伍", diff --git a/module/config/redirect_utils/utils.py b/module/config/redirect_utils/utils.py index 33a4f6f6e..a8b3d9540 100644 --- a/module/config/redirect_utils/utils.py +++ b/module/config/redirect_utils/utils.py @@ -130,3 +130,9 @@ def coalition_to_little_academy(value): return 'hard' else: return value + +def coalition_to_dal(value): + """ + Redirect DAL stage names to Frostfall + """ + return value \ No newline at end of file diff --git a/module/ui/page.py b/module/ui/page.py index 061fb8edd..8ec495673 100644 --- a/module/ui/page.py +++ b/module/ui/page.py @@ -145,9 +145,14 @@ page_campaign.link(button=CAMPAIGN_GOTO_EVENT, destination=page_sp) # page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) # page_coalition_menu.link(button=COALITION_ACADEMY_GOTO_CAMPAIGN, destination=page_coalition) # NEONCITY -page_coalition = Page(NEONCITY_COALITION_CHECK) -page_coalition.link(button=NEONCITY_UI_HOME, destination=page_main) -page_coalition.link(button=NEONCITY_UI_BACK, destination=page_campaign) +# page_coalition = Page(NEONCITY_COALITION_CHECK) +# page_coalition.link(button=NEONCITY_UI_HOME, destination=page_main) +# page_coalition.link(button=NEONCITY_UI_BACK, destination=page_campaign) +# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) +# DAL +page_coalition = Page(FROSTFALL_COALITION_CHECK) +page_coalition.link(button=GOTO_MAIN, destination=page_main) +page_coalition.link(button=BACK_ARROW, destination=page_campaign) page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition) # Operation Siren