diff --git a/config/template.json b/config/template.json index 0689b5247..7351eb867 100644 --- a/config/template.json +++ b/config/template.json @@ -908,61 +908,6 @@ "Storage": {} } }, - "Hospital": { - "Scheduler": { - "Enable": false, - "NextRun": "2020-01-01 00:00:00", - "Command": "Hospital", - "SuccessInterval": 0, - "FailureInterval": 120, - "ServerUpdate": "00:00" - }, - "Hospital": { - "UseRecommendFleet": true - }, - "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_yellow_face", - "Fleet1Recover": "not_in_dormitory", - "Fleet1Oath": false, - "Fleet1Onsen": false, - "Fleet2Value": 119, - "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", - "Fleet2Recover": "not_in_dormitory", - "Fleet2Oath": false, - "Fleet2Onsen": false - }, - "Storage": { - "Storage": {} - } - }, - "MaritimeEscort": { - "Scheduler": { - "Enable": false, - "NextRun": "2020-01-01 00:00:00", - "Command": "MaritimeEscort", - "SuccessInterval": 30, - "FailureInterval": 30, - "ServerUpdate": "00:00" - }, - "MaritimeEscort": { - "Enable": true - }, - "Storage": { - "Storage": {} - } - }, "WarArchives": { "Scheduler": { "Enable": false, @@ -2502,11 +2447,6 @@ "Storage": {} } }, - "IslandPearl": { - "Storage": { - "Storage": {} - } - }, "Benchmark": { "Benchmark": { "DeviceType": "emulator", diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 425bae37e..d221d7396 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -4701,241 +4701,6 @@ } } }, - "Hospital": { - "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": "Hospital", - "display": "hide" - }, - "SuccessInterval": { - "type": "input", - "value": 0, - "display": "hide" - }, - "FailureInterval": { - "type": "input", - "value": 120, - "display": "hide" - }, - "ServerUpdate": { - "type": "input", - "value": "00:00", - "display": "hide" - } - }, - "Hospital": { - "UseRecommendFleet": { - "type": "checkbox", - "value": true - } - }, - "StopCondition": { - "OilLimit": { - "type": "input", - "value": 1000 - }, - "RunCount": { - "type": "input", - "value": 0, - "display": "hide" - }, - "MapAchievement": { - "type": "select", - "value": "non_stop", - "option": [ - "non_stop", - "non_stop_clear_all", - "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_yellow_face", - "option": [ - "keep_exp_bonus", - "prevent_green_face", - "prevent_yellow_face", - "prevent_red_face" - ], - "display": "hide" - }, - "Fleet1Recover": { - "type": "select", - "value": "not_in_dormitory", - "option": [ - "not_in_dormitory", - "dormitory_floor_1", - "dormitory_floor_2" - ], - "display": "hide" - }, - "Fleet1Oath": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "Fleet1Onsen": { - "type": "checkbox", - "value": false, - "display": "hide" - }, - "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" - }, - "Fleet2Onsen": { - "type": "checkbox", - "value": false, - "display": "hide" - } - }, - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, - "MaritimeEscort": { - "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": "MaritimeEscort", - "display": "hide" - }, - "SuccessInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "FailureInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "ServerUpdate": { - "type": "input", - "value": "00:00", - "display": "hide" - } - }, - "MaritimeEscort": { - "Enable": { - "type": "checkbox", - "value": true - } - }, - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, "WarArchives": { "Scheduler": { "Enable": { @@ -14865,16 +14630,6 @@ } } }, - "IslandPearl": { - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, "Benchmark": { "Benchmark": { "DeviceType": { diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 497df0743..cb020b448 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -30,8 +30,6 @@ "Raid", "RaidScuttle", "CoalitionScuttle", - "Hospital", - "MaritimeEscort", "WarArchives" ] }, @@ -108,7 +106,6 @@ "OpsiDaemon", "EventStory", "BoxDisassemble", - "IslandPearl", "Benchmark", "DowntimeFetch", "AzurLaneUncensored", diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 480914211..639755c9d 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -215,24 +215,24 @@ RaidScuttle: Fleet2Recover: not_in_dormitory Fleet2Oath: false Fleet2Onsen: false -Hospital: - StopCondition: - RunCount: 0 - MapAchievement: non_stop - StageIncrease: false - GetNewShip: false - ReachLevel: 0 - Emotion: - Fleet1Control: prevent_yellow_face - Fleet1Recover: not_in_dormitory - Fleet1Oath: false - Fleet1Onsen: false - Fleet2Value: 119 - Fleet2Record: 2020-01-01 00:00:00 - Fleet2Control: prevent_yellow_face - Fleet2Recover: not_in_dormitory - Fleet2Oath: false - Fleet2Onsen: false +# Hospital: +# StopCondition: +# RunCount: 0 +# MapAchievement: non_stop +# StageIncrease: false +# GetNewShip: false +# ReachLevel: 0 +# Emotion: +# Fleet1Control: prevent_yellow_face +# Fleet1Recover: not_in_dormitory +# Fleet1Oath: false +# Fleet1Onsen: false +# Fleet2Value: 119 +# Fleet2Record: 2020-01-01 00:00:00 +# Fleet2Control: prevent_yellow_face +# Fleet2Recover: not_in_dormitory +# Fleet2Oath: false +# Fleet2Onsen: false RaidDaily: Scheduler: SuccessInterval: 30 @@ -260,11 +260,11 @@ RaidDaily: Fleet2Recover: not_in_dormitory Fleet2Oath: false Fleet2Onsen: False -MaritimeEscort: - Scheduler: - SuccessInterval: 30 - FailureInterval: 30 - ServerUpdate: 00:00 +# MaritimeEscort: +# Scheduler: +# SuccessInterval: 30 +# FailureInterval: 30 +# ServerUpdate: 00:00 Coalition: Scheduler: SuccessInterval: 30 diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 9b6bfb717..95c0caf70 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -124,14 +124,6 @@ Event: - Fleet - Submarine - Emotion - Hospital: - - Scheduler - - Hospital - - StopCondition - - Emotion - MaritimeEscort: - - Scheduler - - MaritimeEscort WarArchives: - Scheduler - Campaign @@ -381,8 +373,6 @@ Tool: - EventStory BoxDisassemble: - BoxDisassemble - IslandPearl: - - IslandPearl Benchmark: - Benchmark DowntimeFetch: diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index ab599e23f..58a9342eb 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -94,14 +94,6 @@ "name": "Coalition Scuttle", "help": "" }, - "Hospital": { - "name": "Valley Hospital Story", - "help": "" - }, - "MaritimeEscort": { - "name": "Maritime Escort", - "help": "" - }, "WarArchives": { "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" @@ -286,10 +278,6 @@ "name": "Box Disassemble", "help": "" }, - "IslandPearl": { - "name": "Task.IslandPearl.name", - "help": "Task.IslandPearl.help" - }, "Benchmark": { "name": "Performance Test", "help": "" diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 0986ee8ec..d4715830f 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -94,14 +94,6 @@ "name": "Task.CoalitionScuttle.name", "help": "Task.CoalitionScuttle.help" }, - "Hospital": { - "name": "病院探訪ストーリー", - "help": "" - }, - "MaritimeEscort": { - "name": "Maritime Escort", - "help": "" - }, "WarArchives": { "name": "作戦履歴", "help": "" @@ -286,10 +278,6 @@ "name": "Task.BoxDisassemble.name", "help": "Task.BoxDisassemble.help" }, - "IslandPearl": { - "name": "Task.IslandPearl.name", - "help": "Task.IslandPearl.help" - }, "Benchmark": { "name": "機能テスト", "help": "" diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 2bdd2921a..4fff306dd 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -94,14 +94,6 @@ "name": "协斗沉船", "help": "" }, - "Hospital": { - "name": "深谷来信", - "help": "" - }, - "MaritimeEscort": { - "name": "商船护航", - "help": "" - }, "WarArchives": { "name": "作战档案", "help": "由于作战档案缺少维护,开荒功能不一定能正常使用,如果发现Alas运行异常,请手动完成开荒后使用自律寻敌功能" @@ -286,10 +278,6 @@ "name": "拆装备箱", "help": "" }, - "IslandPearl": { - "name": "岛屿珍珠", - "help": "" - }, "Benchmark": { "name": "性能测试", "help": "" diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 21e2f3941..dad466106 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -94,14 +94,6 @@ "name": "協鬥鑿船", "help": "" }, - "Hospital": { - "name": "深谷来信", - "help": "" - }, - "MaritimeEscort": { - "name": "商船護航", - "help": "" - }, "WarArchives": { "name": "作戰檔案", "help": "由於作戰檔案缺少維護,開荒功能不一定能正常使用,如果發現Alas運行異常,請手動完成開荒後使用自律尋敵功能" @@ -286,10 +278,6 @@ "name": "拆裝備箱", "help": "" }, - "IslandPearl": { - "name": "Task.IslandPearl.name", - "help": "Task.IslandPearl.help" - }, "Benchmark": { "name": "性能測試", "help": ""