diff --git a/dev_tools/keyword_extract.py b/dev_tools/keyword_extract.py index 63f50815b..45351ec2b 100644 --- a/dev_tools/keyword_extract.py +++ b/dev_tools/keyword_extract.py @@ -291,10 +291,12 @@ class KeywordExtract: gen.ObjectAttr(key='id', value=index + 1) gen.ObjectAttr(key='name', value=name) for lang in UI_LANGUAGES: - character_names = ' / '.join([ + character_names = [ replace_templates(self.find_keyword(c[0], lang)[1]) for c in characters - ]) + ] + character_names = list(dict.fromkeys(character_names)) + character_names = ' / '.join(character_names) damage_type = self.find_keyword(characters[0][1], lang)[1] if lang in {'en', 'es'}: value = f'{prefix_dict[lang]}{damage_type} ({character_names})' diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 98bd69e02..d20cd1636 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, Acheron, Argenti, Arlan, Asta, Aventurine, Bailu, BlackSwan, Blade, Boothill, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, Firefly, FuXuan, Gallagher, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7thPreservation, March7thTheHunt, Misha, Natasha, Pela, Qingque, Robin, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerHarmony, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong, Yunli + DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Acheron, Argenti, Arlan, Asta, Aventurine, Bailu, BlackSwan, Blade, Boothill, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, Firefly, FuXuan, Gallagher, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, Jade, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7thPreservation, March7thTheHunt, Misha, Natasha, Pela, Qingque, Robin, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerHarmony, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong, Yunli # Group `DungeonStorage` DungeonStorage_TrailblazePower = {} diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 99d054b83..3e65f33b5 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -267,7 +267,7 @@ "Stagnant_Shadow_Blaze": "Ascension: Fire (Himeko / Asta / Hook)", "Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby)", "Stagnant_Shadow_Ire": "Ascension: Fire (Firefly / Gallagher / Jiaoqiu)", - "Stagnant_Shadow_Rime": "Ascension: Ice (March 7th / Herta / Gepard / Pela / March 7th)", + "Stagnant_Shadow_Rime": "Ascension: Ice (March 7th / Herta / Gepard / Pela)", "Stagnant_Shadow_Icicle": "Ascension: Ice (Yanqing / Jingliu / Ruan Mei)", "Stagnant_Shadow_Nectar": "Ascension: Ice (Misha)", "Stagnant_Shadow_Fulmination": "Ascension: Lightning (Arlan / Serval / Tingyun / Bailu)", @@ -510,7 +510,7 @@ "help": "" }, "Item_Horn_of_Snow": { - "name": "Ascension: Ice (March 7th / Herta / Gepard / Pela / March 7th)", + "name": "Ascension: Ice (March 7th / Herta / Gepard / Pela)", "help": "" }, "Item_Lightning_Crown_of_the_Past_Shadow": { diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 51cdb9b25..288420308 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -267,7 +267,7 @@ "Stagnant_Shadow_Blaze": "Ascension: Fuego (Himeko / Asta / Hook)", "Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti)", "Stagnant_Shadow_Ire": "Ascension: Fuego (Luciérnaga / Gallagher / Jiaoqiu)", - "Stagnant_Shadow_Rime": "Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela / Siete de Marzo)", + "Stagnant_Shadow_Rime": "Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela)", "Stagnant_Shadow_Icicle": "Ascension: Hielo (Yanqing / Jingliu / Ruan Mei)", "Stagnant_Shadow_Nectar": "Ascension: Hielo (Misha)", "Stagnant_Shadow_Fulmination": "Ascension: Rayo (Arlan / Serval / Tingyun / Bailu)", @@ -510,7 +510,7 @@ "help": "" }, "Item_Horn_of_Snow": { - "name": "Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela / Siete de Marzo)", + "name": "Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela)", "help": "" }, "Item_Lightning_Crown_of_the_Past_Shadow": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 5955b3ac6..5608de57a 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -267,7 +267,7 @@ "Stagnant_Shadow_Blaze": "キャラクター昇格素材：炎（姫子 / アスター / フック）", "Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）", "Stagnant_Shadow_Ire": "キャラクター昇格素材：炎（ホタル / ギャラガー / 椒丘）", - "Stagnant_Shadow_Rime": "キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ / 三月なのか）", + "Stagnant_Shadow_Rime": "キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ）", "Stagnant_Shadow_Icicle": "キャラクター昇格素材：氷（彦卿 / 鏡流 / ルアン・メェイ）", "Stagnant_Shadow_Nectar": "キャラクター昇格素材：氷（ミーシャ）", "Stagnant_Shadow_Fulmination": "キャラクター昇格素材：雷（アーラン / セーバル / 停雲 / 白露）", @@ -510,7 +510,7 @@ "help": "" }, "Item_Horn_of_Snow": { - "name": "キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ / 三月なのか）", + "name": "キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ）", "help": "" }, "Item_Lightning_Crown_of_the_Past_Shadow": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index b2334041f..c3a497b1e 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -267,7 +267,7 @@ "Stagnant_Shadow_Blaze": "角色晋阶材料：火（姬子 / 艾丝妲 / 虎克）", "Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账）", "Stagnant_Shadow_Ire": "角色晋阶材料：火（流萤 / 加拉赫 / 椒丘）", - "Stagnant_Shadow_Rime": "角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉 / 三月七）", + "Stagnant_Shadow_Rime": "角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉）", "Stagnant_Shadow_Icicle": "角色晋阶材料：冰（彦卿 / 镜流 / 阮•梅）", "Stagnant_Shadow_Nectar": "角色晋阶材料：冰（米沙）", "Stagnant_Shadow_Fulmination": "角色晋阶材料：雷（阿兰 / 希露瓦 / 停云 / 白露）", @@ -510,7 +510,7 @@ "help": "" }, "Item_Horn_of_Snow": { - "name": "角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉 / 三月七）", + "name": "角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉）", "help": "" }, "Item_Lightning_Crown_of_the_Past_Shadow": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 7ead571dc..1addf4201 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -267,7 +267,7 @@ "Stagnant_Shadow_Blaze": "角色晉階材料：火（姬子 / 艾絲妲 / 虎克）", "Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）", "Stagnant_Shadow_Ire": "角色晉階材料：火（流螢 / 加拉赫 / 椒丘）", - "Stagnant_Shadow_Rime": "角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉 / 三月七）", + "Stagnant_Shadow_Rime": "角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉）", "Stagnant_Shadow_Icicle": "角色晉階材料：冰（彥卿 / 鏡流 / 阮•梅）", "Stagnant_Shadow_Nectar": "角色晉階材料：冰（米沙）", "Stagnant_Shadow_Fulmination": "角色晉階材料：雷（阿蘭 / 希露瓦 / 停雲 / 白露）", @@ -510,7 +510,7 @@ "help": "" }, "Item_Horn_of_Snow": { - "name": "角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉 / 三月七）", + "name": "角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉）", "help": "" }, "Item_Lightning_Crown_of_the_Past_Shadow": { diff --git a/tasks/dungeon/keywords/dungeon_detailed.py b/tasks/dungeon/keywords/dungeon_detailed.py index dc1c00125..ccff5bab3 100644 --- a/tasks/dungeon/keywords/dungeon_detailed.py +++ b/tasks/dungeon/keywords/dungeon_detailed.py @@ -51,11 +51,11 @@ Stagnant_Shadow_Spike = DungeonDetailed( Stagnant_Shadow_Rime = DungeonDetailed( id=6, name='Stagnant_Shadow_Rime', - cn='角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉 / 三月七）', - cht='角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉 / 三月七）', - en='Ascension: Ice (March 7th / Herta / Gepard / Pela / March 7th)', - jp='キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ / 三月なのか）', - es='Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela / Siete de Marzo)', + cn='角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉）', + cht='角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉）', + en='Ascension: Ice (March 7th / Herta / Gepard / Pela)', + jp='キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ）', + es='Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela)', ) Stagnant_Shadow_Mirage = DungeonDetailed( id=7,