From 5d41cc40de819348e44bdda40285246a98f69a8d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 23 Jul 2026 22:34:37 +0800 Subject: [PATCH] Add: Event entrance of Authentic Horror Story (coalition_20260723) --- campaign/Readme.md | 1 + config/template.json | 192 +++--- module/config/argument/args.json | 995 +++++++++++++-------------- module/config/argument/argument.yaml | 4 +- module/config/argument/menu.json | 6 +- module/config/argument/override.yaml | 2 +- module/config/argument/task.yaml | 24 +- module/config/config_generated.py | 2 +- module/config/i18n/en-US.json | 26 +- module/config/i18n/ja-JP.json | 26 +- module/config/i18n/zh-CN.json | 26 +- module/config/i18n/zh-TW.json | 26 +- 12 files changed, 665 insertions(+), 665 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index 52aa38dd4..a48b1f20d 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -305,3 +305,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260625 | event 20260625 cn | Miracle by Midnight | 美梦巡演奇妙夜 | Miracle by Midnight | 幻夢のカヴァルカード | - | | 20260703 | coalition 20230323 | Frostfall | - | - | - | 極地風暴 | | 20260709 | event 20260625 cn | Miracle by Midnight | - | - | - | 美夢巡演奇秒夜 | +| 20260723 | coalition 20260723 | Authentic Horror Story | 怪谈纪实 | Authentic Horror Story | 怪談実録 | - | diff --git a/config/template.json b/config/template.json index b124099f7..99ffce4f3 100644 --- a/config/template.json +++ b/config/template.json @@ -385,6 +385,54 @@ "Storage": {} } }, + "Coalition": { + "Scheduler": { + "Enable": false, + "NextRun": "2020-01-01 00:00:00", + "Command": "Coalition", + "SuccessInterval": 30, + "FailureInterval": 30, + "ServerUpdate": "00:00" + }, + "Campaign": { + "Name": "dynamic", + "Event": "campaign_main", + "Mode": "normal", + "UseClearMode": true, + "UseFleetLock": true, + "UseAutoSearch": false, + "Use2xBook": false, + "AmbushEvade": true + }, + "Coalition": { + "Mode": "hard", + "Fleet": "single" + }, + "StopCondition": { + "OilLimit": 1000, + "RunCount": 0, + "MapAchievement": "non_stop", + "StageIncrease": false, + "GetNewShip": false, + "ReachLevel": 0 + }, + "Emotion": { + "Mode": "calculate", + "Fleet1Value": 119, + "Fleet1Record": "2020-01-01 00:00:00", + "Fleet1Control": "prevent_green_face", + "Fleet1Recover": "not_in_dormitory", + "Fleet1Oath": false, + "Fleet2Value": 119, + "Fleet2Record": "2020-01-01 00:00:00", + "Fleet2Control": "prevent_yellow_face", + "Fleet2Recover": "not_in_dormitory", + "Fleet2Oath": false + }, + "Storage": { + "Storage": {} + } + }, "Event": { "Scheduler": { "Enable": false, @@ -618,54 +666,6 @@ "Storage": {} } }, - "Coalition": { - "Scheduler": { - "Enable": false, - "NextRun": "2020-01-01 00:00:00", - "Command": "Coalition", - "SuccessInterval": 30, - "FailureInterval": 30, - "ServerUpdate": "00:00" - }, - "Campaign": { - "Name": "dynamic", - "Event": "campaign_main", - "Mode": "normal", - "UseClearMode": true, - "UseFleetLock": true, - "UseAutoSearch": false, - "Use2xBook": false, - "AmbushEvade": true - }, - "Coalition": { - "Mode": "tc3", - "Fleet": "single" - }, - "StopCondition": { - "OilLimit": 1000, - "RunCount": 0, - "MapAchievement": "non_stop", - "StageIncrease": false, - "GetNewShip": false, - "ReachLevel": 0 - }, - "Emotion": { - "Mode": "calculate", - "Fleet1Value": 119, - "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_green_face", - "Fleet1Recover": "not_in_dormitory", - "Fleet1Oath": false, - "Fleet2Value": 119, - "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", - "Fleet2Recover": "not_in_dormitory", - "Fleet2Oath": false - }, - "Storage": { - "Storage": {} - } - }, "MaritimeEscort": { "Scheduler": { "Enable": false, @@ -756,6 +756,54 @@ "Storage": {} } }, + "CoalitionSp": { + "Scheduler": { + "Enable": false, + "NextRun": "2020-01-01 00:00:00", + "Command": "CoalitionSp", + "SuccessInterval": 30, + "FailureInterval": 30, + "ServerUpdate": "00:00" + }, + "Campaign": { + "Name": "sp", + "Event": "campaign_main", + "Mode": "normal", + "UseClearMode": true, + "UseFleetLock": true, + "UseAutoSearch": false, + "Use2xBook": false, + "AmbushEvade": true + }, + "Coalition": { + "Mode": "sp", + "Fleet": "single" + }, + "StopCondition": { + "OilLimit": 1000, + "RunCount": 0, + "MapAchievement": "non_stop", + "StageIncrease": false, + "GetNewShip": false, + "ReachLevel": 0 + }, + "Emotion": { + "Mode": "calculate", + "Fleet1Value": 119, + "Fleet1Record": "2020-01-01 00:00:00", + "Fleet1Control": "prevent_green_face", + "Fleet1Recover": "not_in_dormitory", + "Fleet1Oath": false, + "Fleet2Value": 119, + "Fleet2Record": "2020-01-01 00:00:00", + "Fleet2Control": "prevent_yellow_face", + "Fleet2Recover": "not_in_dormitory", + "Fleet2Oath": false + }, + "Storage": { + "Storage": {} + } + }, "EventA": { "Scheduler": { "Enable": false, @@ -1189,54 +1237,6 @@ "Storage": {} } }, - "CoalitionSp": { - "Scheduler": { - "Enable": false, - "NextRun": "2020-01-01 00:00:00", - "Command": "CoalitionSp", - "SuccessInterval": 30, - "FailureInterval": 30, - "ServerUpdate": "00:00" - }, - "Campaign": { - "Name": "sp", - "Event": "campaign_main", - "Mode": "normal", - "UseClearMode": true, - "UseFleetLock": true, - "UseAutoSearch": false, - "Use2xBook": false, - "AmbushEvade": true - }, - "Coalition": { - "Mode": "sp", - "Fleet": "single" - }, - "StopCondition": { - "OilLimit": 1000, - "RunCount": 0, - "MapAchievement": "non_stop", - "StageIncrease": false, - "GetNewShip": false, - "ReachLevel": 0 - }, - "Emotion": { - "Mode": "calculate", - "Fleet1Value": 119, - "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_green_face", - "Fleet1Recover": "not_in_dormitory", - "Fleet1Oath": false, - "Fleet2Value": 119, - "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", - "Fleet2Recover": "not_in_dormitory", - "Fleet2Oath": false - }, - "Storage": { - "Storage": {} - } - }, "Commission": { "Scheduler": { "Enable": true, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 4c4cbd257..b91a53eea 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -2024,6 +2024,254 @@ } } }, + "Coalition": { + "Scheduler": { + "Enable": { + "type": "checkbox", + "value": false, + "option": [ + true, + false + ] + }, + "NextRun": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime" + }, + "Command": { + "type": "input", + "value": "Coalition", + "display": "hide" + }, + "SuccessInterval": { + "type": "input", + "value": 30, + "display": "hide" + }, + "FailureInterval": { + "type": "input", + "value": 30, + "display": "hide" + }, + "ServerUpdate": { + "type": "input", + "value": "00:00", + "display": "hide" + } + }, + "Campaign": { + "Name": { + "type": "input", + "value": "dynamic", + "display": "hide" + }, + "Event": { + "type": "select", + "value": "campaign_main", + "option": [ + "coalition_20230323", + "coalition_20260723" + ], + "option_cn": [ + "coalition_20260723" + ], + "option_en": [ + "coalition_20260723" + ], + "option_jp": [ + "coalition_20260723" + ], + "option_tw": [ + "coalition_20230323" + ], + "option_bold": [ + "coalition_20230323", + "coalition_20260723" + ] + }, + "Mode": { + "type": "select", + "value": "normal", + "option": [ + "normal", + "hard" + ], + "display": "hide" + }, + "UseClearMode": { + "type": "checkbox", + "value": true, + "display": "hide" + }, + "UseFleetLock": { + "type": "checkbox", + "value": true, + "display": "hide" + }, + "UseAutoSearch": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "Use2xBook": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "AmbushEvade": { + "type": "checkbox", + "value": true, + "display": "hide" + } + }, + "Coalition": { + "Mode": { + "type": "select", + "value": "hard", + "option": [ + "easy", + "normal", + "hard", + "sp" + ] + }, + "Fleet": { + "type": "select", + "value": "single", + "option": [ + "single", + "multi" + ] + } + }, + "StopCondition": { + "OilLimit": { + "type": "input", + "value": 1000 + }, + "RunCount": { + "type": "input", + "value": 0 + }, + "MapAchievement": { + "type": "select", + "value": "non_stop", + "option": [ + "non_stop", + "100_percent_clear", + "map_3_stars", + "threat_safe", + "threat_safe_without_3_stars" + ], + "display": "hide" + }, + "StageIncrease": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "GetNewShip": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "ReachLevel": { + "type": "input", + "value": 0, + "display": "hide" + } + }, + "Emotion": { + "Mode": { + "type": "select", + "value": "calculate", + "option": [ + "calculate", + "ignore", + "calculate_ignore" + ] + }, + "Fleet1Value": { + "type": "input", + "value": 119 + }, + "Fleet1Record": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime", + "display": "disabled" + }, + "Fleet1Control": { + "type": "select", + "value": "prevent_green_face", + "option": [ + "keep_exp_bonus", + "prevent_green_face", + "prevent_yellow_face", + "prevent_red_face" + ] + }, + "Fleet1Recover": { + "type": "select", + "value": "not_in_dormitory", + "option": [ + "not_in_dormitory", + "dormitory_floor_1", + "dormitory_floor_2" + ] + }, + "Fleet1Oath": { + "type": "checkbox", + "value": false + }, + "Fleet2Value": { + "type": "input", + "value": 119, + "display": "hide" + }, + "Fleet2Record": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime", + "display": "hide" + }, + "Fleet2Control": { + "type": "select", + "value": "prevent_yellow_face", + "option": [ + "keep_exp_bonus", + "prevent_green_face", + "prevent_yellow_face", + "prevent_red_face" + ], + "display": "hide" + }, + "Fleet2Recover": { + "type": "select", + "value": "not_in_dormitory", + "option": [ + "not_in_dormitory", + "dormitory_floor_1", + "dormitory_floor_2" + ], + "display": "hide" + }, + "Fleet2Oath": { + "type": "checkbox", + "value": false, + "display": "hide" + } + }, + "Storage": { + "Storage": { + "type": "storage", + "value": {}, + "valuetype": "ignore", + "display": "disabled" + } + } + }, "Event": { "Scheduler": { "Enable": { @@ -3229,254 +3477,6 @@ } } }, - "Coalition": { - "Scheduler": { - "Enable": { - "type": "checkbox", - "value": false, - "option": [ - true, - false - ] - }, - "NextRun": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime" - }, - "Command": { - "type": "input", - "value": "Coalition", - "display": "hide" - }, - "SuccessInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "FailureInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "ServerUpdate": { - "type": "input", - "value": "00:00", - "display": "hide" - } - }, - "Campaign": { - "Name": { - "type": "input", - "value": "dynamic", - "display": "hide" - }, - "Event": { - "type": "select", - "value": "campaign_main", - "option": [ - "coalition_20230323", - "coalition_20260122" - ], - "option_cn": [ - "coalition_20260122" - ], - "option_en": [ - "coalition_20260122" - ], - "option_jp": [ - "coalition_20260122" - ], - "option_tw": [ - "coalition_20230323" - ], - "option_bold": [ - "coalition_20230323", - "coalition_20260122" - ] - }, - "Mode": { - "type": "select", - "value": "normal", - "option": [ - "normal", - "hard" - ], - "display": "hide" - }, - "UseClearMode": { - "type": "checkbox", - "value": true, - "display": "hide" - }, - "UseFleetLock": { - "type": "checkbox", - "value": true, - "display": "hide" - }, - "UseAutoSearch": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "Use2xBook": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "AmbushEvade": { - "type": "checkbox", - "value": true, - "display": "hide" - } - }, - "Coalition": { - "Mode": { - "type": "select", - "value": "tc3", - "option": [ - "tc1", - "tc2", - "tc3", - "ex" - ] - }, - "Fleet": { - "type": "select", - "value": "single", - "option": [ - "single", - "multi" - ] - } - }, - "StopCondition": { - "OilLimit": { - "type": "input", - "value": 1000 - }, - "RunCount": { - "type": "input", - "value": 0 - }, - "MapAchievement": { - "type": "select", - "value": "non_stop", - "option": [ - "non_stop", - "100_percent_clear", - "map_3_stars", - "threat_safe", - "threat_safe_without_3_stars" - ], - "display": "hide" - }, - "StageIncrease": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "GetNewShip": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "ReachLevel": { - "type": "input", - "value": 0, - "display": "hide" - } - }, - "Emotion": { - "Mode": { - "type": "select", - "value": "calculate", - "option": [ - "calculate", - "ignore", - "calculate_ignore" - ] - }, - "Fleet1Value": { - "type": "input", - "value": 119 - }, - "Fleet1Record": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime", - "display": "disabled" - }, - "Fleet1Control": { - "type": "select", - "value": "prevent_green_face", - "option": [ - "keep_exp_bonus", - "prevent_green_face", - "prevent_yellow_face", - "prevent_red_face" - ] - }, - "Fleet1Recover": { - "type": "select", - "value": "not_in_dormitory", - "option": [ - "not_in_dormitory", - "dormitory_floor_1", - "dormitory_floor_2" - ] - }, - "Fleet1Oath": { - "type": "checkbox", - "value": false - }, - "Fleet2Value": { - "type": "input", - "value": 119, - "display": "hide" - }, - "Fleet2Record": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime", - "display": "hide" - }, - "Fleet2Control": { - "type": "select", - "value": "prevent_yellow_face", - "option": [ - "keep_exp_bonus", - "prevent_green_face", - "prevent_yellow_face", - "prevent_red_face" - ], - "display": "hide" - }, - "Fleet2Recover": { - "type": "select", - "value": "not_in_dormitory", - "option": [ - "not_in_dormitory", - "dormitory_floor_1", - "dormitory_floor_2" - ], - "display": "hide" - }, - "Fleet2Oath": { - "type": "checkbox", - "value": false, - "display": "hide" - } - }, - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, "MaritimeEscort": { "Scheduler": { "Enable": { @@ -4155,6 +4155,255 @@ } } }, + "CoalitionSp": { + "Scheduler": { + "Enable": { + "type": "checkbox", + "value": false, + "option": [ + true, + false + ] + }, + "NextRun": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime" + }, + "Command": { + "type": "input", + "value": "CoalitionSp", + "display": "hide" + }, + "SuccessInterval": { + "type": "input", + "value": 30, + "display": "hide" + }, + "FailureInterval": { + "type": "input", + "value": 30, + "display": "hide" + }, + "ServerUpdate": { + "type": "input", + "value": "00:00", + "display": "hide" + } + }, + "Campaign": { + "Name": { + "type": "input", + "value": "sp", + "display": "hide" + }, + "Event": { + "type": "select", + "value": "campaign_main", + "option": [ + "coalition_20230323", + "coalition_20260723" + ], + "option_cn": [ + "coalition_20260723" + ], + "option_en": [ + "coalition_20260723" + ], + "option_jp": [ + "coalition_20260723" + ], + "option_tw": [ + "coalition_20230323" + ], + "option_bold": [ + "coalition_20230323", + "coalition_20260723" + ] + }, + "Mode": { + "type": "select", + "value": "normal", + "option": [ + "normal", + "hard" + ], + "display": "hide" + }, + "UseClearMode": { + "type": "checkbox", + "value": true, + "display": "hide" + }, + "UseFleetLock": { + "type": "checkbox", + "value": true, + "display": "hide" + }, + "UseAutoSearch": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "Use2xBook": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "AmbushEvade": { + "type": "checkbox", + "value": true, + "display": "hide" + } + }, + "Coalition": { + "Mode": { + "type": "select", + "value": "sp", + "option": [ + "easy", + "normal", + "hard", + "sp" + ], + "display": "hide" + }, + "Fleet": { + "type": "select", + "value": "single", + "option": [ + "single", + "multi" + ] + } + }, + "StopCondition": { + "OilLimit": { + "type": "input", + "value": 1000 + }, + "RunCount": { + "type": "input", + "value": 0 + }, + "MapAchievement": { + "type": "select", + "value": "non_stop", + "option": [ + "non_stop", + "100_percent_clear", + "map_3_stars", + "threat_safe", + "threat_safe_without_3_stars" + ], + "display": "hide" + }, + "StageIncrease": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "GetNewShip": { + "type": "checkbox", + "value": false, + "display": "hide" + }, + "ReachLevel": { + "type": "input", + "value": 0, + "display": "hide" + } + }, + "Emotion": { + "Mode": { + "type": "select", + "value": "calculate", + "option": [ + "calculate", + "ignore", + "calculate_ignore" + ] + }, + "Fleet1Value": { + "type": "input", + "value": 119 + }, + "Fleet1Record": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime", + "display": "disabled" + }, + "Fleet1Control": { + "type": "select", + "value": "prevent_green_face", + "option": [ + "keep_exp_bonus", + "prevent_green_face", + "prevent_yellow_face", + "prevent_red_face" + ] + }, + "Fleet1Recover": { + "type": "select", + "value": "not_in_dormitory", + "option": [ + "not_in_dormitory", + "dormitory_floor_1", + "dormitory_floor_2" + ] + }, + "Fleet1Oath": { + "type": "checkbox", + "value": false + }, + "Fleet2Value": { + "type": "input", + "value": 119, + "display": "hide" + }, + "Fleet2Record": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime", + "display": "hide" + }, + "Fleet2Control": { + "type": "select", + "value": "prevent_yellow_face", + "option": [ + "keep_exp_bonus", + "prevent_green_face", + "prevent_yellow_face", + "prevent_red_face" + ], + "display": "hide" + }, + "Fleet2Recover": { + "type": "select", + "value": "not_in_dormitory", + "option": [ + "not_in_dormitory", + "dormitory_floor_1", + "dormitory_floor_2" + ], + "display": "hide" + }, + "Fleet2Oath": { + "type": "checkbox", + "value": false, + "display": "hide" + } + }, + "Storage": { + "Storage": { + "type": "storage", + "value": {}, + "valuetype": "ignore", + "display": "disabled" + } + } + }, "EventA": { "Scheduler": { "Enable": { @@ -6439,256 +6688,6 @@ } } }, - "CoalitionSp": { - "Scheduler": { - "Enable": { - "type": "checkbox", - "value": false, - "option": [ - true, - false - ] - }, - "NextRun": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime" - }, - "Command": { - "type": "input", - "value": "CoalitionSp", - "display": "hide" - }, - "SuccessInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "FailureInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "ServerUpdate": { - "type": "input", - "value": "00:00", - "display": "hide" - } - }, - "Campaign": { - "Name": { - "type": "input", - "value": "sp", - "display": "hide" - }, - "Event": { - "type": "select", - "value": "campaign_main", - "option": [ - "coalition_20230323", - "coalition_20260122" - ], - "option_cn": [ - "coalition_20260122" - ], - "option_en": [ - "coalition_20260122" - ], - "option_jp": [ - "coalition_20260122" - ], - "option_tw": [ - "coalition_20230323" - ], - "option_bold": [ - "coalition_20230323", - "coalition_20260122" - ] - }, - "Mode": { - "type": "select", - "value": "normal", - "option": [ - "normal", - "hard" - ], - "display": "hide" - }, - "UseClearMode": { - "type": "checkbox", - "value": true, - "display": "hide" - }, - "UseFleetLock": { - "type": "checkbox", - "value": true, - "display": "hide" - }, - "UseAutoSearch": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "Use2xBook": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "AmbushEvade": { - "type": "checkbox", - "value": true, - "display": "hide" - } - }, - "Coalition": { - "Mode": { - "type": "select", - "value": "sp", - "option": [ - "tc1", - "tc2", - "tc3", - "sp", - "ex" - ], - "display": "hide" - }, - "Fleet": { - "type": "select", - "value": "single", - "option": [ - "single", - "multi" - ] - } - }, - "StopCondition": { - "OilLimit": { - "type": "input", - "value": 1000 - }, - "RunCount": { - "type": "input", - "value": 0 - }, - "MapAchievement": { - "type": "select", - "value": "non_stop", - "option": [ - "non_stop", - "100_percent_clear", - "map_3_stars", - "threat_safe", - "threat_safe_without_3_stars" - ], - "display": "hide" - }, - "StageIncrease": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "GetNewShip": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "ReachLevel": { - "type": "input", - "value": 0, - "display": "hide" - } - }, - "Emotion": { - "Mode": { - "type": "select", - "value": "calculate", - "option": [ - "calculate", - "ignore", - "calculate_ignore" - ] - }, - "Fleet1Value": { - "type": "input", - "value": 119 - }, - "Fleet1Record": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime", - "display": "disabled" - }, - "Fleet1Control": { - "type": "select", - "value": "prevent_green_face", - "option": [ - "keep_exp_bonus", - "prevent_green_face", - "prevent_yellow_face", - "prevent_red_face" - ] - }, - "Fleet1Recover": { - "type": "select", - "value": "not_in_dormitory", - "option": [ - "not_in_dormitory", - "dormitory_floor_1", - "dormitory_floor_2" - ] - }, - "Fleet1Oath": { - "type": "checkbox", - "value": false - }, - "Fleet2Value": { - "type": "input", - "value": 119, - "display": "hide" - }, - "Fleet2Record": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime", - "display": "hide" - }, - "Fleet2Control": { - "type": "select", - "value": "prevent_yellow_face", - "option": [ - "keep_exp_bonus", - "prevent_green_face", - "prevent_yellow_face", - "prevent_red_face" - ], - "display": "hide" - }, - "Fleet2Recover": { - "type": "select", - "value": "not_in_dormitory", - "option": [ - "not_in_dormitory", - "dormitory_floor_1", - "dormitory_floor_2" - ], - "display": "hide" - }, - "Fleet2Oath": { - "type": "checkbox", - "value": false, - "display": "hide" - } - }, - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, "Commission": { "Scheduler": { "Enable": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 8dfe05e47..6bfbedcc6 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -315,8 +315,8 @@ MaritimeEscort: Enable: true Coalition: Mode: - value: tc3 - option: [ tc1, tc2, tc3, sp, ex ] + value: hard + option: [ easy, normal, hard, sp ] Fleet: value: single option: [ single, multi ] diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index abdfe9c9b..7a2c2243d 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -23,11 +23,11 @@ "page": "setting", "tasks": [ "EventGeneral", + "Coalition", "Event", "Event2", "Raid", "Hospital", - "Coalition", "MaritimeEscort", "WarArchives" ] @@ -36,13 +36,13 @@ "menu": "collapse", "page": "setting", "tasks": [ + "CoalitionSp", "EventA", "EventB", "EventC", "EventD", "EventSp", - "RaidDaily", - "CoalitionSp" + "RaidDaily" ] }, "Reward": { diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index ed4bc8a68..99266fc18 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -235,7 +235,7 @@ Coalition: AmbushEvade: true Coalition: Mode: - option: [ tc1, tc2, tc3, ex ] + option: [ easy, normal, hard, sp ] StopCondition: MapAchievement: non_stop StageIncrease: false diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 377d43589..6ecd4d843 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -74,6 +74,12 @@ Event: EventGeneral: - EventGeneral - TaskBalancer + Coalition: + - Scheduler + - Campaign + - Coalition + - StopCondition + - Emotion Event: - Scheduler - Campaign @@ -103,12 +109,6 @@ Event: - Hospital - StopCondition - Emotion - Coalition: - - Scheduler - - Campaign - - Coalition - - StopCondition - - Emotion MaritimeEscort: - Scheduler - MaritimeEscort @@ -129,6 +129,12 @@ EventDaily: menu: 'collapse' page: 'setting' tasks: + CoalitionSp: + - Scheduler + - Campaign + - Coalition + - StopCondition + - Emotion EventA: - Scheduler - EventDaily @@ -184,12 +190,6 @@ EventDaily: - Campaign - StopCondition - Emotion - CoalitionSp: - - Scheduler - - Campaign - - Coalition - - StopCondition - - Emotion # ==================== Reward ==================== diff --git a/module/config/config_generated.py b/module/config/config_generated.py index a3eae55f0..3367f6532 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -185,7 +185,7 @@ class GeneratedConfig: MaritimeEscort_Enable = True # Group `Coalition` - Coalition_Mode = 'tc3' # tc1, tc2, tc3, sp, ex + Coalition_Mode = 'hard' # easy, normal, hard, sp Coalition_Fleet = 'single' # single, multi # Group `Commission` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index ef8a11c46..bc26e3113 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -66,6 +66,10 @@ "name": "Event General", "help": "" }, + "Coalition": { + "name": "Authentic Horror Story", + "help": "" + }, "Event": { "name": "Event", "help": "" @@ -82,10 +86,6 @@ "name": "Valley Hospital", "help": "" }, - "Coalition": { - "name": "Frostfall", - "help": "" - }, "MaritimeEscort": { "name": "Maritime Escort", "help": "" @@ -94,6 +94,10 @@ "name": "War Archives", "help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search" }, + "CoalitionSp": { + "name": "Authentic Horror Story SP", + "help": "" + }, "EventA": { "name": "Event Daily A", "help": "" @@ -118,10 +122,6 @@ "name": "Raid Daily", "help": "" }, - "CoalitionSp": { - "name": "Frostfall SP", - "help": "" - }, "Commission": { "name": "Commission", "help": "" @@ -689,6 +689,7 @@ "coalition_20250626": "The Neon City Investigator", "coalition_20251120": "DATE A LANE", "coalition_20260122": "Light & Shadow Fashion Shoot!", + "coalition_20260723": "Authentic Horror Story", "event_20200227_cn": "Northern Overture", "event_20200312_cn": "The Solomon Ranger Rerun", "event_20200326_cn": "Microlayer Medley", @@ -1355,11 +1356,10 @@ "Mode": { "name": "Mode", "help": "SP needs to use event daily SP to run", - "tc1": "tc1", - "tc2": "tc2", - "tc3": "tc3", - "sp": "sp", - "ex": "ex" + "easy": "easy", + "normal": "normal", + "hard": "hard", + "sp": "sp" }, "Fleet": { "name": "Fleet", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f8c73caba..73d221f4b 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -66,6 +66,10 @@ "name": "イベント共通設定", "help": "" }, + "Coalition": { + "name": "怪談実録", + "help": "" + }, "Event": { "name": "イベント海域", "help": "" @@ -82,10 +86,6 @@ "name": "病院探訪", "help": "" }, - "Coalition": { - "name": "星霜海嵐", - "help": "" - }, "MaritimeEscort": { "name": "Maritime Escort", "help": "" @@ -94,6 +94,10 @@ "name": "作戦履歴", "help": "" }, + "CoalitionSp": { + "name": "怪談実録SP", + "help": "" + }, "EventA": { "name": "毎日イベント海域A", "help": "" @@ -118,10 +122,6 @@ "name": "Raid Daily", "help": "" }, - "CoalitionSp": { - "name": "星霜海嵐SP", - "help": "" - }, "Commission": { "name": "委託", "help": "" @@ -689,6 +689,7 @@ "coalition_20250626": "ネオンシティの探索者", "coalition_20251120": "DATE A LANE", "coalition_20260122": "特集写真-撮影進行中", + "coalition_20260723": "怪談実録", "event_20200227_cn": "凍絶の北海", "event_20200312_cn": "南洋に靡く硝煙（復刻）", "event_20200326_cn": "闇靄払う銀翼", @@ -1355,11 +1356,10 @@ "Mode": { "name": "Coalition.Mode.name", "help": "Coalition.Mode.help", - "tc1": "tc1", - "tc2": "tc2", - "tc3": "tc3", - "sp": "sp", - "ex": "ex" + "easy": "easy", + "normal": "normal", + "hard": "hard", + "sp": "sp" }, "Fleet": { "name": "Coalition.Fleet.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 990208539..1231a662a 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -66,6 +66,10 @@ "name": "活动通用设置", "help": "" }, + "Coalition": { + "name": "怪谈纪实", + "help": "" + }, "Event": { "name": "活动图", "help": "" @@ -82,10 +86,6 @@ "name": "深谷来信", "help": "" }, - "Coalition": { - "name": "极地风暴", - "help": "" - }, "MaritimeEscort": { "name": "商船护航", "help": "" @@ -94,6 +94,10 @@ "name": "作战档案", "help": "由于作战档案缺少维护，开荒功能不一定能正常使用，如果发现Alas运行异常，请手动完成开荒后使用自律寻敌功能" }, + "CoalitionSp": { + "name": "怪谈纪实每日SP", + "help": "" + }, "EventA": { "name": "活动每日A图", "help": "" @@ -118,10 +122,6 @@ "name": "共斗活动每日", "help": "" }, - "CoalitionSp": { - "name": "极地风暴每日SP", - "help": "" - }, "Commission": { "name": "委托", "help": "" @@ -689,6 +689,7 @@ "coalition_20250626": "迷彩都市的寻踪者", "coalition_20251120": "DATE A LANE", "coalition_20260122": "光影风尚-拍摄进行时", + "coalition_20260723": "怪谈纪实", "event_20200227_cn": "北境序曲", "event_20200312_cn": "复刻斯图尔特的硝烟", "event_20200326_cn": "微层混合", @@ -1355,11 +1356,10 @@ "Mode": { "name": "难度", "help": "SP图需要使用活动每日SP运行", - "tc1": "tc1", - "tc2": "tc2", - "tc3": "tc3", - "sp": "sp", - "ex": "ex" + "easy": "easy", + "normal": "normal", + "hard": "hard", + "sp": "sp" }, "Fleet": { "name": "出击队伍", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 643a19cf2..d09629a34 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -66,6 +66,10 @@ "name": "活動通用", "help": "" }, + "Coalition": { + "name": "極地風暴", + "help": "" + }, "Event": { "name": "活動圖", "help": "" @@ -82,10 +86,6 @@ "name": "深谷来信", "help": "" }, - "Coalition": { - "name": "極地風暴", - "help": "" - }, "MaritimeEscort": { "name": "商船護航", "help": "" @@ -94,6 +94,10 @@ "name": "作戰檔案", "help": "由於作戰檔案缺少維護，開荒功能不一定能正常使用，如果發現Alas運行異常，請手動完成開荒後使用自律尋敵功能" }, + "CoalitionSp": { + "name": "極地風暴SP", + "help": "" + }, "EventA": { "name": "活動每日A圖", "help": "" @@ -118,10 +122,6 @@ "name": "共鬥活動每日", "help": "" }, - "CoalitionSp": { - "name": "極地風暴SP", - "help": "" - }, "Commission": { "name": "委託", "help": "" @@ -689,6 +689,7 @@ "coalition_20250626": "迷彩都市的尋蹤者", "coalition_20251120": "DATE A LANE", "coalition_20260122": "光影風尚-拍攝進行時", + "coalition_20260723": "Authentic Horror Story", "event_20200227_cn": "Northern Overture", "event_20200312_cn": "斯圖爾特的硝煙", "event_20200326_cn": "Microlayer Medley", @@ -1355,11 +1356,10 @@ "Mode": { "name": "難度", "help": "SP圖需要使用活動每日SP運行", - "tc1": "tc1", - "tc2": "tc2", - "tc3": "tc3", - "sp": "sp", - "ex": "ex" + "easy": "easy", + "normal": "normal", + "hard": "hard", + "sp": "sp" }, "Fleet": { "name": "出擊隊伍",