diff --git a/dev_tools/keyword_extract.py b/dev_tools/keyword_extract.py index c46e5a336..5eeea835b 100644 --- a/dev_tools/keyword_extract.py +++ b/dev_tools/keyword_extract.py @@ -22,7 +22,7 @@ def text_to_variable(text): def dungeon_name(name: str) -> str: name = text_to_variable(name) name = re.sub('Bud_of_(Memories|Aether|Treasures)', r'Calyx_Golden_\1', name) - name = re.sub('Bud_of_(.*)', r'Calyx_Crimson_\1', name) + name = re.sub('Bud_of_(.*)', r'Calyx_Crimson_\1', name).replace('Calyx_Crimson_Calyx_Crimson_', 'Calyx_Crimson_') name = re.sub('Shape_of_(.*)', r'Stagnant_Shadow_\1', name) if name in ['Destructions_Beginning', 'End_of_the_Eternal_Freeze']: name = 'Echo_of_War_' + name diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 6f4f95fc0..d380ea37d 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -177,7 +177,7 @@ "Calyx_Golden_Treasures", "Calyx_Crimson_Destruction", "Calyx_Crimson_Preservation", - "Calyx_Crimson_Calyx_Crimson_Hunt", + "Calyx_Crimson_Hunt", "Calyx_Crimson_Abundance", "Calyx_Crimson_Erudition", "Calyx_Crimson_Harmony", diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 8a6b3d014..277f13657 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -39,7 +39,7 @@ class GeneratedConfig: Optimization_WhenTaskQueueEmpty = 'goto_main' # stay_there, goto_main, close_game # Group `Dungeon` - Dungeon_Name = 'Calyx_Golden_Memories' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_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_Memories' # 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_Team = 1 # 1, 2, 3, 4, 5, 6 # Group `Assignment` diff --git a/module/config/config_updater.py b/module/config/config_updater.py index a863d94a9..c88e4483d 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -275,13 +275,14 @@ class ConfigGenerator: # deep_set(new, keys=path, value=f'[{prefix}] {_list[index]}') # Dungeon names - ingame_lang = gui_lang_to_ingame_lang(lang) - from tasks.dungeon.keywords import DungeonList - dailies = deep_get(self.argument, keys='Dungeon.Name.option') - for dungeon in DungeonList.instances.values(): - if dungeon.name in dailies: - value = dungeon.__getattribute__(ingame_lang) - deep_set(new, keys=['Dungeon', 'Name', dungeon.name], value=value) + if lang not in ['zh-CN', 'zh-TW', 'en-US']: + ingame_lang = gui_lang_to_ingame_lang(lang) + from tasks.dungeon.keywords import DungeonList + dailies = deep_get(self.argument, keys='Dungeon.Name.option') + for dungeon in DungeonList.instances.values(): + if dungeon.name in dailies: + value = dungeon.__getattribute__(ingame_lang) + deep_set(new, keys=['Dungeon', 'Name', dungeon.name], value=value) # GUI i18n for path, _ in deep_iter(self.gui, depth=2): diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index fdf7934b5..6fc859a57 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -183,31 +183,31 @@ "Name": { "name": "Dungeon Name", "help": "", - "Calyx_Golden_Memories": "Bud of Memories", - "Calyx_Golden_Aether": "Bud of Aether", - "Calyx_Golden_Treasures": "Bud of Treasures", - "Calyx_Crimson_Destruction": "Bud of Destruction", - "Calyx_Crimson_Preservation": "Bud of Preservation", - "Calyx_Crimson_Calyx_Crimson_Hunt": "Calyx (Crimson): Bud of Hunt", - "Calyx_Crimson_Abundance": "Bud of Abundance", - "Calyx_Crimson_Erudition": "Bud of Erudition", - "Calyx_Crimson_Harmony": "Bud of Harmony", - "Calyx_Crimson_Nihility": "Bud of Nihility", - "Stagnant_Shadow_Quanta": "Shape of Quanta", - "Stagnant_Shadow_Gust": "Shape of Gust", - "Stagnant_Shadow_Fulmination": "Shape of Fulmination", - "Stagnant_Shadow_Blaze": "Shape of Blaze", - "Stagnant_Shadow_Spike": "Shape of Spike", - "Stagnant_Shadow_Rime": "Shape of Rime", - "Stagnant_Shadow_Mirage": "Shape of Mirage", - "Stagnant_Shadow_Icicle": "Shape of Icicle", - "Stagnant_Shadow_Doom": "Shape of Doom", - "Cavern_of_Corrosion_Path_of_Gelid_Wind": "Cavern of Corrosion: Path of Gelid Wind", - "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "Cavern of Corrosion: Path of Jabbing Punch", - "Cavern_of_Corrosion_Path_of_Drifting": "Cavern of Corrosion: Path of Drifting", - "Cavern_of_Corrosion_Path_of_Providence": "Cavern of Corrosion: Path of Providence", - "Cavern_of_Corrosion_Path_of_Holy_Hymn": "Cavern of Corrosion: Path of Holy Hymn", - "Cavern_of_Corrosion_Path_of_Conflagration": "Cavern of Corrosion: Path of Conflagration" + "Calyx_Golden_Memories": "Material: Character EXP (Bud of Memories)", + "Calyx_Golden_Aether": "Material: Light Cone EXP (Bud of Aether)", + "Calyx_Golden_Treasures": "Material: Credit (Bud of Treasures)", + "Calyx_Crimson_Destruction": "Trace: Destruction (Bud of Destruction)", + "Calyx_Crimson_Preservation": "Trace: Preservation (Bud of Preservation)", + "Calyx_Crimson_Hunt": "Trace: Hunt (Bud of Hunt)", + "Calyx_Crimson_Abundance": "Trace: Abundance (Bud of Abundance)", + "Calyx_Crimson_Erudition": "Trace: Erudition (Bud of Erudition)", + "Calyx_Crimson_Harmony": "Trace: Harmony (Bud of Harmony)", + "Calyx_Crimson_Nihility": "Trace: Nihility (Bud of Nihility)", + "Stagnant_Shadow_Quanta": "Ascension: Quantum (Shape of Quanta)", + "Stagnant_Shadow_Gust": "Ascension: Wind (Shape of Gust)", + "Stagnant_Shadow_Fulmination": "Ascension: Lighting (Shape of Fulmination)", + "Stagnant_Shadow_Blaze": "Ascension: Fire (Shape of Blaze)", + "Stagnant_Shadow_Spike": "Ascension: Physical (Shape of Spike)", + "Stagnant_Shadow_Rime": "Ascension: Ice (Shape of Rime)", + "Stagnant_Shadow_Mirage": "Ascension: Imaginary (Shape of Mirage)", + "Stagnant_Shadow_Icicle": "Ascension: Ice (Shape of Icicle)", + "Stagnant_Shadow_Doom": "Ascension: Lighting (Shape of Doom)", + "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)" }, "Team": { "name": "Dungeon Team", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 7abd6f0b7..bb5d5ed72 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -188,7 +188,7 @@ "Calyx_Golden_Treasures": "疑似花萼（金）・秘蔵の蕾", "Calyx_Crimson_Destruction": "疑似花萼（赤）・壊滅の蕾", "Calyx_Crimson_Preservation": "疑似花萼（赤）・存護の蕾", - "Calyx_Crimson_Calyx_Crimson_Hunt": "疑似花萼（赤）・巡狩の蕾", + "Calyx_Crimson_Hunt": "疑似花萼（赤）・巡狩の蕾", "Calyx_Crimson_Abundance": "疑似花萼（赤）・豊穣の蕾", "Calyx_Crimson_Erudition": "疑似花萼（赤）・知恵の蕾", "Calyx_Crimson_Harmony": "疑似花萼（赤）・調和の蕾", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 4801577da..2ef76f34d 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -183,31 +183,31 @@ "Name": { "name": "副本名称", "help": "", - "Calyx_Golden_Memories": "回忆之蕾•拟造花萼（金）", - "Calyx_Golden_Aether": "以太之蕾•拟造花萼（金）", - "Calyx_Golden_Treasures": "藏珍之蕾•拟造花萼（金）", - "Calyx_Crimson_Destruction": "毁灭之蕾•拟造花萼（赤）", - "Calyx_Crimson_Preservation": "存护之蕾•拟造花萼（赤）", - "Calyx_Crimson_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": "野焰之径•侵蚀隧洞" + "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": "遗器：火套+虚数套（野焰之径•侵蚀隧洞）" }, "Team": { "name": "打本队伍", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index da98b1d65..bdebb5e1d 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -183,31 +183,31 @@ "Name": { "name": "副本名稱", "help": "", - "Calyx_Golden_Memories": "回憶之蕾•擬造花萼（金）", - "Calyx_Golden_Aether": "乙太之蕾•擬造花萼（金）", - "Calyx_Golden_Treasures": "藏珍之蕾•擬造花萼（金）", - "Calyx_Crimson_Destruction": "毀滅之蕾•擬造花萼（赤）", - "Calyx_Crimson_Preservation": "存護之蕾•擬造花萼（赤）", - "Calyx_Crimson_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": "野焰之徑•侵蝕隧洞" + "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": "遺器：火套+虛數套（野焰之徑•侵蝕隧洞）" }, "Team": { "name": "打本隊伍", diff --git a/tasks/dungeon/keywords/dungeon.py b/tasks/dungeon/keywords/dungeon.py index d202ab5f8..bc8303ef2 100644 --- a/tasks/dungeon/keywords/dungeon.py +++ b/tasks/dungeon/keywords/dungeon.py @@ -43,9 +43,9 @@ Calyx_Crimson_Preservation = DungeonList( en='Bud of Preservation', jp='疑似花萼（赤）・存護の蕾', ) -Calyx_Crimson_Calyx_Crimson_Hunt = DungeonList( +Calyx_Crimson_Hunt = DungeonList( id=6, - name='Calyx_Crimson_Calyx_Crimson_Hunt', + name='Calyx_Crimson_Hunt', cn='巡猎之蕾•拟造花萼（赤）', cht='巡獵之蕾•擬造花萼（赤）', en='Calyx (Crimson): Bud of Hunt',