From 6576a3ebd0cfc93617d6cf337940dfc31fc54da9 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:30:48 +0800 Subject: [PATCH] Opt: Simplify rogue default settings --- config/template.json | 20 +++----- module/config/argument/args.json | 56 +++++++---------------- module/config/argument/argument.yaml | 42 +++++++---------- module/config/argument/stored.json | 2 +- module/config/config_generated.py | 18 +++----- module/config/config_updater.py | 8 +++- module/config/i18n/en-US.json | 66 ++++++++------------------- module/config/i18n/es-ES.json | 68 +++++++++------------------- module/config/i18n/ja-JP.json | 68 +++++++++------------------- module/config/i18n/zh-CN.json | 66 ++++++++------------------- module/config/i18n/zh-TW.json | 66 ++++++++------------------- tasks/rogue/bleesing/blessing.py | 12 ++--- tasks/rogue/bleesing/curio.py | 10 ++-- 13 files changed, 167 insertions(+), 335 deletions(-) diff --git a/config/template.json b/config/template.json index 2c59975e7..953863a6d 100644 --- a/config/template.json +++ b/config/template.json @@ -183,19 +183,13 @@ "UseStamina": false }, "RogueBlessing": { - "PresetBlessingFilter": "preset-1", - "BlessingSelectionStrategy": "follow-presets", - "CustomBlessingFilter": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" - }, - "RogueCurio": { - "PresetCurioFilter": "preset-1", - "CurioSelectionStrategy": "follow-presets", - "CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" - }, - "RoguePath": { - "PresetResonanceFilter": "preset-1", - "ResonanceSelectionStrategy": "follow-presets", - "CustomResonanceFilter": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random" + "PresetBlessingFilter": "preset", + "CustomBlessingFilter": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random", + "PresetCurioFilter": "preset", + "CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random", + "PresetResonanceFilter": "preset", + "CustomResonanceFilter": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random", + "SelectionStrategy": "before-random" }, "RogueDebug": { "DebugMode": false diff --git a/module/config/argument/args.json b/module/config/argument/args.json index a2429143f..bde713911 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1241,70 +1241,48 @@ "RogueBlessing": { "PresetBlessingFilter": { "type": "select", - "value": "preset-1", + "value": "preset", "option": [ - "preset-1", + "preset", "custom" ] }, - "BlessingSelectionStrategy": { - "type": "select", - "value": "follow-presets", - "option": [ - "follow-presets", - "unrecorded-first", - "before-random" - ] - }, "CustomBlessingFilter": { "type": "textarea", "value": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" - } - }, - "RogueCurio": { + }, "PresetCurioFilter": { "type": "select", - "value": "preset-1", + "value": "preset", "option": [ - "preset-1", + "preset", "custom" ] }, - "CurioSelectionStrategy": { - "type": "select", - "value": "follow-presets", - "option": [ - "follow-presets", - "unrecorded-first", - "before-random" - ] - }, "CustomCurioFilter": { "type": "textarea", "value": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" - } - }, - "RoguePath": { + }, "PresetResonanceFilter": { "type": "select", - "value": "preset-1", + "value": "preset", "option": [ - "preset-1", + "preset", "custom" ] }, - "ResonanceSelectionStrategy": { - "type": "select", - "value": "follow-presets", - "option": [ - "follow-presets", - "unrecorded-first", - "before-random" - ] - }, "CustomResonanceFilter": { "type": "textarea", "value": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random" + }, + "SelectionStrategy": { + "type": "select", + "value": "before-random", + "option": [ + "follow-presets", + "unrecorded-first", + "before-random" + ] } }, "RogueDebug": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 141279b38..2d2e0c2e0 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -222,13 +222,21 @@ RogueWorld: UseImmersifier: true UseStamina: false -RoguePath: +RogueBlessing: + PresetBlessingFilter: + value: preset + option: [ preset, custom ] + CustomBlessingFilter: |- + 巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 + > 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random + PresetCurioFilter: + value: preset + option: [ preset, custom ] + CustomCurioFilter: |- + 博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random PresetResonanceFilter: - value: preset-1 - option: [ preset-1, custom ] - ResonanceSelectionStrategy: - value: follow-presets - option: [ follow-presets, unrecorded-first, before-random ] + value: preset + option: [ preset, custom ] CustomResonanceFilter: |- 回响构音：均晶转变 > 回响构音：零维强化 > 回响构音：第二次初恋 > 回响构音：体验的富翁 @@ -238,27 +246,9 @@ RoguePath: > 回响构音：激变变星 > 回响构音：极端氦闪 > 回响构音：末日狂欢 > 回响构音：树苗长高舞 > random - -RogueBlessing: - PresetBlessingFilter: - value: preset-1 - option: [ preset-1, custom ] - BlessingSelectionStrategy: - value: follow-presets + SelectionStrategy: + value: before-random option: [ follow-presets, unrecorded-first, before-random ] - CustomBlessingFilter: |- - 巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生，一法界心 > 毁灭-3 - > 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random - -RogueCurio: - PresetCurioFilter: - value: preset-1 - option: [ preset-1, custom ] - CurioSelectionStrategy: - value: follow-presets - option: [ follow-presets, unrecorded-first, before-random ] - CustomCurioFilter: |- - 博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random RogueDebug: DebugMode: false diff --git a/module/config/argument/stored.json b/module/config/argument/stored.json index 036e66a41..08522e811 100644 --- a/module/config/argument/stored.json +++ b/module/config/argument/stored.json @@ -58,7 +58,7 @@ "stored": "StoredBattlePassLevel", "attrs": { "time": "2020-01-01 00:00:00", - "total": 50, + "total": 70, "value": 0 }, "order": 5, diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 3ff213f91..990e0d471 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -125,20 +125,14 @@ class GeneratedConfig: RogueWorld_UseImmersifier = True RogueWorld_UseStamina = False - # Group `RoguePath` - 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> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random' - # Group `RogueBlessing` - RogueBlessing_PresetBlessingFilter = 'preset-1' # preset-1, custom - RogueBlessing_BlessingSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random + RogueBlessing_PresetBlessingFilter = 'preset' # preset, custom 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' + RogueBlessing_PresetCurioFilter = 'preset' # preset, custom + RogueBlessing_CustomCurioFilter = '博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random' + RogueBlessing_PresetResonanceFilter = 'preset' # preset, custom + RogueBlessing_CustomResonanceFilter = '回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random' + RogueBlessing_SelectionStrategy = 'before-random' # follow-presets, unrecorded-first, before-random # Group `RogueDebug` RogueDebug_DebugMode = False diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 9021ffba2..dfb25de77 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -776,8 +776,12 @@ class ConfigUpdater: Yields: str: Arg path that should be hidden """ - if deep_get(data, 'Rogue.RoguePath.PresetResonanceFilter') != 'custom': - yield 'Rogue.RoguePath.CustomResonanceFilter' + if deep_get(data, 'Rogue.RogueBlessing.PresetBlessingFilter') != 'custom': + yield 'Rogue.RogueBlessing.CustomBlessingFilter' + if deep_get(data, 'Rogue.RogueBlessing.PresetResonanceFilter') != 'custom': + yield 'Rogue.RogueBlessing.CustomResonanceFilter' + if deep_get(data, 'Rogue.RogueBlessing.PresetCurioFilter') != 'custom': + yield 'Rogue.RogueBlessing.CustomCurioFilter' def get_hidden_args(self, data) -> t.Set[str]: """ diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 3c890ac53..5e35f78df 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -831,29 +831,6 @@ "help": "Task \"Dungeon\" will no longer run, and all trailblaze power will be used first to claim immersion rewards, except for double events." } }, - "RoguePath": { - "_info": { - "name": "Path Settings", - "help": "" - }, - "PresetResonanceFilter": { - "name": "Preset Resonance Filter", - "help": "", - "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", @@ -862,42 +839,39 @@ "PresetBlessingFilter": { "name": "Preset Blessing Filter", "help": "", - "preset-1": "preset-1", + "preset": "preset", "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": "" }, "PresetCurioFilter": { "name": "Preset Curio Filter", "help": "", - "preset-1": "preset-1", + "preset": "preset", "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": "Only takes effect when \"Preset Curio Filter\" is \"custom\"" + }, + "PresetResonanceFilter": { + "name": "Preset Resonance Filter", + "help": "", + "preset": "preset", + "custom": "custom" + }, + "CustomResonanceFilter": { + "name": "Custom Resonance Filter", + "help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\"" + }, + "SelectionStrategy": { + "name": "Index Locked", + "help": "", + "follow-presets": "Don't affect choice", + "unrecorded-first": "Select first", + "before-random": "Select only when nothing satisfy the filter" } }, "RogueDebug": { @@ -907,7 +881,7 @@ }, "DebugMode": { "name": "Debug Mode", - "help": "" + "help": "For development only, don't enable if you don't know what this is" } }, "Gui": { diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 039ec6e2a..c9e75816f 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -831,29 +831,6 @@ "help": "La tarea de mazmorra ya no se ejecutará y todo el poder trazacaminos se usará primero para reclamar recompensas de inmersión, excepto para eventos dobles" } }, - "RoguePath": { - "_info": { - "name": "Ajustes de Vía", - "help": "" - }, - "PresetResonanceFilter": { - "name": "Filtro de preajuste de resonancia", - "help": "", - "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", @@ -862,42 +839,39 @@ "PresetBlessingFilter": { "name": "Preset Blessing Filter", "help": "", - "preset-1": "preset-1", + "preset": "preset", "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": "Ajustes de Objeto raro", - "help": "" }, "PresetCurioFilter": { - "name": "Filtro de preajuste de Objeto raro", + "name": "Preset Curio Filter", "help": "", - "preset-1": "preset-1", + "preset": "preset", "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": "Only takes effect when \"Preset Curio Filter\" is \"custom\"" + }, + "PresetResonanceFilter": { + "name": "Preset Resonance Filter", + "help": "", + "preset": "preset", + "custom": "custom" + }, + "CustomResonanceFilter": { + "name": "Custom Resonance Filter", + "help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\"" + }, + "SelectionStrategy": { + "name": "Index Locked", + "help": "", + "follow-presets": "Don't affect choice", + "unrecorded-first": "Select first", + "before-random": "Select only when nothing satisfy the filter" } }, "RogueDebug": { @@ -907,7 +881,7 @@ }, "DebugMode": { "name": "Modo de depuración", - "help": "" + "help": "Solo para desarrollo, no lo habilites si no sabes qué es" } }, "Gui": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index b7ecc1e82..572f9ae5f 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -831,29 +831,6 @@ "help": "RogueWorld.UseStamina.help" } }, - "RoguePath": { - "_info": { - "name": "RoguePath._info.name", - "help": "RoguePath._info.help" - }, - "PresetResonanceFilter": { - "name": "RoguePath.PresetResonanceFilter.name", - "help": "RoguePath.PresetResonanceFilter.help", - "preset-1": "preset-1", - "custom": "custom" - }, - "ResonanceSelectionStrategy": { - "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", @@ -862,42 +839,39 @@ "PresetBlessingFilter": { "name": "RogueBlessing.PresetBlessingFilter.name", "help": "RogueBlessing.PresetBlessingFilter.help", - "preset-1": "preset-1", + "preset": "preset", "custom": "custom" }, - "BlessingSelectionStrategy": { - "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": "RogueCurio.PresetCurioFilter.name", - "help": "RogueCurio.PresetCurioFilter.help", - "preset-1": "preset-1", + "name": "RogueBlessing.PresetCurioFilter.name", + "help": "RogueBlessing.PresetCurioFilter.help", + "preset": "preset", "custom": "custom" }, - "CurioSelectionStrategy": { - "name": "RogueCurio.CurioSelectionStrategy.name", - "help": "RogueCurio.CurioSelectionStrategy.help", + "CustomCurioFilter": { + "name": "RogueBlessing.CustomCurioFilter.name", + "help": "RogueBlessing.CustomCurioFilter.help" + }, + "PresetResonanceFilter": { + "name": "RogueBlessing.PresetResonanceFilter.name", + "help": "RogueBlessing.PresetResonanceFilter.help", + "preset": "preset", + "custom": "custom" + }, + "CustomResonanceFilter": { + "name": "RogueBlessing.CustomResonanceFilter.name", + "help": "RogueBlessing.CustomResonanceFilter.help" + }, + "SelectionStrategy": { + "name": "RogueBlessing.SelectionStrategy.name", + "help": "RogueBlessing.SelectionStrategy.help", "follow-presets": "follow-presets", "unrecorded-first": "unrecorded-first", "before-random": "before-random" - }, - "CustomCurioFilter": { - "name": "RogueCurio.CustomCurioFilter.name", - "help": "RogueCurio.CustomCurioFilter.help" } }, "RogueDebug": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index d6d8eefc5..dfb271c72 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -831,29 +831,6 @@ "help": "每日副本任务将不再打本，所有开拓力将优先被用于领取浸器奖励，双倍活动时除外" } }, - "RoguePath": { - "_info": { - "name": "命途设置", - "help": "" - }, - "PresetResonanceFilter": { - "name": "回响构音过滤器", - "help": "", - "preset-1": "预设 1", - "custom": "自定义" - }, - "ResonanceSelectionStrategy": { - "name": "图鉴未解锁的回响构音", - "help": "", - "follow-presets": "不影响选择", - "unrecorded-first": "优先选择", - "before-random": "无回响构音满足过滤器设置时才选择" - }, - "CustomResonanceFilter": { - "name": "自定义回响构音过滤器", - "help": "仅在\"回响构音过滤器\"设置为\"自定义\"时生效" - } - }, "RogueBlessing": { "_info": { "name": "祝福设置", @@ -862,42 +839,39 @@ "PresetBlessingFilter": { "name": "祝福过滤器", "help": "", - "preset-1": "预设 1", + "preset": "预设", "custom": "自定义" }, - "BlessingSelectionStrategy": { - "name": "图鉴未解锁的祝福", - "help": "", - "follow-presets": "不影响选择", - "unrecorded-first": "优先选择", - "before-random": "无祝福满足过滤器设置时才选择" - }, "CustomBlessingFilter": { "name": "自定义祝福过滤器", "help": "仅在\"祝福过滤器\"设置为\"自定义\"时生效" - } - }, - "RogueCurio": { - "_info": { - "name": "奇物设置", - "help": "" }, "PresetCurioFilter": { "name": "奇物过滤器", "help": "", - "preset-1": "预设 1", + "preset": "预设", "custom": "自定义" }, - "CurioSelectionStrategy": { - "name": "图鉴未解锁的奇物", - "help": "", - "follow-presets": "不影响选择", - "unrecorded-first": "优先选择", - "before-random": "无奇物满足过滤器设置时才选择" - }, "CustomCurioFilter": { "name": "自定义奇物过滤器", "help": "仅在\"奇物过滤器\"设置为\"自定义\"时生效" + }, + "PresetResonanceFilter": { + "name": "回响构音过滤器", + "help": "", + "preset": "预设", + "custom": "自定义" + }, + "CustomResonanceFilter": { + "name": "自定义奇物过滤器", + "help": "仅在\"奇物过滤器\"设置为\"自定义\"时生效" + }, + "SelectionStrategy": { + "name": "对于未解锁的图鉴", + "help": "", + "follow-presets": "不影响选择", + "unrecorded-first": "优先选择", + "before-random": "无法满足过滤器时才选择" } }, "RogueDebug": { @@ -907,7 +881,7 @@ }, "DebugMode": { "name": "调试模式", - "help": "" + "help": "仅用于开发，如果你不知道这是什么，不要打开" } }, "Gui": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 36cf1cc58..d46d4c732 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -831,29 +831,6 @@ "help": "每日副本任務將不再打本，所有開拓力將優先被用於領取浸器獎勵，雙倍活動時除外" } }, - "RoguePath": { - "_info": { - "name": "命途設定", - "help": "" - }, - "PresetResonanceFilter": { - "name": "迴響構音過濾器", - "help": "", - "preset-1": "預設 1", - "custom": "自訂" - }, - "ResonanceSelectionStrategy": { - "name": "圖鑑未解鎖的迴響構音", - "help": "", - "follow-presets": "不影響選擇", - "unrecorded-first": "優先選擇", - "before-random": "無迴響構音滿足過濾器設定時才選擇" - }, - "CustomResonanceFilter": { - "name": "自訂迴響構音過濾器", - "help": "僅在\"迴響構音過濾器\"設定為\"自訂\"時生效" - } - }, "RogueBlessing": { "_info": { "name": "祝福設定", @@ -862,42 +839,39 @@ "PresetBlessingFilter": { "name": "祝福過濾器", "help": "", - "preset-1": "預設 1", + "preset": "預設", "custom": "自訂" }, - "BlessingSelectionStrategy": { - "name": "圖鑑未解鎖的祝福", - "help": "", - "follow-presets": "不影響選擇", - "unrecorded-first": "優先選擇", - "before-random": "無祝福滿足過濾器設定時才選擇" - }, "CustomBlessingFilter": { "name": "自訂祝福過濾器", "help": "僅在\"祝福過濾器\"設定為\"自訂\"時生效" - } - }, - "RogueCurio": { - "_info": { - "name": "奇物設定", - "help": "" }, "PresetCurioFilter": { "name": "奇物過濾器", "help": "", - "preset-1": "預設 1", + "preset": "預設", "custom": "自訂" }, - "CurioSelectionStrategy": { - "name": "圖鑑未解鎖的奇物", - "help": "", - "follow-presets": "不影響選擇", - "unrecorded-first": "優先選擇", - "before-random": "無奇物滿足過濾器設定時才選擇" - }, "CustomCurioFilter": { "name": "自訂奇物過濾器", "help": "僅在\"奇物過濾器\"設定為\"自訂\"時生效" + }, + "PresetResonanceFilter": { + "name": "迴響構音過濾器", + "help": "", + "preset": "預設", + "custom": "自訂" + }, + "CustomResonanceFilter": { + "name": "自訂迴響構音過濾器", + "help": "僅在\"迴響構音過濾器\"設定為\"自訂\"時生效" + }, + "SelectionStrategy": { + "name": "對於未解鎖的圖鑑", + "help": "", + "follow-presets": "不影響選擇", + "unrecorded-first": "優先選擇", + "before-random": "無法滿足過濾器時才選擇" } }, "RogueDebug": { @@ -907,7 +881,7 @@ }, "DebugMode": { "name": "偵錯模式", - "help": "" + "help": "只用於開發，如果你不知道這是什麼，不要打開" } }, "Gui": { diff --git a/tasks/rogue/bleesing/blessing.py b/tasks/rogue/bleesing/blessing.py index c728c25f9..b57cc7489 100644 --- a/tasks/rogue/bleesing/blessing.py +++ b/tasks/rogue/bleesing/blessing.py @@ -293,19 +293,19 @@ class RogueBlessingSelector(RogueSelector): RogueBlessing: { "filter_": BLESSING_FILTER, "preset_config": self.main.config.RogueBlessing_PresetBlessingFilter, - "strategy_config": self.main.config.RogueBlessing_BlessingSelectionStrategy, + "strategy_config": self.main.config.RogueBlessing_SelectionStrategy, "preset_values": { - 'preset-1': BLESSING_PRESET_1, + 'preset': BLESSING_PRESET_1, 'custom': self.main.config.RogueBlessing_CustomBlessingFilter }, }, RogueResonance: { "filter_": RESONANCE_FILTER, - "preset_config": self.main.config.RoguePath_PresetResonanceFilter, - "strategy_config": self.main.config.RoguePath_ResonanceSelectionStrategy, + "preset_config": self.main.config.RogueBlessing_PresetResonanceFilter, + "strategy_config": self.main.config.RogueBlessing_SelectionStrategy, "preset_values": { - 'preset-1': RESONANCE_PRESET_1, - 'custom': self.main.config.RoguePath_PresetResonanceFilter, + 'preset': RESONANCE_PRESET_1, + 'custom': self.main.config.RogueBlessing_PresetResonanceFilter, }, } } diff --git a/tasks/rogue/bleesing/curio.py b/tasks/rogue/bleesing/curio.py index 2a68466f2..022ad7d8f 100644 --- a/tasks/rogue/bleesing/curio.py +++ b/tasks/rogue/bleesing/curio.py @@ -146,14 +146,16 @@ class RogueCurioSelector(RogueSelector): def load_filter(self): filter_ = CURIO_FILTER string = "" - match self.main.config.RogueCurio_PresetCurioFilter: - case 'preset-1': + match self.main.config.RogueBlessing_PresetCurioFilter: + case 'preset': string = CURIO_PRESET_1 case 'custom': - string = self.main.config.RogueCurio_CustomCurioFilter + string = self.main.config.RogueBlessing_CustomCurioFilter string = parse_name(string) - match self.main.config.RogueCurio_CurioSelectionStrategy: + if not string.endswith('random'): + string += '> random' + match self.main.config.RogueBlessing_SelectionStrategy: case 'unrecorded-first': string = 'unrecorded > ' + string case 'before-random':