From b48679be3504fda1204b9144caa7fa5dbd997eb3 Mon Sep 17 00:00:00 2001 From: LA_DI_DA <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Sun, 16 Feb 2025 16:39:43 +0800 Subject: [PATCH] add: more dock filter option for Awaken --- config/template.json | 6 ++- module/awaken/awaken.py | 8 +++- module/config/argument/args.json | 64 ++++++++++++++++++++++++++++ module/config/argument/argument.yaml | 12 ++++++ module/config/config_generated.py | 4 ++ module/config/i18n/en-US.json | 56 ++++++++++++++++++++++++ module/config/i18n/ja-JP.json | 56 ++++++++++++++++++++++++ module/config/i18n/zh-CN.json | 56 ++++++++++++++++++++++++ module/config/i18n/zh-TW.json | 56 ++++++++++++++++++++++++ 9 files changed, 316 insertions(+), 2 deletions(-) diff --git a/config/template.json b/config/template.json index d15814637..166d95df1 100644 --- a/config/template.json +++ b/config/template.json @@ -1983,7 +1983,11 @@ }, "Awaken": { "Favourite": false, - "LevelCap": "level120" + "LevelCap": "level120", + "Sort": "default", + "Index": "default", + "Faction": "default", + "Rarity": "default" }, "Storage": { "Storage": {} diff --git a/module/awaken/awaken.py b/module/awaken/awaken.py index 265b44d33..cb76ea508 100644 --- a/module/awaken/awaken.py +++ b/module/awaken/awaken.py @@ -335,7 +335,13 @@ class Awaken(Dock): extra = ['can_awaken_plus'] else: extra = ['can_awaken'] - self.dock_filter_set(extra=extra) + self.dock_filter_set( + sort='level' if self.config.Awaken_Sort == "default" else self.config.Awaken_Sort, + index='all' if self.config.Awaken_Index == "default" else self.config.Awaken_Index, + faction='all' if self.config.Awaken_Faction == "default" else self.config.Awaken_Faction, + rarity='all' if self.config.Awaken_Rarity == "default" else self.config.Awaken_Rarity, + extra=extra + ) while 1: # page_dock diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 65456189c..e09241841 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -10730,6 +10730,70 @@ "level120", "level125" ] + }, + "Sort": { + "type": "select", + "value": "default", + "option": [ + "default", + "rarity", + "level", + "total", + "join", + "intimacy", + "stat" + ] + }, + "Index": { + "type": "select", + "value": "default", + "option": [ + "default", + "all", + "vanguard", + "main", + "dd", + "cl", + "ca", + "bb", + "cv", + "repair", + "ss", + "others", + "not_available" + ] + }, + "Faction": { + "type": "select", + "value": "default", + "option": [ + "default", + "all", + "eagle", + "royal", + "sakura", + "iron", + "dragon", + "sardegna", + "northern", + "iris", + "vichya", + "other", + "not_available" + ] + }, + "Rarity": { + "type": "select", + "value": "default", + "option": [ + "default", + "all", + "common", + "rare", + "elite", + "super_rare", + "ultra" + ] } }, "Storage": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index f9992a36e..b1a231d41 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -624,6 +624,18 @@ Awaken: LevelCap: value: level120 option: [ level120, level125 ] + Sort: + value: 'default' + option: [ 'default', 'rarity', 'level', 'total', 'join', 'intimacy', 'stat' ] + Index: + value: 'default' + option: [ 'default', 'all', 'vanguard', 'main', 'dd', 'cl', 'ca', 'bb', 'cv', 'repair', 'ss', 'others', 'not_available' ] + Faction: + value: 'default' + option: [ 'default', 'all', 'eagle', 'royal', 'sakura', 'iron', 'dragon', 'sardegna', 'northern', 'iris', 'vichya', 'other', 'not_available' ] + Rarity: + value: 'default' + option: [ 'default', 'all', 'common', 'rare', 'elite', 'super_rare', 'ultra' ] GeneralShop: UseGems: false Refresh: false diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 3381b5515..67da2c813 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -346,6 +346,10 @@ class GeneratedConfig: # Group `Awaken` Awaken_Favourite = False Awaken_LevelCap = 'level120' # level120, level125 + Awaken_Sort = 'default' # default, rarity, level, total, join, intimacy, stat + Awaken_Index = 'default' # default, all, vanguard, main, dd, cl, ca, bb, cv, repair, ss, others, not_available + Awaken_Faction = 'default' # default, all, eagle, royal, sakura, iron, dragon, sardegna, northern, iris, vichya, other, not_available + Awaken_Rarity = 'default' # default, all, common, rare, elite, super_rare, ultra # Group `GeneralShop` GeneralShop_UseGems = False diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index fcc3ee695..43ecfa200 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -2254,6 +2254,62 @@ "help": "", "level120": "Lv.120", "level125": "Lv.125" + }, + "Sort": { + "name": "Awaken.Sort.name", + "help": "Awaken.Sort.help", + "default": "default", + "rarity": "rarity", + "level": "level", + "total": "total", + "join": "join", + "intimacy": "intimacy", + "stat": "stat" + }, + "Index": { + "name": "Awaken.Index.name", + "help": "Awaken.Index.help", + "default": "default", + "all": "all", + "vanguard": "vanguard", + "main": "main", + "dd": "dd", + "cl": "cl", + "ca": "ca", + "bb": "bb", + "cv": "cv", + "repair": "repair", + "ss": "ss", + "others": "others", + "not_available": "not_available" + }, + "Faction": { + "name": "Awaken.Faction.name", + "help": "Awaken.Faction.help", + "default": "default", + "all": "all", + "eagle": "eagle", + "royal": "royal", + "sakura": "sakura", + "iron": "iron", + "dragon": "dragon", + "sardegna": "sardegna", + "northern": "northern", + "iris": "iris", + "vichya": "vichya", + "other": "other", + "not_available": "not_available" + }, + "Rarity": { + "name": "Awaken.Rarity.name", + "help": "Awaken.Rarity.help", + "default": "default", + "all": "all", + "common": "common", + "rare": "rare", + "elite": "elite", + "super_rare": "super_rare", + "ultra": "ultra" } }, "GeneralShop": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index a1f49a7ec..500c245b2 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -2254,6 +2254,62 @@ "help": "Awaken.LevelCap.help", "level120": "level120", "level125": "level125" + }, + "Sort": { + "name": "Awaken.Sort.name", + "help": "Awaken.Sort.help", + "default": "default", + "rarity": "rarity", + "level": "level", + "total": "total", + "join": "join", + "intimacy": "intimacy", + "stat": "stat" + }, + "Index": { + "name": "Awaken.Index.name", + "help": "Awaken.Index.help", + "default": "default", + "all": "all", + "vanguard": "vanguard", + "main": "main", + "dd": "dd", + "cl": "cl", + "ca": "ca", + "bb": "bb", + "cv": "cv", + "repair": "repair", + "ss": "ss", + "others": "others", + "not_available": "not_available" + }, + "Faction": { + "name": "Awaken.Faction.name", + "help": "Awaken.Faction.help", + "default": "default", + "all": "all", + "eagle": "eagle", + "royal": "royal", + "sakura": "sakura", + "iron": "iron", + "dragon": "dragon", + "sardegna": "sardegna", + "northern": "northern", + "iris": "iris", + "vichya": "vichya", + "other": "other", + "not_available": "not_available" + }, + "Rarity": { + "name": "Awaken.Rarity.name", + "help": "Awaken.Rarity.help", + "default": "default", + "all": "all", + "common": "common", + "rare": "rare", + "elite": "elite", + "super_rare": "super_rare", + "ultra": "ultra" } }, "GeneralShop": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index d0d99d910..9112a7e79 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -2254,6 +2254,62 @@ "help": "", "level120": "120级", "level125": "125级" + }, + "Sort": { + "name": "排序", + "help": "", + "default": "默认", + "rarity": "稀有度", + "level": "等级", + "total": "综合性能", + "join": "入手时间", + "intimacy": "好感度", + "stat": "心情值" + }, + "Index": { + "name": "索引", + "help": "", + "default": "默认", + "all": "全部", + "vanguard": "前排先锋", + "main": "后排主力", + "dd": "驱逐", + "cl": "轻巡", + "ca": "重巡", + "bb": "战列", + "cv": "航母", + "repair": "维修", + "ss": "潜艇", + "others": "其他", + "not_available": "not_available" + }, + "Faction": { + "name": "阵营", + "help": "", + "default": "默认", + "all": "全部", + "eagle": "白鹰", + "royal": "皇家", + "sakura": "重樱", + "iron": "铁血", + "dragon": "东煌", + "sardegna": "撒丁帝国", + "northern": "北方联合", + "iris": "自由鸢尾", + "vichya": "维希教廷", + "other": "其他", + "not_available": "not_available" + }, + "Rarity": { + "name": "稀有度", + "help": "", + "default": "默认", + "all": "全部", + "common": "普通", + "rare": "稀有", + "elite": "精锐", + "super_rare": "超稀有", + "ultra": "海上传奇" } }, "GeneralShop": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 0a5739330..7db74088b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -2254,6 +2254,62 @@ "help": "", "level120": "120級", "level125": "125級" + }, + "Sort": { + "name": "Awaken.Sort.name", + "help": "Awaken.Sort.help", + "default": "default", + "rarity": "rarity", + "level": "level", + "total": "total", + "join": "join", + "intimacy": "intimacy", + "stat": "stat" + }, + "Index": { + "name": "Awaken.Index.name", + "help": "Awaken.Index.help", + "default": "default", + "all": "all", + "vanguard": "vanguard", + "main": "main", + "dd": "dd", + "cl": "cl", + "ca": "ca", + "bb": "bb", + "cv": "cv", + "repair": "repair", + "ss": "ss", + "others": "others", + "not_available": "not_available" + }, + "Faction": { + "name": "Awaken.Faction.name", + "help": "Awaken.Faction.help", + "default": "default", + "all": "all", + "eagle": "eagle", + "royal": "royal", + "sakura": "sakura", + "iron": "iron", + "dragon": "dragon", + "sardegna": "sardegna", + "northern": "northern", + "iris": "iris", + "vichya": "vichya", + "other": "other", + "not_available": "not_available" + }, + "Rarity": { + "name": "Awaken.Rarity.name", + "help": "Awaken.Rarity.help", + "default": "default", + "all": "all", + "common": "common", + "rare": "rare", + "elite": "elite", + "super_rare": "super_rare", + "ultra": "ultra" } }, "GeneralShop": {