From aa700b81db820782361e0f0ed6d375a37510195b Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:38:20 +0800 Subject: [PATCH] I18n: WeeklyFarming description --- config/template.json | 2 +- module/config/argument/args.json | 4 ++-- module/config/argument/argument.yaml | 2 +- module/config/config_generated.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 ++++---- module/config/stored/classes.py | 14 +++++++------- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/config/template.json b/config/template.json index 308482694..a177646a8 100644 --- a/config/template.json +++ b/config/template.json @@ -199,8 +199,8 @@ "DomainStrategy": "combat", "UseImmersifier": true, "DoubleEvent": true, - "UseStamina": false, "WeeklyFarming": false, + "UseStamina": false, "SimulatedUniverseElite": {} }, "RogueBlessing": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index ed8122978..61de75e65 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1467,11 +1467,11 @@ "type": "checkbox", "value": true }, - "UseStamina": { + "WeeklyFarming": { "type": "checkbox", "value": false }, - "WeeklyFarming": { + "UseStamina": { "type": "checkbox", "value": false }, diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 51003fb26..206d023c0 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -257,8 +257,8 @@ RogueWorld: option: [ combat, occurrence ] UseImmersifier: true DoubleEvent: true - UseStamina: false WeeklyFarming: false + UseStamina: false SimulatedUniverseElite: stored: StoredSimulatedUniverseElite diff --git a/module/config/config_generated.py b/module/config/config_generated.py index af35a4cfa..31363dddb 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -138,8 +138,8 @@ class GeneratedConfig: RogueWorld_DomainStrategy = 'combat' # combat, occurrence RogueWorld_UseImmersifier = True RogueWorld_DoubleEvent = True - RogueWorld_UseStamina = False RogueWorld_WeeklyFarming = False + RogueWorld_UseStamina = False RogueWorld_SimulatedUniverseElite = {} # Group `RogueBlessing` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 66c4073a9..a062ac5ff 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -970,14 +970,14 @@ "name": "Participate in Double Planer Event", "help": "" }, + "WeeklyFarming": { + "name": "Farm 100 Elites Weekly", + "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." }, - "WeeklyFarming": { - "name": "Boss Material Farming", - "help": "Do not stop after point reward is full; farm the boss 100 times instead to obtain trace materials" - }, "SimulatedUniverseElite": { "name": "RogueWorld.SimulatedUniverseElite.name", "help": "RogueWorld.SimulatedUniverseElite.help" diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 18e32fe4b..6130a4cce 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -970,14 +970,14 @@ "name": "Participa en doble planer evento", "help": "" }, + "WeeklyFarming": { + "name": "Granja 100 élites semanalmente", + "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" }, - "WeeklyFarming": { - "name": "Recolección de Materiales de Jefes", - "help": "No detenerse después de que los puntos semanales estén llenos, farmear al jefe 100 veces para obtener materiales de rastro" - }, "SimulatedUniverseElite": { "name": "RogueWorld.SimulatedUniverseElite.name", "help": "RogueWorld.SimulatedUniverseElite.help" diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index af3efe861..b2ff361a2 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -970,14 +970,14 @@ "name": "RogueWorld.DoubleEvent.name", "help": "RogueWorld.DoubleEvent.help" }, + "WeeklyFarming": { + "name": "RogueWorld.WeeklyFarming.name", + "help": "RogueWorld.WeeklyFarming.help" + }, "UseStamina": { "name": "RogueWorld.UseStamina.name", "help": "RogueWorld.UseStamina.help" }, - "WeeklyFarming": { - "name": "ボス素材を収集", - "help": "週間ポイントが満点に達しても停止せず、100回のボスをファームして軌跡素材を入手" - }, "SimulatedUniverseElite": { "name": "RogueWorld.SimulatedUniverseElite.name", "help": "RogueWorld.SimulatedUniverseElite.help" diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 0ad1e991c..cf3a86232 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -970,14 +970,14 @@ "name": "参与双倍内圈仪器活动", "help": "" }, + "WeeklyFarming": { + "name": "每周刷100精英怪", + "help": "" + }, "UseStamina": { "name": "使用开拓力刷内圈遗器", "help": "每日副本任务将不再打本，所有开拓力将优先被用于领取浸器奖励，双倍活动时除外" }, - "WeeklyFarming": { - "name": "刷取Boss材料", - "help": "每周积分满后不停止，刷取100次Boss以获取形迹材料" - }, "SimulatedUniverseElite": { "name": "剩余Boss材料掉落次数", "help": "RogueWorld.SimulatedUniverseElite.help" diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 2535a576b..a9afefdfb 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -970,14 +970,14 @@ "name": "參與雙倍內圈儀器活動", "help": "" }, + "WeeklyFarming": { + "name": "每週農100精英怪", + "help": "" + }, "UseStamina": { "name": "用開拓力農遺器", "help": "每日副本任務將不再打本，所有開拓力將優先被用於領取浸器獎勵，雙倍活動時除外" }, - "WeeklyFarming": { - "name": "刷取Boss材料", - "help": "每週積分滿後不停止，刷取100次Boss以獲取形跡材料" - }, "SimulatedUniverseElite": { "name": "RogueWorld.SimulatedUniverseElite.name", "help": "RogueWorld.SimulatedUniverseElite.help" diff --git a/module/config/stored/classes.py b/module/config/stored/classes.py index 4ff830f0b..83c6ca9ef 100644 --- a/module/config/stored/classes.py +++ b/module/config/stored/classes.py @@ -210,24 +210,24 @@ class StoredSimulatedUniverse(StoredCounter, StoredExpiredAtMonday0400): class StoredSimulatedUniverseElite(StoredCounter, StoredExpiredAtMonday0400): # These variables are used in Rogue Farming feature. - + # Times of boss drop chance per week. In current version of StarRail, this value is 100. FIXED_DEFAULT = 100 - + # Times left to farm. Resets to 100 every Monday 04:00, and decreases each time the elite boss is cleared. value = FIXED_DEFAULT - - def farm_dec(self, delta = 1): + + def farm_dec(self, delta=1): self.value -= delta if self.value < 0: self.value = 0 - + def farm_reset(self): self.value = self.FIXED_DEFAULT - + def farm_not_complete(self) -> bool: return self.value > 0 - + def farm_get_remain(self) -> int: return self.value