diff --git a/assets/character/DrRatio.png b/assets/character/DrRatio.png new file mode 100644 index 000000000..1383b38a6 Binary files /dev/null and b/assets/character/DrRatio.png differ diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 27e0773f2..312487a4a 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -361,6 +361,7 @@ "Clara", "DanHeng", "DanHengImbibitorLunae", + "DrRatio", "FuXuan", "Gepard", "Guinaifen", diff --git a/module/config/config_generated.py b/module/config/config_generated.py index df92ca4ce..f97ee62f2 100644 --- a/module/config/config_generated.py +++ b/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 = {} diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 1eba29771..d23cb8e28 100644 --- a/module/config/config_updater.py +++ b/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) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 3827d0f63..e61bff3c0 100644 --- a/module/config/i18n/en-US.json +++ b/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", diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index e6a38f61e..3103b4e4c 100644 --- a/module/config/i18n/es-ES.json +++ b/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", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index d4efefcb2..641efc2b5 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -381,6 +381,7 @@ "Clara": "クラーラ", "DanHeng": "丹恒", "DanHengImbibitorLunae": "丹恒・飲月", + "DrRatio": "Dr.レイシオ", "FuXuan": "符玄", "Gepard": "ジェパード", "Guinaifen": "桂乃芬", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 7a8294222..78a748b21 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -381,6 +381,7 @@ "Clara": "克拉拉", "DanHeng": "丹恒", "DanHengImbibitorLunae": "丹恒•饮月", + "DrRatio": "真理医生", "FuXuan": "符玄", "Gepard": "杰帕德", "Guinaifen": "桂乃芬", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 93808715e..9fe990535 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -381,6 +381,7 @@ "Clara": "克拉拉", "DanHeng": "丹恆", "DanHengImbibitorLunae": "丹恆•飲月", + "DrRatio": "真理醫生", "FuXuan": "符玄", "Gepard": "傑帕德", "Guinaifen": "桂乃芬", diff --git a/tasks/battle_pass/battle_pass.py b/tasks/battle_pass/battle_pass.py index b1c684c37..b5053dec6 100644 --- a/tasks/battle_pass/battle_pass.py +++ b/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,