From 78923246a6c3cde760cadfebdfaf927a13ee5034 Mon Sep 17 00:00:00 2001 From: Hengyu Date: Wed, 26 Jun 2024 13:09:21 +0800 Subject: [PATCH] Upd: gui --- config/template.json | 5 ++++- module/config/argument/args.json | 12 ++++++++++++ module/config/argument/argument.yaml | 3 +++ module/config/config_generated.py | 3 +++ module/config/config_updater.py | 2 ++ module/config/i18n/en-US.json | 12 ++++++++++++ module/config/i18n/es-ES.json | 12 ++++++++++++ module/config/i18n/ja-JP.json | 12 ++++++++++++ module/config/i18n/zh-CN.json | 12 ++++++++++++ module/config/i18n/zh-TW.json | 12 ++++++++++++ 10 files changed, 84 insertions(+), 1 deletion(-) diff --git a/config/template.json b/config/template.json index efb5b222d..196914b54 100644 --- a/config/template.json +++ b/config/template.json @@ -104,7 +104,10 @@ "Name": "Calyx_Golden_Treasures_Jarilo_VI", "NameAtDoubleCalyx": "Calyx_Golden_Treasures_Jarilo_VI", "NameAtDoubleRelic": "Cavern_of_Corrosion_Path_of_Providence", - "Team": 1 + "Team": 1, + "ExtractReservedTrailblazePower": false, + "UseFuel": false, + "UseFuelUntilRemainCount": 0 }, "DungeonSupport": { "Use": "when_daily", diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 993559321..d9099f50b 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -652,6 +652,18 @@ 8, 9 ] + }, + "ExtractReservedTrailblazePower": { + "type": "checkbox", + "value": false + }, + "UseFuel": { + "type": "checkbox", + "value": false + }, + "UseFuelUntilRemainCount": { + "type": "input", + "value": 0 } }, "DungeonSupport": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 1a7052d33..149b2e384 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -110,6 +110,9 @@ Dungeon: Team: value: 1 option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] + ExtractReservedTrailblazePower: false + UseFuel: false + UseFuelUntilRemainCount: 0 DungeonSupport: Use: value: when_daily diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 27dc6367e..727c2253b 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -50,6 +50,9 @@ class GeneratedConfig: Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures_Jarilo_VI' # Calyx_Golden_Memories_Jarilo_VI, Calyx_Golden_Memories_The_Xianzhou_Luofu, Calyx_Golden_Memories_Penacony, Calyx_Golden_Aether_Jarilo_VI, Calyx_Golden_Aether_The_Xianzhou_Luofu, Calyx_Golden_Aether_Penacony, Calyx_Golden_Treasures_Jarilo_VI, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Penacony, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Erudition_Penacony_PenaconyGrandTheater, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission Dungeon_NameAtDoubleRelic = 'Cavern_of_Corrosion_Path_of_Providence' # Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Dreamdive, Cavern_of_Corrosion_Path_of_Cavalier Dungeon_Team = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 + Dungeon_ExtractReservedTrailblazePower = False + Dungeon_UseFuel = False + Dungeon_UseFuelUntilRemainCount = 0 # Group `DungeonSupport` DungeonSupport_Use = 'when_daily' # always_use, when_daily, do_not_use diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 6de81c39b..3eccfa999 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -877,6 +877,8 @@ class ConfigUpdater: Yields: str: Arg path that should be hidden """ + if deep_get(data, 'Dungeon.Dungeon.UseFuel') == False: + yield 'Dungeon.Dungeon.UseFuelUntilRemainCount' if deep_get(data, 'Rogue.RogueBlessing.PresetBlessingFilter') != 'custom': yield 'Rogue.RogueBlessing.CustomBlessingFilter' if deep_get(data, 'Rogue.RogueBlessing.PresetResonanceFilter') != 'custom': diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 0c5dd1271..a4a186cf8 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -357,6 +357,18 @@ "7": "7", "8": "8", "9": "9" + }, + "ExtractReservedTrailblazePower": { + "name": "Extract reserve exploration power", + "help": "" + }, + "UseFuel": { + "name": "Use Fuel", + "help": "" + }, + "UseFuelUntilRemainCount": { + "name": "Supplement exploration power with fuel until X fuel remains", + "help": "" } }, "DungeonSupport": { diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index faa680bbe..0737311ea 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -357,6 +357,18 @@ "7": "7", "8": "8", "9": "9" + }, + "ExtractReservedTrailblazePower": { + "name": "Dungeon.ExtractReservedTrailblazePower.name", + "help": "Dungeon.ExtractReservedTrailblazePower.help" + }, + "UseFuel": { + "name": "Dungeon.UseFuel.name", + "help": "Dungeon.UseFuel.help" + }, + "UseFuelUntilRemainCount": { + "name": "Dungeon.UseFuelUntilRemainCount.name", + "help": "Dungeon.UseFuelUntilRemainCount.help" } }, "DungeonSupport": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index c951429aa..99e182f06 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -357,6 +357,18 @@ "7": "7", "8": "8", "9": "9" + }, + "ExtractReservedTrailblazePower": { + "name": "Dungeon.ExtractReservedTrailblazePower.name", + "help": "Dungeon.ExtractReservedTrailblazePower.help" + }, + "UseFuel": { + "name": "Dungeon.UseFuel.name", + "help": "Dungeon.UseFuel.help" + }, + "UseFuelUntilRemainCount": { + "name": "Dungeon.UseFuelUntilRemainCount.name", + "help": "Dungeon.UseFuelUntilRemainCount.help" } }, "DungeonSupport": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 8a88b780c..e992ef7dc 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -357,6 +357,18 @@ "7": "7", "8": "8", "9": "9" + }, + "ExtractReservedTrailblazePower": { + "name": "取出后备开拓力", + "help": "" + }, + "UseFuel": { + "name": "使用燃料", + "help": "" + }, + "UseFuelUntilRemainCount": { + "name": "使用燃料补充开拓力，直到剩余 X 燃料", + "help": "" } }, "DungeonSupport": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 8e4a69861..f02e90300 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -357,6 +357,18 @@ "7": "7", "8": "8", "9": "9" + }, + "ExtractReservedTrailblazePower": { + "name": "Dungeon.ExtractReservedTrailblazePower.name", + "help": "Dungeon.ExtractReservedTrailblazePower.help" + }, + "UseFuel": { + "name": "Dungeon.UseFuel.name", + "help": "Dungeon.UseFuel.help" + }, + "UseFuelUntilRemainCount": { + "name": "Dungeon.UseFuelUntilRemainCount.name", + "help": "Dungeon.UseFuelUntilRemainCount.help" } }, "DungeonSupport": {