From c83edea596b46ef8277888d8cae8400659ca6d40 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 10 Sep 2023 23:48:24 +0800 Subject: [PATCH] Opt: Re-arrgange simuni settings --- config/template.json | 16 ++++-- module/config/argument/args.json | 38 ++++++++----- module/config/argument/argument.yaml | 25 +++++---- module/config/argument/task.yaml | 4 +- module/config/config_generated.py | 28 ++++++---- module/config/config_updater.py | 1 + module/config/i18n/en-US.json | 68 ++++++++++++---------- module/config/i18n/ja-JP.json | 74 ++++++++++++++---------- module/config/i18n/zh-CN.json | 68 ++++++++++++---------- module/config/i18n/zh-TW.json | 84 ++++++++++++++++------------ tasks/rogue/blessing.py | 12 ++-- tasks/rogue/bonus.py | 6 +- tasks/rogue/curio.py | 6 +- 13 files changed, 250 insertions(+), 180 deletions(-) diff --git a/config/template.json b/config/template.json index 10fc8f8b8..b5af59647 100644 --- a/config/template.json +++ b/config/template.json @@ -135,18 +135,22 @@ "Command": "Rogue", "ServerUpdate": "04:00" }, - "Rogue": { - "Path": "The Hunt", + "RoguePath": { + "Path": "Hunt", "Bonus": "Blessing Cosmos", "PresetResonanceFilter": "preset-1", - "CustomResonanceFilter": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞", "ResonanceSelectionStrategy": "follow-presets", + "CustomResonanceFilter": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞" + }, + "RogueBlessing": { "PresetBlessingFilter": "preset-1", - "CustomBlessingFilter": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random", "BlessingSelectionStrategy": "follow-presets", + "CustomBlessingFilter": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" + }, + "RogueCurio": { "PresetCurioFilter": "preset-1", - "CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random", - "CurioSelectionStrategy": "follow-presets" + "CurioSelectionStrategy": "follow-presets", + "CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" } } } \ No newline at end of file diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 6eb3adbaf..36a8f5eb4 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -987,7 +987,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -1005,10 +1009,10 @@ "display": "hide" } }, - "Rogue": { + "RoguePath": { "Path": { "type": "select", - "value": "The Hunt", + "value": "Hunt", "option": [ "Preservation", "Remembrance", @@ -1036,10 +1040,6 @@ "custom" ] }, - "CustomResonanceFilter": { - "type": "textarea", - "value": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞" - }, "ResonanceSelectionStrategy": { "type": "select", "value": "follow-presets", @@ -1049,6 +1049,12 @@ "before-random" ] }, + "CustomResonanceFilter": { + "type": "textarea", + "value": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞" + } + }, + "RogueBlessing": { "PresetBlessingFilter": { "type": "select", "value": "preset-1", @@ -1057,10 +1063,6 @@ "custom" ] }, - "CustomBlessingFilter": { - "type": "textarea", - "value": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" - }, "BlessingSelectionStrategy": { "type": "select", "value": "follow-presets", @@ -1070,6 +1072,12 @@ "before-random" ] }, + "CustomBlessingFilter": { + "type": "textarea", + "value": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" + } + }, + "RogueCurio": { "PresetCurioFilter": { "type": "select", "value": "preset-1", @@ -1078,10 +1086,6 @@ "custom" ] }, - "CustomCurioFilter": { - "type": "textarea", - "value": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" - }, "CurioSelectionStrategy": { "type": "select", "value": "follow-presets", @@ -1090,6 +1094,10 @@ "unrecorded-first", "before-random" ] + }, + "CustomCurioFilter": { + "type": "textarea", + "value": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" } } } diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 3488c78d2..a3063ea1f 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -167,9 +167,9 @@ Assignment: # ==================== Rogue ==================== -Rogue: +RoguePath: Path: - value: The Hunt + value: Hunt option: [ Preservation, Remembrance, Nihility, Abundance, Hunt, Destruction, Elation ] Bonus: value: Blessing Cosmos @@ -177,6 +177,9 @@ Rogue: PresetResonanceFilter: value: preset-1 option: [ preset-1, custom ] + ResonanceSelectionStrategy: + value: follow-presets + option: [ follow-presets, unrecorded-first, before-random ] CustomResonanceFilter: |- 回响构音：均晶转变 > 回响构音：零维强化 > 回响构音：第二次初恋 > 回响构音：体验的富翁 @@ -185,24 +188,24 @@ Rogue: > 回响构音：射不主皮 > 回响构音：柘弓危矢 > 回响构音：激变变星 > 回响构音：极端氦闪 > 回响构音：末日狂欢 > 回响构音：树苗长高舞 - ResonanceSelectionStrategy: - value: follow-presets - option: [ follow-presets, unrecorded-first, before-random ] + +RogueBlessing: PresetBlessingFilter: value: preset-1 option: [ preset-1, custom ] - CustomBlessingFilter: |- - 巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 - > 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random BlessingSelectionStrategy: value: follow-presets option: [ follow-presets, unrecorded-first, before-random ] + CustomBlessingFilter: |- + 巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 + > 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random + +RogueCurio: PresetCurioFilter: value: preset-1 option: [ preset-1, custom ] - CustomCurioFilter: |- - 博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random CurioSelectionStrategy: value: follow-presets option: [ follow-presets, unrecorded-first, before-random ] - + CustomCurioFilter: |- + 博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 82d0b7ff5..68ff11bff 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -47,4 +47,6 @@ Rogue: tasks: Rogue: - Scheduler - - Rogue + - RoguePath + - RogueBlessing + - RogueCurio diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 2d8976d87..b71f67703 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -102,15 +102,19 @@ class GeneratedConfig: Assignment_Duration = 20 # 4, 8, 12, 20 Assignment_Assignment = {} - # Group `Rogue` - Rogue_Path = 'The Hunt' # Preservation, Remembrance, Nihility, Abundance, Hunt, Destruction, Elation - Rogue_Bonus = 'Blessing Cosmos' # Blessing Cosmos, Miracle Cosmos, Fragmented Cosmos - Rogue_PresetResonanceFilter = 'preset-1' # preset-1, custom - Rogue_CustomResonanceFilter = '回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞' - Rogue_ResonanceSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random - Rogue_PresetBlessingFilter = 'preset-1' # preset-1, custom - Rogue_CustomBlessingFilter = '巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random' - Rogue_BlessingSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random - Rogue_PresetCurioFilter = 'preset-1' # preset-1, custom - Rogue_CustomCurioFilter = '博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random' - Rogue_CurioSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random + # Group `RoguePath` + RoguePath_Path = 'Hunt' # Preservation, Remembrance, Nihility, Abundance, Hunt, Destruction, Elation + RoguePath_Bonus = 'Blessing Cosmos' # Blessing Cosmos, Miracle Cosmos, Fragmented Cosmos + RoguePath_PresetResonanceFilter = 'preset-1' # preset-1, custom + RoguePath_ResonanceSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random + RoguePath_CustomResonanceFilter = '回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞' + + # Group `RogueBlessing` + RogueBlessing_PresetBlessingFilter = 'preset-1' # preset-1, custom + RogueBlessing_BlessingSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random + RogueBlessing_CustomBlessingFilter = '巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random' + + # Group `RogueCurio` + RogueCurio_PresetCurioFilter = 'preset-1' # preset-1, custom + RogueCurio_CurioSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random + RogueCurio_CustomCurioFilter = '博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random' diff --git a/module/config/config_updater.py b/module/config/config_updater.py index bd9f8fae3..fc5d5650f 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -409,6 +409,7 @@ class ConfigGenerator: '异': '異', '服務器': '伺服器', '文件': '檔案', + '自定義': '自訂' } if lang == 'zh-TW': for path, value in deep_iter(new, depth=3): diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index c3aff3479..8798a58ab 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -40,7 +40,7 @@ }, "Rogue": { "name": "Simulated Universe", - "help": "" + "help": "Simulated Universe is in development, task will not be run" } }, "Scheduler": { @@ -686,19 +686,19 @@ "help": "" } }, - "Rogue": { + "RoguePath": { "_info": { - "name": "Simulated Universe", + "name": "Path Settings", "help": "" }, "Path": { - "name": "Fate", + "name": "Path", "help": "", "Preservation": "Preservation", "Remembrance": "Remembrance", "Nihility": "Nihility", "Abundance": "Abundance", - "Hunt": "The Hunt", + "Hunt": "Hunt", "Destruction": "Destruction", "Elation": "Elation" }, @@ -715,50 +715,62 @@ "preset-1": "preset-1", "custom": "custom" }, + "ResonanceSelectionStrategy": { + "name": "Index Locked Blessing", + "help": "", + "follow-presets": "Don't affect choice", + "unrecorded-first": "Select first", + "before-random": "Select only when nothing satisfy the filter" + }, "CustomResonanceFilter": { "name": "Custom Resonance Filter", + "help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\"" + } + }, + "RogueBlessing": { + "_info": { + "name": "Blessing Settings", "help": "" }, - "ResonanceSelectionStrategy": { - "name": "Resonance Selection Strategy", - "help": "", - "follow-presets": "Follow presets", - "unrecorded-first": "Choose index locked resonance first", - "before-random": "Follow presets, but choose index locked one first when filter goes to randomly choose" - }, "PresetBlessingFilter": { "name": "Preset Blessing Filter", "help": "", "preset-1": "preset-1", "custom": "custom" }, + "BlessingSelectionStrategy": { + "name": "Index Locked Blessing", + "help": "", + "follow-presets": "Don't affect choice", + "unrecorded-first": "Select first", + "before-random": "Select only when nothing satisfy the filter" + }, "CustomBlessingFilter": { "name": "Custom Blessing Filter", + "help": "Only takes effect when \"Preset Blessing Filter\" is \"custom\"" + } + }, + "RogueCurio": { + "_info": { + "name": "Curio Settings", "help": "" }, - "BlessingSelectionStrategy": { - "name": "Blessing jSelection Strategy", - "help": "", - "follow-presets": "Follow presets", - "unrecorded-first": "Choose index locked blessing first", - "before-random": "Follow presets, but choose index locked one first when filter goes to randomly choose" - }, "PresetCurioFilter": { "name": "Preset Curio Filter", "help": "", "preset-1": "preset-1", "custom": "custom" }, + "CurioSelectionStrategy": { + "name": "Index Locked Curio", + "help": "", + "follow-presets": "Don't affect choice", + "unrecorded-first": "Select first", + "before-random": "Select only when nothing satisfy the filter" + }, "CustomCurioFilter": { "name": "Custom Curio Filter", - "help": "" - }, - "CurioSelectionStrategy": { - "name": "Curio Selection Strategy", - "help": "", - "follow-presets": "Follow presets", - "unrecorded-first": "Choose index locked curio first", - "before-random": "Follow presets, but choose index locked one first when filter goes to randomly choose" + "help": "Only takes effect when \"Preset Curio Filter\" is \"custom\"" } }, "Gui": { @@ -863,4 +875,4 @@ "Clear": "Clear" } } -} +} \ No newline at end of file diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 5521a916b..de3fc2060 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -686,14 +686,14 @@ "help": "Assignment.Assignment.help" } }, - "Rogue": { + "RoguePath": { "_info": { - "name": "Rogue._info.name", - "help": "Rogue._info.help" + "name": "RoguePath._info.name", + "help": "RoguePath._info.help" }, "Path": { - "name": "Rogue.Path.name", - "help": "Rogue.Path.help", + "name": "RoguePath.Path.name", + "help": "RoguePath.Path.help", "Preservation": "Preservation", "Remembrance": "Remembrance", "Nihility": "Nihility", @@ -703,62 +703,74 @@ "Elation": "Elation" }, "Bonus": { - "name": "Rogue.Bonus.name", - "help": "Rogue.Bonus.help", + "name": "RoguePath.Bonus.name", + "help": "RoguePath.Bonus.help", "Blessing Cosmos": "Blessing Cosmos", "Miracle Cosmos": "Miracle Cosmos", "Fragmented Cosmos": "Fragmented Cosmos" }, "PresetResonanceFilter": { - "name": "Rogue.PresetResonanceFilter.name", - "help": "Rogue.PresetResonanceFilter.help", + "name": "RoguePath.PresetResonanceFilter.name", + "help": "RoguePath.PresetResonanceFilter.help", "preset-1": "preset-1", "custom": "custom" }, - "CustomResonanceFilter": { - "name": "Rogue.CustomResonanceFilter.name", - "help": "Rogue.CustomResonanceFilter.help" - }, "ResonanceSelectionStrategy": { - "name": "Rogue.ResonanceSelectionStrategy.name", - "help": "Rogue.ResonanceSelectionStrategy.help", + "name": "RoguePath.ResonanceSelectionStrategy.name", + "help": "RoguePath.ResonanceSelectionStrategy.help", "follow-presets": "follow-presets", "unrecorded-first": "unrecorded-first", "before-random": "before-random" }, + "CustomResonanceFilter": { + "name": "RoguePath.CustomResonanceFilter.name", + "help": "RoguePath.CustomResonanceFilter.help" + } + }, + "RogueBlessing": { + "_info": { + "name": "RogueBlessing._info.name", + "help": "RogueBlessing._info.help" + }, "PresetBlessingFilter": { - "name": "Rogue.PresetBlessingFilter.name", - "help": "Rogue.PresetBlessingFilter.help", + "name": "RogueBlessing.PresetBlessingFilter.name", + "help": "RogueBlessing.PresetBlessingFilter.help", "preset-1": "preset-1", "custom": "custom" }, - "CustomBlessingFilter": { - "name": "Rogue.CustomBlessingFilter.name", - "help": "Rogue.CustomBlessingFilter.help" - }, "BlessingSelectionStrategy": { - "name": "Rogue.BlessingSelectionStrategy.name", - "help": "Rogue.BlessingSelectionStrategy.help", + "name": "RogueBlessing.BlessingSelectionStrategy.name", + "help": "RogueBlessing.BlessingSelectionStrategy.help", "follow-presets": "follow-presets", "unrecorded-first": "unrecorded-first", "before-random": "before-random" }, + "CustomBlessingFilter": { + "name": "RogueBlessing.CustomBlessingFilter.name", + "help": "RogueBlessing.CustomBlessingFilter.help" + } + }, + "RogueCurio": { + "_info": { + "name": "RogueCurio._info.name", + "help": "RogueCurio._info.help" + }, "PresetCurioFilter": { - "name": "Rogue.PresetCurioFilter.name", - "help": "Rogue.PresetCurioFilter.help", + "name": "RogueCurio.PresetCurioFilter.name", + "help": "RogueCurio.PresetCurioFilter.help", "preset-1": "preset-1", "custom": "custom" }, - "CustomCurioFilter": { - "name": "Rogue.CustomCurioFilter.name", - "help": "Rogue.CustomCurioFilter.help" - }, "CurioSelectionStrategy": { - "name": "Rogue.CurioSelectionStrategy.name", - "help": "Rogue.CurioSelectionStrategy.help", + "name": "RogueCurio.CurioSelectionStrategy.name", + "help": "RogueCurio.CurioSelectionStrategy.help", "follow-presets": "follow-presets", "unrecorded-first": "unrecorded-first", "before-random": "before-random" + }, + "CustomCurioFilter": { + "name": "RogueCurio.CustomCurioFilter.name", + "help": "RogueCurio.CustomCurioFilter.help" } }, "Gui": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 8faac42c2..d03b90199 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -40,7 +40,7 @@ }, "Rogue": { "name": "模拟宇宙", - "help": "" + "help": "模拟宇宙还在开发中，任务不会被运行" } }, "Scheduler": { @@ -686,9 +686,9 @@ "help": "" } }, - "Rogue": { + "RoguePath": { "_info": { - "name": "模拟宇宙", + "name": "命途设置", "help": "" }, "Path": { @@ -703,8 +703,8 @@ "Elation": "欢愉" }, "Bonus": { - "name": "开拓祝福", - "help": "开局三选一", + "name": "开拓祝福三选一", + "help": "", "Blessing Cosmos": "祝福宇宙（获得一个祝福）", "Miracle Cosmos": "神奇宇宙（获得一个奇物）", "Fragmented Cosmos": "破碎宇宙（获得宇宙碎片）" @@ -715,50 +715,62 @@ "preset-1": "预设 1", "custom": "自定义" }, + "ResonanceSelectionStrategy": { + "name": "图鉴未解锁的回响构音", + "help": "", + "follow-presets": "不影响选择", + "unrecorded-first": "优先选择", + "before-random": "无回响构音满足过滤器设置时才选择" + }, "CustomResonanceFilter": { "name": "自定义回响构音过滤器", + "help": "仅在\"回响构音过滤器\"设置为\"自定义\"时生效" + } + }, + "RogueBlessing": { + "_info": { + "name": "祝福设置", "help": "" }, - "ResonanceSelectionStrategy": { - "name": "回响构音选择策略", - "help": "", - "follow-presets": "遵循预设", - "unrecorded-first": "优先选择图鉴未解锁的回响构音", - "before-random": "遵循预设，但选择\"图鉴未解锁\"的优先级高于\"随机选择\"" - }, "PresetBlessingFilter": { "name": "祝福过滤器", "help": "", "preset-1": "预设 1", "custom": "自定义" }, + "BlessingSelectionStrategy": { + "name": "图鉴未解锁的祝福", + "help": "", + "follow-presets": "不影响选择", + "unrecorded-first": "优先选择", + "before-random": "无祝福满足过滤器设置时才选择" + }, "CustomBlessingFilter": { "name": "自定义祝福过滤器", + "help": "仅在\"祝福过滤器\"设置为\"自定义\"时生效" + } + }, + "RogueCurio": { + "_info": { + "name": "奇物设置", "help": "" }, - "BlessingSelectionStrategy": { - "name": "祝福选择策略", - "help": "", - "follow-presets": "遵循预设", - "unrecorded-first": "优先选择图鉴未解锁的祝福", - "before-random": "遵循预设，但选择\"图鉴未解锁\"的优先级高于\"随机选择\"" - }, "PresetCurioFilter": { "name": "奇物过滤器", "help": "", "preset-1": "预设 1", "custom": "自定义" }, - "CustomCurioFilter": { - "name": "自定义祝福过滤器", - "help": "" - }, "CurioSelectionStrategy": { - "name": "奇物选择策略", + "name": "图鉴未解锁的奇物", "help": "", - "follow-presets": "遵循预设", - "unrecorded-first": "优先选择图鉴未解锁的奇物", - "before-random": "遵循预设，但选择\"图鉴未解锁\"的优先级高于\"随机选择\"" + "follow-presets": "不影响选择", + "unrecorded-first": "优先选择", + "before-random": "无奇物满足过滤器设置时才选择" + }, + "CustomCurioFilter": { + "name": "自定义奇物过滤器", + "help": "仅在\"奇物过滤器\"设置为\"自定义\"时生效" } }, "Gui": { @@ -863,4 +875,4 @@ "Clear": "清除" } } -} +} \ No newline at end of file diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 433b992bb..952964115 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -40,7 +40,7 @@ }, "Rogue": { "name": "模擬宇宙", - "help": "" + "help": "模擬宇宙還在開發中，任務不會被運行" } }, "Scheduler": { @@ -686,9 +686,9 @@ "help": "" } }, - "Rogue": { + "RoguePath": { "_info": { - "name": "模擬宇宙", + "name": "命途設定", "help": "" }, "Path": { @@ -697,68 +697,80 @@ "Preservation": "存護", "Remembrance": "記憶", "Nihility": "虛無", - "Abundance": "丰饶", + "Abundance": "豐饒", "Hunt": "巡獵", "Destruction": "毀滅", "Elation": "歡愉" }, "Bonus": { - "name": "開拓祝福", - "help": "开局三选一", + "name": "開拓祝福三選一", + "help": "", "Blessing Cosmos": "祝福宇宙（獲得一個祝福）", "Miracle Cosmos": "神奇宇宙（獲得一個奇物）", "Fragmented Cosmos": "破碎宇宙（獲得宇宙碎片）" }, "PresetResonanceFilter": { - "name": "迴響構音过滤器", + "name": "迴響構音過濾器", "help": "", "preset-1": "預設 1", "custom": "自訂" }, - "CustomResonanceFilter": { - "name": "自訂迴響構音过滤器", - "help": "" - }, "ResonanceSelectionStrategy": { - "name": "迴響構音選擇策略", + "name": "圖鑑未解鎖的迴響構音", "help": "", - "follow-presets": "遵循預設", - "unrecorded-first": "優先選擇圖鑑未解鎖的迴響構音", - "before-random": "遵循預設，但選擇\"圖鑑未解鎖\"的優先級高於\"隨機選擇\"" + "follow-presets": "不影響選擇", + "unrecorded-first": "優先選擇", + "before-random": "無迴響構音滿足過濾器設定時才選擇" + }, + "CustomResonanceFilter": { + "name": "自訂迴響構音過濾器", + "help": "僅在\"迴響構音過濾器\"設定為\"自訂\"時生效" + } + }, + "RogueBlessing": { + "_info": { + "name": "祝福設定", + "help": "" }, "PresetBlessingFilter": { - "name": "祝福过滤器", + "name": "祝福過濾器", "help": "", "preset-1": "預設 1", "custom": "自訂" }, - "CustomBlessingFilter": { - "name": "自訂祝福过滤器", - "help": "" - }, "BlessingSelectionStrategy": { - "name": "祝福選擇策略", + "name": "圖鑑未解鎖的祝福", "help": "", - "follow-presets": "遵循預設", - "unrecorded-first": "優先選擇圖鑑未解鎖的祝福", - "before-random": "遵循預設，但選擇\"圖鑑未解鎖\"的優先級高於\"隨機選擇\"" + "follow-presets": "不影響選擇", + "unrecorded-first": "優先選擇", + "before-random": "無祝福滿足過濾器設定時才選擇" + }, + "CustomBlessingFilter": { + "name": "自訂祝福過濾器", + "help": "僅在\"祝福過濾器\"設定為\"自訂\"時生效" + } + }, + "RogueCurio": { + "_info": { + "name": "奇物設定", + "help": "" }, "PresetCurioFilter": { - "name": "奇物过滤器", + "name": "奇物過濾器", "help": "", - "preset-1": "preset-1", - "custom": "custom" - }, - "CustomCurioFilter": { - "name": "自訂奇物过滤器", - "help": "" + "preset-1": "預設 1", + "custom": "自訂" }, "CurioSelectionStrategy": { - "name": "奇物選擇策略", + "name": "圖鑑未解鎖的奇物", "help": "", - "follow-presets": "遵循預設", - "unrecorded-first": "優先選擇圖鑑未解鎖的奇物", - "before-random": "遵循預設，但選擇\"圖鑑未解鎖\"的優先級高於\"隨機選擇\"" + "follow-presets": "不影響選擇", + "unrecorded-first": "優先選擇", + "before-random": "無奇物滿足過濾器設定時才選擇" + }, + "CustomCurioFilter": { + "name": "自訂奇物過濾器", + "help": "僅在\"奇物過濾器\"設定為\"自訂\"時生效" } }, "Gui": { @@ -863,4 +875,4 @@ "Clear": "清除" } } -} +} \ No newline at end of file diff --git a/tasks/rogue/blessing.py b/tasks/rogue/blessing.py index 5ee1f13cb..e00f7d8c4 100644 --- a/tasks/rogue/blessing.py +++ b/tasks/rogue/blessing.py @@ -264,20 +264,20 @@ class RogueBlessingSelector(RogueSelector): filter_configs = { RogueBlessing: { "filter_": BLESSING_FILTER, - "preset_config": self.main.config.Rogue_PresetBlessingFilter, - "strategy_config": self.main.config.Rogue_BlessingSelectionStrategy, + "preset_config": self.main.config.RogueBlessing_PresetBlessingFilter, + "strategy_config": self.main.config.RogueBlessing_BlessingSelectionStrategy, "preset_values": { 'preset-1': BLESSING_PRESET_1, - 'custom': self.main.config.Rogue_CustomBlessingFilter + 'custom': self.main.config.RogueBlessing_CustomBlessingFilter }, }, RogueResonance: { "filter_": RESONANCE_FILTER, - "preset_config": self.main.config.Rogue_PresetResonanceFilter, - "strategy_config": self.main.config.Rogue_ResonanceSelectionStrategy, + "preset_config": self.main.config.RoguePath_PresetResonanceFilter, + "strategy_config": self.main.config.RoguePath_ResonanceSelectionStrategy, "preset_values": { 'preset-1': RESONANCE_PRESET_1, - 'custom': self.main.config.Rogue_PresetResonanceFilter, + 'custom': self.main.config.RoguePath_PresetResonanceFilter, }, } } diff --git a/tasks/rogue/bonus.py b/tasks/rogue/bonus.py index 166eb2d50..56a431391 100644 --- a/tasks/rogue/bonus.py +++ b/tasks/rogue/bonus.py @@ -81,10 +81,10 @@ class RogueBonusSelector(RogueSelector): if not self.ocr_results: self.ui_select(None) options = {result.matched_keyword.en: result for result in self.ocr_results} - if self.main.config.Rogue_Bonus not in options.keys(): - logger.warning(f"Can not find option: {self.main.config.Rogue_Bonus}, randomly choose one") + if self.main.config.RoguePath_Bonus not in options.keys(): + logger.warning(f"Can not find option: {self.main.config.RoguePath_Bonus}, randomly choose one") target = np.random.choice(options) else: - target = options[self.main.config.Rogue_Bonus] + target = options[self.main.config.RoguePath_Bonus] logger.info(f"Choose bonus: {target}") self.ui_select(target) diff --git a/tasks/rogue/curio.py b/tasks/rogue/curio.py index 78069594a..bb6d54c1b 100644 --- a/tasks/rogue/curio.py +++ b/tasks/rogue/curio.py @@ -125,14 +125,14 @@ class RogueCurioSelector(RogueSelector): def load_filter(self): filter_ = CURIO_FILTER string = "" - match self.main.config.Rogue_PresetCurioFilter: + match self.main.config.RogueCurio_PresetCurioFilter: case 'preset-1': string = CURIO_PRESET_1 case 'custom': - string = self.main.config.Rogue_CustomCurioFilter + string = self.main.config.RogueCurio_CustomCurioFilter string = parse_name(string) - match self.main.config.Rogue_CurioSelectionStrategy: + match self.main.config.RogueCurio_CurioSelectionStrategy: case 'unrecorded-first': string = 'unrecorded > ' + string case 'before-random':