From 7b70ee8f57e245ddc23f745fa3c04400d4e2f73a Mon Sep 17 00:00:00 2001 From: LA_DI_DA <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Sun, 16 Feb 2025 16:33:01 +0800 Subject: [PATCH] add: favourite setting of Awaken --- config/template.json | 1 + module/awaken/awaken.py | 2 +- module/config/argument/args.json | 4 ++++ module/config/argument/argument.yaml | 1 + module/config/config_generated.py | 1 + module/config/i18n/en-US.json | 4 ++++ module/config/i18n/ja-JP.json | 4 ++++ module/config/i18n/zh-CN.json | 4 ++++ module/config/i18n/zh-TW.json | 4 ++++ 9 files changed, 24 insertions(+), 1 deletion(-) diff --git a/config/template.json b/config/template.json index 723cf0bd0..d15814637 100644 --- a/config/template.json +++ b/config/template.json @@ -1982,6 +1982,7 @@ "ServerUpdate": "00:00, 06:00, 12:00, 18:00, 21:00" }, "Awaken": { + "Favourite": false, "LevelCap": "level120" }, "Storage": { diff --git a/module/awaken/awaken.py b/module/awaken/awaken.py index 60d78d390..265b44d33 100644 --- a/module/awaken/awaken.py +++ b/module/awaken/awaken.py @@ -329,7 +329,7 @@ class Awaken(Dock): """ logger.hr('Awaken run', level=1) self.ui_ensure(page_dock) - self.dock_favourite_set(wait_loading=False) + self.dock_favourite_set(enable=self.config.Awaken_Favourite, wait_loading=False) self.dock_sort_method_dsc_set(wait_loading=False) if use_array: extra = ['can_awaken_plus'] diff --git a/module/config/argument/args.json b/module/config/argument/args.json index d9b1c067e..65456189c 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -10719,6 +10719,10 @@ } }, "Awaken": { + "Favourite": { + "type": "checkbox", + "value": false + }, "LevelCap": { "type": "select", "value": "level120", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 077aa08a8..f9992a36e 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -620,6 +620,7 @@ Reward: CollectMission: true CollectWeeklyMission: true Awaken: + Favourite: false LevelCap: value: level120 option: [ level120, level125 ] diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 9025a0d51..3381b5515 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -344,6 +344,7 @@ class GeneratedConfig: Reward_CollectWeeklyMission = True # Group `Awaken` + Awaken_Favourite = False Awaken_LevelCap = 'level120' # level120, level125 # Group `GeneralShop` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 22e64e6eb..fcc3ee695 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -2245,6 +2245,10 @@ "name": "Cognitive Awakening Settings", "help": "Awaken all ships in dock til cognitive chips/arrays exhausted" }, + "Favourite": { + "name": "Awaken.Favourite.name", + "help": "Awaken.Favourite.help" + }, "LevelCap": { "name": "To Level Cap", "help": "", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 7fbd68abf..a1f49a7ec 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -2245,6 +2245,10 @@ "name": "Awaken._info.name", "help": "Awaken._info.help" }, + "Favourite": { + "name": "Awaken.Favourite.name", + "help": "Awaken.Favourite.help" + }, "LevelCap": { "name": "Awaken.LevelCap.name", "help": "Awaken.LevelCap.help", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 9155fae05..d0d99d910 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -2245,6 +2245,10 @@ "name": "认知觉醒", "help": "认知觉醒船坞内所有的船直到心智单元耗尽" }, + "Favourite": { + "name": "选择常用", + "help": "" + }, "LevelCap": { "name": "觉醒至等级上限", "help": "", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index db1844528..0a5739330 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -2245,6 +2245,10 @@ "name": "認知覺醒", "help": "認知覺醒船塢內所有的船隻直到心智單元耗盡" }, + "Favourite": { + "name": "Awaken.Favourite.name", + "help": "Awaken.Favourite.help" + }, "LevelCap": { "name": "覺醒至等級上限", "help": "",