diff --git a/assets/character/Argenti.png b/assets/character/Argenti.png new file mode 100644 index 000000000..7f5c8cd1c Binary files /dev/null and b/assets/character/Argenti.png differ diff --git a/assets/character/Hanya.png b/assets/character/Hanya.png new file mode 100644 index 000000000..9fd41e768 Binary files /dev/null and b/assets/character/Hanya.png differ diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 9ab93ea96..26667b51d 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -349,6 +349,7 @@ "value": "FirstCharacter", "option": [ "FirstCharacter", + "Argenti", "Arlan", "Asta", "Bailu", @@ -360,6 +361,7 @@ "FuXuan", "Gepard", "Guinaifen", + "Hanya", "Herta", "Himeko", "Hook", diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 4f4201c7d..2fc95b7ba 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, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, FuXuan, Gepard, Guinaifen, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong + 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, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong # Group `DungeonStorage` DungeonStorage_TrailblazePower = {} diff --git a/module/config/config_updater.py b/module/config/config_updater.py index c3ae24b6d..646ab1936 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 = ['Argenti','Hanya'] + 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 d6c1828eb..ab1adcdbb 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -361,6 +361,7 @@ "name": "Support Character", "help": "Select a friend support character, if not found, select the default (first) role", "FirstCharacter": "First Character", + "Argenti": "Argenti", "Arlan": "Arlan", "Asta": "Asta", "Bailu": "Bailu", @@ -372,6 +373,7 @@ "FuXuan": "Fu Xuan", "Gepard": "Gepard", "Guinaifen": "Guinaifen", + "Hanya": "Hanya", "Herta": "Herta", "Himeko": "Himeko", "Hook": "Hook", diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 4c1960393..a4493257c 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -361,6 +361,7 @@ "name": "Personaje de apoyo", "help": "Selecciona qué personaje de apoyo de un amigo se usará. Si no se encuentra, se seleccionará al predeterminado.", "FirstCharacter": "Primer personaje", + "Argenti": "Argenti", "Arlan": "Arlan", "Asta": "Asta", "Bailu": "Bailu", @@ -372,6 +373,7 @@ "FuXuan": "Fu Xuan", "Gepard": "Gepard", "Guinaifen": "Guinaifen", + "Hanya": "Hanya", "Herta": "Herta", "Himeko": "Himeko", "Hook": "Hook", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 671837947..aa12ae93c 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -361,6 +361,7 @@ "name": "DungeonSupport.Character.name", "help": "DungeonSupport.Character.help", "FirstCharacter": "FirstCharacter", + "Argenti": "アルジェンティ", "Arlan": "アーラン", "Asta": "アスター", "Bailu": "白露", @@ -372,6 +373,7 @@ "FuXuan": "符玄", "Gepard": "ジェパード", "Guinaifen": "桂乃芬", + "Hanya": "寒鴉", "Herta": "ヘルタ", "Himeko": "姫子", "Hook": "フック", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 8ff72b226..de787006c 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -361,6 +361,7 @@ "name": "好友支援角色", "help": "选择好友支援角色，未找到则选择默认（第一个）角色", "FirstCharacter": "支援列表第一个角色", + "Argenti": "银枝", "Arlan": "阿兰", "Asta": "艾丝妲", "Bailu": "白露", @@ -372,6 +373,7 @@ "FuXuan": "符玄", "Gepard": "杰帕德", "Guinaifen": "桂乃芬", + "Hanya": "寒鸦", "Herta": "黑塔", "Himeko": "姬子", "Hook": "虎克", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 649e2499b..400c5a9a5 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -361,6 +361,7 @@ "name": "好友支援角色", "help": "選擇好友支援角色，未找到則選擇默認（第一個）角色", "FirstCharacter": "支援列表第一個角色", + "Argenti": "銀枝", "Arlan": "阿蘭", "Asta": "艾絲妲", "Bailu": "白露", @@ -372,6 +373,7 @@ "FuXuan": "符玄", "Gepard": "傑帕德", "Guinaifen": "桂乃芬", + "Hanya": "寒鴉", "Herta": "黑塔", "Himeko": "姬子", "Hook": "虎克", diff --git a/module/config/stored/classes.py b/module/config/stored/classes.py index 483cae4a1..a1ff451c3 100644 --- a/module/config/stored/classes.py +++ b/module/config/stored/classes.py @@ -282,7 +282,7 @@ class StoredEchoOfWar(StoredCounter, StoredExpiredAtMonday0400): class StoredBattlePassLevel(StoredCounter): - FIXED_TOTAL = 50 + FIXED_TOTAL = 70 class StoredBattlePassTodayQuest(StoredCounter, StoredExpiredAt0400):