diff --git a/config/template.json b/config/template.json index 8661bc5e7..72e91bb2a 100644 --- a/config/template.json +++ b/config/template.json @@ -173,6 +173,10 @@ "Weekly": { "Name": "Echo_of_War_Divine_Seed", "Team": 1 + }, + "DungeonSupport": { + "Use": "do_not_use", + "Character": "FirstCharacter" } }, "Rogue": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index ce370b787..85586dacc 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1276,6 +1276,67 @@ 9 ] } + }, + "DungeonSupport": { + "Use": { + "type": "select", + "value": "do_not_use", + "option": [ + "always_use", + "do_not_use" + ] + }, + "Character": { + "type": "select", + "value": "FirstCharacter", + "option": [ + "FirstCharacter", + "Argenti", + "Arlan", + "Asta", + "Bailu", + "BlackSwan", + "Blade", + "Bronya", + "Clara", + "DanHeng", + "DanHengImbibitorLunae", + "DrRatio", + "FuXuan", + "Gepard", + "Guinaifen", + "Hanya", + "Herta", + "Himeko", + "Hook", + "Huohuo", + "JingYuan", + "Jingliu", + "Kafka", + "Luka", + "Luocha", + "Lynx", + "March7th", + "Misha", + "Natasha", + "Pela", + "Qingque", + "RuanMei", + "Sampo", + "Seele", + "Serval", + "SilverWolf", + "Sushang", + "Tingyun", + "TopazNumby", + "TrailblazerDestruction", + "TrailblazerPreservation", + "Welt", + "Xueyi", + "Yanqing", + "Yukong" + ] + } } }, "Rogue": { diff --git a/module/config/argument/default.yaml b/module/config/argument/default.yaml index 46b01f65c..c61b6d474 100644 --- a/module/config/argument/default.yaml +++ b/module/config/argument/default.yaml @@ -22,3 +22,9 @@ Assignment: Freebies: Scheduler: Enable: true + +# ==================== Weekly ==================== + +Weekly: + DungeonSupport: + Use: do_not_use diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 4657d6590..bb458f39e 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -30,3 +30,10 @@ DataUpdate: value: true option: [ true, ] option_bold: [ true, ] + +# ==================== Weekly ==================== + +Weekly: + DungeonSupport: + Use: + option: [ always_use, do_not_use ] diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 4fddcf5fc..34a1a102c 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -54,6 +54,7 @@ Weekly: Weekly: - Scheduler - Weekly + - DungeonSupport Rogue: - Scheduler - RogueWorld diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index f071fade4..35706dd1e 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -223,13 +223,13 @@ "Name": { "name": "Dungeon Name", "help": "Default dungeon setting", - "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-VI))", + "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-Ⅵ))", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories (The Xianzhou Luofu))", "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories (Penacony))", - "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-VI))", + "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-Ⅵ))", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether (The Xianzhou Luofu))", "Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether (Penacony))", - "Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-VI))", + "Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-Ⅵ))", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Credit (Bud of Treasures (The Xianzhou Luofu))", "Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))", "Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)", @@ -272,13 +272,13 @@ "name": "At Double Calyx Event, choose dungeon", "help": "Return to the default dungeon settings after double times exhausted", "do_not_participate": "Dont participate in event", - "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-VI))", + "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-Ⅵ))", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories (The Xianzhou Luofu))", "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories (Penacony))", - "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-VI))", + "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-Ⅵ))", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether (The Xianzhou Luofu))", "Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether (Penacony))", - "Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-VI))", + "Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-Ⅵ))", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Credit (Bud of Treasures (The Xianzhou Luofu))", "Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))", "Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)", @@ -329,13 +329,13 @@ "name": "Clear Calyx Golden 1 times", "help": "", "do_not_achieve": "Don't Do This Quest", - "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-VI))", + "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories (Jarilo-Ⅵ))", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories (The Xianzhou Luofu))", "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories (Penacony))", - "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-VI))", + "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether (Jarilo-Ⅵ))", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether (The Xianzhou Luofu))", "Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether (Penacony))", - "Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-VI))", + "Calyx_Golden_Treasures_Jarilo_VI": "Material: Credit (Bud of Treasures (Jarilo-Ⅵ))", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Credit (Bud of Treasures (The Xianzhou Luofu))", "Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))" }, @@ -404,7 +404,7 @@ }, "Character": { "name": "Support Character", - "help": "Select a friend support character, if not found, select the default (first) role", + "help": "Select a friend support character, if not found, select the default (first) role\nSupport character should not be the same as the character in the team, recommended to prioritize friends.", "FirstCharacter": "First Character", "Argenti": "Argenti", "Arlan": "Arlan", diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 41deed116..255b71091 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -223,13 +223,13 @@ "Name": { "name": "Nombre de la Mazmorra", "help": "Ajustes predeterminados de las mazmorras", - "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-VI))", + "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-Ⅵ))", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos (El Luofu de Xianzhou))", "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos (Colonipenal))", - "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-VI))", + "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-Ⅵ))", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter (El Luofu de Xianzhou))", "Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter (Colonipenal))", - "Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-VI))", + "Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-Ⅵ))", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Créditos (Flor de tesoros (El Luofu de Xianzhou))", "Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))", "Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)", @@ -272,13 +272,13 @@ "name": "En los eventos de x2 de Cáliz", "help": "Se volverán a los ajustes predeterminados una vez se acaben los intentos del evento", "do_not_participate": "No participar en el evento", - "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-VI))", + "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-Ⅵ))", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos (El Luofu de Xianzhou))", "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos (Colonipenal))", - "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-VI))", + "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-Ⅵ))", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter (El Luofu de Xianzhou))", "Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter (Colonipenal))", - "Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-VI))", + "Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-Ⅵ))", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Créditos (Flor de tesoros (El Luofu de Xianzhou))", "Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))", "Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)", @@ -329,13 +329,13 @@ "name": "Completar Cáliz (oro) 1 vez", "help": "", "do_not_achieve": "No hacer esta misión", - "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-VI))", + "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos (Jarilo-Ⅵ))", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos (El Luofu de Xianzhou))", "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos (Colonipenal))", - "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-VI))", + "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter (Jarilo-Ⅵ))", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter (El Luofu de Xianzhou))", "Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter (Colonipenal))", - "Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-VI))", + "Calyx_Golden_Treasures_Jarilo_VI": "Material: Créditos (Flor de tesoros (Jarilo-Ⅵ))", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "Material: Créditos (Flor de tesoros (El Luofu de Xianzhou))", "Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))" }, @@ -404,7 +404,7 @@ }, "Character": { "name": "Personaje de apoyo", - "help": "Selecciona qué personaje de apoyo de un amigo se usará. Si no se encuentra, se seleccionará al predeterminado.", + "help": "Selecciona qué personaje de apoyo de un amigo se usará. Si no se encuentra, se seleccionará al predeterminado.\nEl personaje de apoyo no debe ser el mismo que el personaje del equipo, se recomienda priorizar a los amigos.", "FirstCharacter": "Primer personaje", "Argenti": "Argenti", "Arlan": "Arlan", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 666ff6344..eda548e63 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -223,13 +223,13 @@ "Name": { "name": "Dungeon.Name.name", "help": "Dungeon.Name.help", - "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-VI）：", + "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-Ⅵ）：", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾・仙舟羅浮）：", "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾・ピノコニー）：", - "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-VI）：", + "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-Ⅵ）：", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾・仙舟羅浮）：", "Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾・ピノコニー）：", - "Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-VI）", + "Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-Ⅵ）", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "素材：クレジット（秘蔵の蕾・仙舟羅浮）", "Calyx_Golden_Treasures_Penacony": "素材：クレジット（秘蔵の蕾・ピノコニー）", "Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材：壊滅（収容部分）", @@ -272,13 +272,13 @@ "name": "Dungeon.NameAtDoubleCalyx.name", "help": "Dungeon.NameAtDoubleCalyx.help", "do_not_participate": "do_not_participate", - "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-VI）：", + "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-Ⅵ）：", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾・仙舟羅浮）：", "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾・ピノコニー）：", - "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-VI）：", + "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-Ⅵ）：", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾・仙舟羅浮）：", "Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾・ピノコニー）：", - "Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-VI）", + "Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-Ⅵ）", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "素材：クレジット（秘蔵の蕾・仙舟羅浮）", "Calyx_Golden_Treasures_Penacony": "素材：クレジット（秘蔵の蕾・ピノコニー）", "Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材：壊滅（収容部分）", @@ -329,13 +329,13 @@ "name": "DungeonDaily.CalyxGolden.name", "help": "DungeonDaily.CalyxGolden.help", "do_not_achieve": "do_not_achieve", - "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-VI）：", + "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾・ヤリーロ-Ⅵ）：", "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾・仙舟羅浮）：", "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾・ピノコニー）：", - "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-VI）：", + "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾・ヤリーロ-Ⅵ）：", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾・仙舟羅浮）：", "Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾・ピノコニー）：", - "Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-VI）", + "Calyx_Golden_Treasures_Jarilo_VI": "素材：クレジット（秘蔵の蕾・ヤリーロ-Ⅵ）", "Calyx_Golden_Treasures_The_Xianzhou_Luofu": "素材：クレジット（秘蔵の蕾・仙舟羅浮）", "Calyx_Golden_Treasures_Penacony": "素材：クレジット（秘蔵の蕾・ピノコニー）" }, diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index be799b4a7..52539cc65 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -404,7 +404,7 @@ }, "Character": { "name": "好友支援角色", - "help": "选择好友支援角色，未找到则选择默认（第一个）角色", + "help": "选择好友支援角色，未找到则选择默认（第一个）角色\n支援角色不要与队伍中的角色重复，建议置顶好友角色", "FirstCharacter": "支援列表第一个角色", "Argenti": "银枝", "Arlan": "阿兰", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 7e0af0ca2..4e180d426 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -404,7 +404,7 @@ }, "Character": { "name": "好友支援角色", - "help": "選擇好友支援角色，未找到則選擇默認（第一個）角色", + "help": "選擇好友支援角色，未找到則選擇默認（第一個）角色\n支援角色不要與隊伍中的角色重複，建議置頂好友角色", "FirstCharacter": "支援列表第一個角色", "Argenti": "銀枝", "Arlan": "阿蘭", diff --git a/tasks/dungeon/weekly.py b/tasks/dungeon/weekly.py index 359b9ba59..846104f47 100644 --- a/tasks/dungeon/weekly.py +++ b/tasks/dungeon/weekly.py @@ -15,8 +15,7 @@ class WeeklyDungeon(Dungeon): skip_ui_switch: bool = False): if team is None: team = self.config.Weekly_Team - # No support - support_character = '' + skip_ui_switch = True return super()._dungeon_run( dungeon=dungeon, team=team, wave_limit=wave_limit,