From 56af575a5aa0175a527aa89e2aa7b53b28986632 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 9 May 2024 17:45:36 +0800 Subject: [PATCH] Chore: SimulatedUniverseFarm should be the last --- config/template.json | 4 ++-- module/config/argument/args.json | 8 ++++---- module/config/argument/argument.yaml | 2 +- module/config/config_generated.py | 2 +- module/config/config_updater.py | 2 +- module/config/i18n/en-US.json | 8 ++++---- module/config/i18n/es-ES.json | 8 ++++---- module/config/i18n/ja-JP.json | 8 ++++---- module/config/i18n/zh-CN.json | 8 ++++---- module/config/i18n/zh-TW.json | 8 ++++---- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/config/template.json b/config/template.json index 5c4e3cc7c..9d666a02e 100644 --- a/config/template.json +++ b/config/template.json @@ -200,8 +200,8 @@ "UseImmersifier": true, "DoubleEvent": true, "WeeklyFarming": false, - "SimulatedUniverseFarm": {}, - "UseStamina": false + "UseStamina": false, + "SimulatedUniverseFarm": {} }, "RogueBlessing": { "PresetBlessingFilter": "preset", diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 01ba4ecaa..b37292f5e 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1481,15 +1481,15 @@ "type": "checkbox", "value": false }, + "UseStamina": { + "type": "checkbox", + "value": false + }, "SimulatedUniverseFarm": { "type": "stored", "value": {}, "display": "disabled", "stored": "StoredSimulatedUniverseElite" - }, - "UseStamina": { - "type": "checkbox", - "value": false } }, "RogueBlessing": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 9c9efd878..0dc814a8f 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -258,10 +258,10 @@ RogueWorld: UseImmersifier: true DoubleEvent: true WeeklyFarming: false + UseStamina: false SimulatedUniverseFarm: stored: StoredSimulatedUniverseElite display: disabled - UseStamina: false RogueBlessing: PresetBlessingFilter: diff --git a/module/config/config_generated.py b/module/config/config_generated.py index b4f3226b7..798eff74a 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -139,8 +139,8 @@ class GeneratedConfig: RogueWorld_UseImmersifier = True RogueWorld_DoubleEvent = True RogueWorld_WeeklyFarming = False - RogueWorld_SimulatedUniverseFarm = {} RogueWorld_UseStamina = False + RogueWorld_SimulatedUniverseFarm = {} # Group `RogueBlessing` RogueBlessing_PresetBlessingFilter = 'preset' # preset, custom diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 543e9ce4a..1a1f06ed6 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -864,7 +864,7 @@ class ConfigUpdater: yield 'Rogue.RogueBlessing.CustomResonanceFilter' if deep_get(data, 'Rogue.RogueBlessing.PresetCurioFilter') != 'custom': yield 'Rogue.RogueBlessing.CustomCurioFilter' - if deep_get(data, 'Rogue.RogueWorld.WeeklyFarming') != True: + if deep_get(data, 'Rogue.RogueWorld.WeeklyFarming', default=False) is False: yield 'Rogue.RogueWorld.SimulatedUniverseFarm' 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 0f170e54b..a01b95725 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -982,13 +982,13 @@ "name": "Farm 100 Elites Weekly", "help": "" }, - "SimulatedUniverseFarm": { - "name": "Progress of elite boss farmed", - "help": "" - }, "UseStamina": { "name": "Farm Planers Using Trailblase Power", "help": "Task \"Dungeon\" will no longer run, and all trailblaze power will be used first to claim immersion rewards, except for double events." + }, + "SimulatedUniverseFarm": { + "name": "Progress of elite boss farmed", + "help": "" } }, "RogueBlessing": { diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index c3dd7752d..66c665879 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -982,13 +982,13 @@ "name": "Granja 100 élites semanalmente", "help": "" }, - "SimulatedUniverseFarm": { - "name": "Progreso de élites derrotadas", - "help": "" - }, "UseStamina": { "name": "Reclamar de planers mediante poder trazacaminos", "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" + }, + "SimulatedUniverseFarm": { + "name": "Progreso de élites derrotadas", + "help": "" } }, "RogueBlessing": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index e179a8a78..82f69b042 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -982,13 +982,13 @@ "name": "RogueWorld.WeeklyFarming.name", "help": "RogueWorld.WeeklyFarming.help" }, - "SimulatedUniverseFarm": { - "name": "RogueWorld.SimulatedUniverseFarm.name", - "help": "RogueWorld.SimulatedUniverseFarm.help" - }, "UseStamina": { "name": "RogueWorld.UseStamina.name", "help": "RogueWorld.UseStamina.help" + }, + "SimulatedUniverseFarm": { + "name": "RogueWorld.SimulatedUniverseFarm.name", + "help": "RogueWorld.SimulatedUniverseFarm.help" } }, "RogueBlessing": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 8032f072a..37b6e7e84 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -982,13 +982,13 @@ "name": "每周刷100精英怪", "help": "" }, - "SimulatedUniverseFarm": { - "name": "刷精英怪进度", - "help": "" - }, "UseStamina": { "name": "使用开拓力刷内圈遗器", "help": "每日副本任务将不再打本，所有开拓力将优先被用于领取浸器奖励，双倍活动时除外" + }, + "SimulatedUniverseFarm": { + "name": "刷精英怪进度", + "help": "" } }, "RogueBlessing": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index d8e7c77a7..b7e6c08ca 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -982,13 +982,13 @@ "name": "每週農100精英怪", "help": "" }, - "SimulatedUniverseFarm": { - "name": "農精英怪進度", - "help": "" - }, "UseStamina": { "name": "用開拓力農遺器", "help": "每日副本任務將不再打本，所有開拓力將優先被用於領取浸器獎勵，雙倍活動時除外" + }, + "SimulatedUniverseFarm": { + "name": "農精英怪進度", + "help": "" } }, "RogueBlessing": {