From 0f8456f98d2d7d7e11b37b6b1b5126b0819c6ef7 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:43:03 +0800 Subject: [PATCH] Add: Double rogue event setting --- config/template.json | 1 + module/config/argument/args.json | 4 ++++ module/config/argument/argument.yaml | 1 + module/config/argument/stored.json | 3 ++- module/config/config_generated.py | 1 + module/config/config_updater.py | 4 ++++ module/config/i18n/en-US.json | 4 ++++ module/config/i18n/es-ES.json | 4 ++++ module/config/i18n/ja-JP.json | 4 ++++ module/config/i18n/zh-CN.json | 4 ++++ module/config/i18n/zh-TW.json | 4 ++++ module/config/stored/classes.py | 1 + 12 files changed, 34 insertions(+), 1 deletion(-) diff --git a/config/template.json b/config/template.json index a01d447e1..1a066fef3 100644 --- a/config/template.json +++ b/config/template.json @@ -188,6 +188,7 @@ "Bonus": "Blessing Universe", "DomainStrategy": "combat", "UseImmersifier": true, + "DoubleEvent": true, "UseStamina": false }, "RogueBlessing": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 4b9f68be8..87e2afac5 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1300,6 +1300,10 @@ "type": "checkbox", "value": true }, + "DoubleEvent": { + "type": "checkbox", + "value": true + }, "UseStamina": { "type": "checkbox", "value": false diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index c0846f975..7735641b1 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -235,6 +235,7 @@ RogueWorld: value: combat option: [ combat, occurrence ] UseImmersifier: true + DoubleEvent: true UseStamina: false RogueBlessing: diff --git a/module/config/argument/stored.json b/module/config/argument/stored.json index c676428a1..55599ae90 100644 --- a/module/config/argument/stored.json +++ b/module/config/argument/stored.json @@ -122,7 +122,8 @@ "attrs": { "time": "2020-01-01 00:00:00", "calyx": 0, - "relic": 0 + "relic": 0, + "rogue": 0 }, "order": 0, "color": "#777777" diff --git a/module/config/config_generated.py b/module/config/config_generated.py index f524fe4b7..da2a17684 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -131,6 +131,7 @@ class GeneratedConfig: RogueWorld_Bonus = 'Blessing Universe' # Blessing Universe, Miracle Universe, Fragmented Universe RogueWorld_DomainStrategy = 'combat' # combat, occurrence RogueWorld_UseImmersifier = True + RogueWorld_DoubleEvent = True RogueWorld_UseStamina = False # Group `RogueBlessing` diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 21b8b1d45..1eba29771 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -721,6 +721,8 @@ class ConfigUpdater: deep_set(data, keys='Rogue.RogueWorld.UseStamina', value=False) if deep_get(data, keys='Rogue.RogueWorld.UseStamina') is True: deep_set(data, keys='Rogue.RogueWorld.UseImmersifier', value=True) + if deep_get(data, keys='Rogue.RogueWorld.DoubleEvent') is True: + deep_set(data, keys='Rogue.RogueWorld.UseImmersifier', value=True) # Store immersifier in dungeon task if deep_get(data, keys='Rogue.RogueWorld.UseImmersifier') is True: deep_set(data, keys='Dungeon.Scheduler.Enable', value=True) @@ -769,6 +771,8 @@ class ConfigUpdater: yield 'Rogue.RogueWorld.UseStamina', False elif key == 'Rogue.RogueWorld.UseStamina' and value is True: yield 'Rogue.RogueWorld.UseImmersifier', True + elif key == 'Rogue.RogueWorld.DoubleEvent' and value is True: + yield 'Rogue.RogueWorld.UseImmersifier', True def iter_hidden_args(self, data) -> t.Iterator[str]: """ diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 602578232..d9dd273d4 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -879,6 +879,10 @@ "name": "Claim Planers Using Immersifiers", "help": "" }, + "DoubleEvent": { + "name": "Participate in Double Planer Event", + "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." diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index eb09f28a6..2492c16e1 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -879,6 +879,10 @@ "name": "Reclamar de planers mediante inmersor", "help": "" }, + "DoubleEvent": { + "name": "Participa en doble planer evento", + "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" diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f6a276f2f..3d4216685 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -879,6 +879,10 @@ "name": "RogueWorld.UseImmersifier.name", "help": "RogueWorld.UseImmersifier.help" }, + "DoubleEvent": { + "name": "RogueWorld.DoubleEvent.name", + "help": "RogueWorld.DoubleEvent.help" + }, "UseStamina": { "name": "RogueWorld.UseStamina.name", "help": "RogueWorld.UseStamina.help" diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 1840868f1..3c49637d8 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -879,6 +879,10 @@ "name": "使用沉浸器领取遗器", "help": "" }, + "DoubleEvent": { + "name": "参与双倍内圈仪器活动", + "help": "" + }, "UseStamina": { "name": "使用开拓力刷内圈遗器", "help": "每日副本任务将不再打本，所有开拓力将优先被用于领取浸器奖励，双倍活动时除外" diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index b852cbba7..5a73b45f8 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -879,6 +879,10 @@ "name": "使用沉浸器領取遺器", "help": "" }, + "DoubleEvent": { + "name": "參與雙倍內圈儀器活動", + "help": "" + }, "UseStamina": { "name": "用開拓力農遺器", "help": "每日副本任務將不再打本，所有開拓力將優先被用於領取浸器獎勵，雙倍活動時除外" diff --git a/module/config/stored/classes.py b/module/config/stored/classes.py index 8dac656e4..44e818826 100644 --- a/module/config/stored/classes.py +++ b/module/config/stored/classes.py @@ -278,6 +278,7 @@ class StoredDaily(StoredCounter, StoredExpiredAt0400): class StoredDungeonDouble(StoredExpiredAt0400): calyx = 0 relic = 0 + rogue = 0 class StoredEchoOfWar(StoredCounter, StoredExpiredAtMonday0400):