diff --git a/assets/character/Blade.png b/assets/character/Blade.png new file mode 100644 index 000000000..e92c7106f Binary files /dev/null and b/assets/character/Blade.png differ diff --git a/assets/character/CaelumtheDestruction.png b/assets/character/CaelumDestruction.png similarity index 100% rename from assets/character/CaelumtheDestruction.png rename to assets/character/CaelumDestruction.png diff --git a/assets/character/CaelumthePreservation.png b/assets/character/CaelumPreservation.png similarity index 100% rename from assets/character/CaelumthePreservation.png rename to assets/character/CaelumPreservation.png diff --git a/assets/character/StelletheDestruction.png b/assets/character/StelleDestruction.png similarity index 100% rename from assets/character/StelletheDestruction.png rename to assets/character/StelleDestruction.png diff --git a/assets/character/StellethePreservation.png b/assets/character/StellePreservation.png similarity index 100% rename from assets/character/StellethePreservation.png rename to assets/character/StellePreservation.png diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 31c0db49b..59cb81b0a 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -191,12 +191,14 @@ "Stagnant_Shadow_Mirage", "Stagnant_Shadow_Icicle", "Stagnant_Shadow_Doom", + "Stagnant_Shadow_Celestial", "Cavern_of_Corrosion_Path_of_Gelid_Wind", "Cavern_of_Corrosion_Path_of_Jabbing_Punch", "Cavern_of_Corrosion_Path_of_Drifting", "Cavern_of_Corrosion_Path_of_Providence", "Cavern_of_Corrosion_Path_of_Holy_Hymn", - "Cavern_of_Corrosion_Path_of_Conflagration" + "Cavern_of_Corrosion_Path_of_Conflagration", + "Cavern_of_Corrosion_Path_of_Elixir_Seekers" ] }, "NameAtDoubleCalyx": { @@ -245,6 +247,7 @@ "Arlan", "Asta", "Bailu", + "Blade", "Bronya", "Clara", "DanHeng", @@ -253,7 +256,6 @@ "Himeko", "Hook", "JingYuan", - "Kafka", "Luocha", "March7th", "Natasha", @@ -265,8 +267,8 @@ "SilverWolf", "Sushang", "Tingyun", - "TrailblazertheDestruction", - "TrailblazerthePreservation", + "TrailblazerDestruction", + "TrailblazerPreservation", "Welt", "Yanqing", "Yukong" diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 49641de3b..05646fbf2 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -39,11 +39,11 @@ class GeneratedConfig: Optimization_WhenTaskQueueEmpty = 'goto_main' # stay_there, goto_main, close_game # Group `Dungeon` - Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration + Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Celestial, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures' # do_not_participate, Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility Dungeon_Team = 1 # 1, 2, 3, 4, 5, 6 Dungeon_Support = 'when_daily' # do_not_use, always_use, when_daily - Dungeon_SupportCharacter = 'FirstCharacter' # FirstCharacter, Arlan, Asta, Bailu, Bronya, Clara, DanHeng, Gepard, Herta, Himeko, Hook, JingYuan, Kafka, Luocha, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TrailblazertheDestruction, TrailblazerthePreservation, Welt, Yanqing, Yukong + Dungeon_SupportCharacter = 'FirstCharacter' # FirstCharacter, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, Gepard, Herta, Himeko, Hook, JingYuan, Luocha, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong # Group `Assignment` Assignment_Duration = 20 # 4, 8, 12, 20 diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 06843480a..c50c11980 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -371,15 +371,17 @@ class ConfigGenerator: dungeons = [dungeon.name for dungeon in DungeonList.instances.values() if dungeon.is_daily_dungeon] deep_set(self.argument, keys='Dungeon.Name.option', value=dungeons) deep_set(self.args, keys='Dungeon.Dungeon.Name.option', value=dungeons) - + from tasks.character.keywords import CharacterList - characters = ['FirstCharacter'] + [character.name for character in CharacterList.instances.values()] + unsupported_characters = ["DanHengImbibitorLunae", 'Kafka', 'Luka'] + characters = ['FirstCharacter'] + [character.name for character in CharacterList.instances.values() if + character.name not in unsupported_characters] deep_set(self.argument, keys='Dungeon.SupportCharacter.option', value=characters) deep_set(self.args, keys='Dungeon.Dungeon.SupportCharacter.option', value=characters) - + dungeons = deep_get(self.argument, keys='Dungeon.NameAtDoubleCalyx.option') dungeons += [dungeon.name for dungeon in DungeonList.instances.values() - if dungeon.is_Calyx_Golden or dungeon.is_Calyx_Crimson] + if dungeon.is_Calyx_Golden or dungeon.is_Calyx_Crimson] deep_set(self.argument, keys='Dungeon.NameAtDoubleCalyx.option', value=dungeons) deep_set(self.args, keys='Dungeon.Dungeon.NameAtDoubleCalyx.option', value=dungeons) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 5ce17cacb..465a06efb 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -202,12 +202,14 @@ "Stagnant_Shadow_Mirage": "Ascension: Imaginary (Shape of Mirage)", "Stagnant_Shadow_Icicle": "Ascension: Ice (Shape of Icicle)", "Stagnant_Shadow_Doom": "Ascension: Lighting (Shape of Doom)", + "Stagnant_Shadow_Celestial": "Ascension: Wind (Shape of Celestial)", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "Relics: Ice Set & Wind Set (Path of Gelid Wind)", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "Relics: Physical Set & Break Effect Set (Path of Jabbing Punch)", "Cavern_of_Corrosion_Path_of_Drifting": "Relics: Healing Set & Musketeer Set (Path of Drifting)", "Cavern_of_Corrosion_Path_of_Providence": "Relics: Guard Set & Quantum Set (Path of Providence)", "Cavern_of_Corrosion_Path_of_Holy_Hymn": "Relics: DEF Set & Lighting Set (Path of Holy Hymn)", - "Cavern_of_Corrosion_Path_of_Conflagration": "Relics: Fire Set & Imaginary Set (Path of Conflagration)" + "Cavern_of_Corrosion_Path_of_Conflagration": "Relics: Fire Set & Imaginary Set (Path of Conflagration)", + "Cavern_of_Corrosion_Path_of_Elixir_Seekers": "Relics: HP Set & SPD Set (Path of Elixir Seekers)" }, "NameAtDoubleCalyx": { "name": "At Double Calyx Event, choose dungeon", @@ -248,6 +250,7 @@ "Arlan": "Arlan", "Asta": "Asta", "Bailu": "Bailu", + "Blade": "Blade", "Bronya": "Bronya", "Clara": "Clara", "DanHeng": "Dan Heng", @@ -256,7 +259,6 @@ "Himeko": "Himeko", "Hook": "Hook", "JingYuan": "Jing Yuan", - "Kafka": "Kafka", "Luocha": "Luocha", "March7th": "March 7th", "Natasha": "Natasha", @@ -268,8 +270,8 @@ "SilverWolf": "Silver Wolf", "Sushang": "Sushang", "Tingyun": "Tingyun", - "TrailblazertheDestruction": "Trailblazer: the Destruction", - "TrailblazerthePreservation": "Trailblazer: the Preservation", + "TrailblazerDestruction": "TrailblazerDestruction", + "TrailblazerPreservation": "TrailblazerPreservation", "Welt": "Welt", "Yanqing": "Yanqing", "Yukong": "Yukong" diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index a04d0f0d9..b3e809399 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -202,12 +202,14 @@ "Stagnant_Shadow_Mirage": "凝結虚影・幻光の形", "Stagnant_Shadow_Icicle": "凝結虚影・氷柱の形", "Stagnant_Shadow_Doom": "凝結虚影・震厄の形", + "Stagnant_Shadow_Celestial": "凝結虚影・天人の形", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "侵蝕トンネル・霜風の路", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "侵蝕トンネル・迅拳の路", "Cavern_of_Corrosion_Path_of_Drifting": "侵蝕トンネル・漂泊の路", "Cavern_of_Corrosion_Path_of_Providence": "侵蝕トンネル・睿治の路", "Cavern_of_Corrosion_Path_of_Holy_Hymn": "侵蝕トンネル・聖頌の路", - "Cavern_of_Corrosion_Path_of_Conflagration": "侵蝕トンネル・野焔の路" + "Cavern_of_Corrosion_Path_of_Conflagration": "侵蝕トンネル・野焔の路", + "Cavern_of_Corrosion_Path_of_Elixir_Seekers": "侵蝕トンネル・薬使の路" }, "NameAtDoubleCalyx": { "name": "Dungeon.NameAtDoubleCalyx.name", @@ -248,6 +250,7 @@ "Arlan": "アーラン", "Asta": "アスター", "Bailu": "白露", + "Blade": "刃", "Bronya": "ブローニャ", "Clara": "クラーラ", "DanHeng": "丹恒", @@ -256,7 +259,6 @@ "Himeko": "姫子", "Hook": "フック", "JingYuan": "景元", - "Kafka": "カフカ", "Luocha": "羅刹", "March7th": "三月なのか", "Natasha": "ナターシャ", @@ -268,8 +270,8 @@ "SilverWolf": "銀狼", "Sushang": "素裳", "Tingyun": "停雲", - "TrailblazertheDestruction": "Trailblazer・壊滅", - "TrailblazerthePreservation": "Trailblazer・存護", + "TrailblazerDestruction": "TrailblazerDestruction", + "TrailblazerPreservation": "TrailblazerPreservation", "Welt": "ヴェルト", "Yanqing": "彦卿", "Yukong": "御空" diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index f14bd1321..c636b6183 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -202,12 +202,14 @@ "Stagnant_Shadow_Mirage": "角色晋阶材料：虚数（幻光之形•凝滞虚影）", "Stagnant_Shadow_Icicle": "角色晋阶材料：冰（冰棱之形•凝滞虚影）", "Stagnant_Shadow_Doom": "角色晋阶材料：雷（震厄之形•凝滞虚影）", + "Stagnant_Shadow_Celestial": "角色晋阶材料：风（天人之形•凝滞虚影）", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "遗器：冰套+风套（霜风之径•侵蚀隧洞）", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "遗器：物理套+击破套（迅拳之径•侵蚀隧洞）", "Cavern_of_Corrosion_Path_of_Drifting": "遗器：治疗套+快枪手（漂泊之径•侵蚀隧洞）", "Cavern_of_Corrosion_Path_of_Providence": "遗器：铁卫套+量子套（睿治之径•侵蚀隧洞）", "Cavern_of_Corrosion_Path_of_Holy_Hymn": "遗器：防御套+雷套（圣颂之径•侵蚀隧洞）", - "Cavern_of_Corrosion_Path_of_Conflagration": "遗器：火套+虚数套（野焰之径•侵蚀隧洞）" + "Cavern_of_Corrosion_Path_of_Conflagration": "遗器：火套+虚数套（野焰之径•侵蚀隧洞）", + "Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遗器：生命套+速度套 （药使之径•侵蚀隧洞）" }, "NameAtDoubleCalyx": { "name": "有双倍花活动时，选择副本", @@ -248,6 +250,7 @@ "Arlan": "阿兰", "Asta": "艾丝妲", "Bailu": "白露", + "Blade": "刃", "Bronya": "布洛妮娅", "Clara": "克拉拉", "DanHeng": "丹恒", @@ -256,7 +259,6 @@ "Himeko": "姬子", "Hook": "虎克", "JingYuan": "景元", - "Kafka": "卡芙卡(未实装)", "Luocha": "罗刹", "March7th": "三月七", "Natasha": "娜塔莎", @@ -268,8 +270,8 @@ "SilverWolf": "银狼", "Sushang": "素裳", "Tingyun": "停云", - "TrailblazertheDestruction": "开拓者•毁灭", - "TrailblazerthePreservation": "开拓者•存护", + "TrailblazerDestruction": "开拓者•毁灭", + "TrailblazerPreservation": "开拓者•存护", "Welt": "瓦尔特", "Yanqing": "彦卿", "Yukong": "驭空" diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 9c8ea4bb1..f57426a53 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -202,12 +202,14 @@ "Stagnant_Shadow_Mirage": "角色晉階材料：虛數（幻光之形•凝滯虛影）", "Stagnant_Shadow_Icicle": "角色晉階材料：冰（冰稜之形•凝滯虛影）", "Stagnant_Shadow_Doom": "角色晉階材料：雷（震厄之形•凝滯虛影）", + "Stagnant_Shadow_Celestial": "角色晉階材料：風（天人之形•凝滯虛影）", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "遺器：冰套+風套（霜風之徑•侵蝕隧洞）", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "遺器：物理套+擊破套（迅拳之徑•侵蝕隧洞）", "Cavern_of_Corrosion_Path_of_Drifting": "遺器：治療套+快槍手（漂泊之徑•侵蝕隧洞）", "Cavern_of_Corrosion_Path_of_Providence": "遺器：鐵衛套+量子套（睿治之徑•侵蝕隧洞）", "Cavern_of_Corrosion_Path_of_Holy_Hymn": "遺器：防禦套+雷套（聖頌之徑•侵蝕隧洞）", - "Cavern_of_Corrosion_Path_of_Conflagration": "遺器：火套+虛數套（野焰之徑•侵蝕隧洞）" + "Cavern_of_Corrosion_Path_of_Conflagration": "遺器：火套+虛數套（野焰之徑•侵蝕隧洞）", + "Cavern_of_Corrosion_Path_of_Elixir_Seekers": "遺器：生命套+速度套（藥使之徑•侵蝕隧洞）" }, "NameAtDoubleCalyx": { "name": "有雙倍花活動時，選擇副本", @@ -248,6 +250,7 @@ "Arlan": "阿蘭", "Asta": "艾絲妲", "Bailu": "白露", + "Blade": "刃", "Bronya": "布洛妮婭", "Clara": "克拉拉", "DanHeng": "丹恆", @@ -256,7 +259,6 @@ "Himeko": "姬子", "Hook": "虎克", "JingYuan": "景元", - "Kafka": "卡芙卡", "Luocha": "羅剎", "March7th": "三月七", "Natasha": "娜塔莎", @@ -268,8 +270,8 @@ "SilverWolf": "銀狼", "Sushang": "素裳", "Tingyun": "停雲", - "TrailblazertheDestruction": "Trailblazer•毀滅", - "TrailblazerthePreservation": "Trailblazer•存護", + "TrailblazerDestruction": "TrailblazerDestruction", + "TrailblazerPreservation": "TrailblazerPreservation", "Welt": "瓦爾特", "Yanqing": "彥卿", "Yukong": "馭空"