Merge pull request #282 from LmeSzinc/bug_fix

Bug fix

module/config/argument/args.json

@@ -361,6 +361,7 @@
           "Clara",
           "DanHeng",
           "DanHengImbibitorLunae",
+          "DrRatio",
           "FuXuan",
           "Gepard",
           "Guinaifen",

module/config/config_generated.py

@@ -53,7 +53,7 @@ class GeneratedConfig:
 
     # Group `DungeonSupport`
     DungeonSupport_Use = 'when_daily'  # always_use, when_daily, do_not_use
-    DungeonSupport_Character = 'FirstCharacter'  # FirstCharacter, Argenti, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, FuXuan, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Natasha, Pela, Qingque, RuanMei, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong
+    DungeonSupport_Character = 'FirstCharacter'  # FirstCharacter, Argenti, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, FuXuan, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Natasha, Pela, Qingque, RuanMei, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong
 
     # Group `DungeonStorage`
     DungeonStorage_TrailblazePower = {}

module/config/config_updater.py

@@ -92,7 +92,7 @@ class ConfigGenerator:
             options=[dungeon.name for dungeon in DungeonList.instances.values() if dungeon.is_Echo_of_War])
         # Insert characters
         from tasks.character.keywords import CharacterList
-        unsupported_characters = ["DrRatio"]
+        unsupported_characters = []
         characters = [character.name for character in CharacterList.instances.values()
                       if character.name not in unsupported_characters]
         option_add(keys='DungeonSupport.Character.option', options=characters)

module/config/i18n/en-US.json

@@ -381,6 +381,7 @@
       "Clara": "Clara",
       "DanHeng": "Dan Heng",
       "DanHengImbibitorLunae": "Dan Heng • Imbibitor Lunae",
+      "DrRatio": "Dr. Ratio",
       "FuXuan": "Fu Xuan",
       "Gepard": "Gepard",
       "Guinaifen": "Guinaifen",

module/config/i18n/es-ES.json

@@ -381,6 +381,7 @@
       "Clara": "Clara",
       "DanHeng": "Dan Heng",
       "DanHengImbibitorLunae": "Dan Heng - Imbibitor Lunae",
+      "DrRatio": "Dr. Ratio",
       "FuXuan": "Fu Xuan",
       "Gepard": "Gepard",
       "Guinaifen": "Guinaifen",

module/config/i18n/ja-JP.json

@@ -381,6 +381,7 @@
       "Clara": "クラーラ",
       "DanHeng": "丹恒",
       "DanHengImbibitorLunae": "丹恒・飲月",
+      "DrRatio": "Dr.レイシオ",
       "FuXuan": "符玄",
       "Gepard": "ジェパード",
       "Guinaifen": "桂乃芬",

module/config/i18n/zh-CN.json

@@ -381,6 +381,7 @@
       "Clara": "克拉拉",
       "DanHeng": "丹恒",
       "DanHengImbibitorLunae": "丹恒•饮月",
+      "DrRatio": "真理医生",
       "FuXuan": "符玄",
       "Gepard": "杰帕德",
       "Guinaifen": "桂乃芬",

module/config/i18n/zh-TW.json

@@ -381,6 +381,7 @@
       "Clara": "克拉拉",
       "DanHeng": "丹恆",
       "DanHengImbibitorLunae": "丹恆•飲月",
+      "DrRatio": "真理醫生",
       "FuXuan": "符玄",
       "Gepard": "傑帕德",
       "Guinaifen": "桂乃芬",

tasks/battle_pass/battle_pass.py

@@ -20,7 +20,15 @@ from tasks.base.ui import UI
 from tasks.battle_pass.assets.assets_battle_pass import *
 from tasks.battle_pass.keywords import *
 
-SWITCH_BATTLE_PASS_TAB = Switch('BattlePassTab', is_selector=True)
+
+class BattlePassTab(Switch):
+    def handle_additional(self, main: UI):
+        if main.handle_reward():
+            return True
+        return False
+
+
+SWITCH_BATTLE_PASS_TAB = BattlePassTab('BattlePassTab', is_selector=True)
 SWITCH_BATTLE_PASS_TAB.add_state(
     KEYWORD_BATTLE_PASS_TAB.Rewards,
     check_button=REWARDS_CHECK,