diff --git a/module/config/config_updater.py b/module/config/config_updater.py index c820c2694..94645981b 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -370,11 +370,11 @@ class ConfigGenerator: dailies = deep_get(self.argument, keys='Dungeon.Name.option') # Dungeon names i18n_memories = { - 'cn': '材料：角色经验（{dungeon}）', - 'cht': '材料：角色經驗（{dungeon}）', - 'jp': '素材：役割経験（{dungeon}）：', - 'en': 'Material: Character EXP ({dungeon})', - 'es': 'Material: EXP de personaje ({dungeon})', + 'cn': '材料：角色经验（{dungeon} {world}）', + 'cht': '材料：角色經驗（{dungeon} {world}）', + 'jp': '素材：役割経験（{dungeon} {world}）：', + 'en': 'Material: Character EXP ({dungeon}, {world})', + 'es': 'Material: EXP de personaje ({dungeon}, {world})', } i18n_aether = { 'cn': '材料：武器经验（{dungeon}）', @@ -409,15 +409,19 @@ class ConfigGenerator: dungeon: DungeonList = dungeon dungeon_name = dungeon.__getattribute__(ingame_lang) dungeon_name = re.sub('[「」]', '', dungeon_name) + if dungeon.world: + world_name = re.sub('[「」]', '', dungeon.world.__getattribute__(ingame_lang)) + else: + world_name = '' if dungeon.is_Calyx_Golden_Memories: deep_set(new, keys=['Dungeon', 'Name', dungeon.name], - value=i18n_memories[ingame_lang].format(dungeon=dungeon_name)) + value=i18n_memories[ingame_lang].format(dungeon=dungeon_name, world=world_name)) if dungeon.is_Calyx_Golden_Aether: deep_set(new, keys=['Dungeon', 'Name', dungeon.name], - value=i18n_aether[ingame_lang].format(dungeon=dungeon_name)) + value=i18n_aether[ingame_lang].format(dungeon=dungeon_name, world=world_name)) if dungeon.is_Calyx_Golden_Treasures: deep_set(new, keys=['Dungeon', 'Name', dungeon.name], - value=i18n_treasure[ingame_lang].format(dungeon=dungeon_name)) + value=i18n_treasure[ingame_lang].format(dungeon=dungeon_name, world=world_name)) if dungeon.is_Calyx_Crimson: plane = dungeon.plane.__getattribute__(ingame_lang) plane = re.sub('[「」]', '', plane) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index fb8db3081..458559256 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -238,9 +238,9 @@ "Name": { "name": "Dungeon Name", "help": "Default dungeon setting", - "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories)", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories)", - "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories)", + "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories, Penacony)", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories, The Xianzhou Luofu)", + "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories, Jarilo-VI)", "Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether)", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether)", "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether)", @@ -295,9 +295,9 @@ "NameAtDoubleCalyx": { "name": "At Double Calyx Event, choose dungeon", "help": "Return to the default dungeon settings after double times exhausted", - "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories)", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories)", - "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories)", + "Calyx_Golden_Memories_Penacony": "Material: Character EXP (Bud of Memories, Penacony)", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: Character EXP (Bud of Memories, The Xianzhou Luofu)", + "Calyx_Golden_Memories_Jarilo_VI": "Material: Character EXP (Bud of Memories, Jarilo-VI)", "Calyx_Golden_Aether_Penacony": "Material: Light Cone EXP (Bud of Aether)", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: Light Cone EXP (Bud of Aether)", "Calyx_Golden_Aether_Jarilo_VI": "Material: Light Cone EXP (Bud of Aether)", diff --git a/module/config/i18n/es-ES.json b/module/config/i18n/es-ES.json index 2cb3a6a95..3d0189934 100644 --- a/module/config/i18n/es-ES.json +++ b/module/config/i18n/es-ES.json @@ -238,9 +238,9 @@ "Name": { "name": "Nombre de la Mazmorra", "help": "Ajustes predeterminados de las mazmorras", - "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos)", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos)", - "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos)", + "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos, Colonipenal)", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos, El Luofu de Xianzhou)", + "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos, Jarilo-VI)", "Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter)", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter)", "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter)", @@ -295,9 +295,9 @@ "NameAtDoubleCalyx": { "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", - "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos)", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos)", - "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos)", + "Calyx_Golden_Memories_Penacony": "Material: EXP de personaje (Flor de los recuerdos, Colonipenal)", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "Material: EXP de personaje (Flor de los recuerdos, El Luofu de Xianzhou)", + "Calyx_Golden_Memories_Jarilo_VI": "Material: EXP de personaje (Flor de los recuerdos, Jarilo-VI)", "Calyx_Golden_Aether_Penacony": "Material: EXP de conos de luz (Flor de éter)", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "Material: EXP de conos de luz (Flor de éter)", "Calyx_Golden_Aether_Jarilo_VI": "Material: EXP de conos de luz (Flor de éter)", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index b0157c1e7..8992aedcf 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -238,9 +238,9 @@ "Name": { "name": "Dungeon.Name.name", "help": "Dungeon.Name.help", - "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾）：", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾）：", - "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾）：", + "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾 ピノコニー）：", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾 仙舟羅浮）：", + "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾 ヤリーロ-VI）：", "Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾）", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾）", "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾）", @@ -295,9 +295,9 @@ "NameAtDoubleCalyx": { "name": "Dungeon.NameAtDoubleCalyx.name", "help": "Dungeon.NameAtDoubleCalyx.help", - "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾）：", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾）：", - "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾）：", + "Calyx_Golden_Memories_Penacony": "素材：役割経験（回憶の蕾 ピノコニー）：", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "素材：役割経験（回憶の蕾 仙舟羅浮）：", + "Calyx_Golden_Memories_Jarilo_VI": "素材：役割経験（回憶の蕾 ヤリーロ-VI）：", "Calyx_Golden_Aether_Penacony": "素材：武器経験（エーテルの蕾）", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "素材：武器経験（エーテルの蕾）", "Calyx_Golden_Aether_Jarilo_VI": "素材：武器経験（エーテルの蕾）", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 08e4e4d45..c10684f8a 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -238,9 +238,9 @@ "Name": { "name": "副本名称", "help": "默认打本设置", - "Calyx_Golden_Memories_Penacony": "材料：角色经验（回忆之蕾）", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色经验（回忆之蕾）", - "Calyx_Golden_Memories_Jarilo_VI": "材料：角色经验（回忆之蕾）", + "Calyx_Golden_Memories_Penacony": "材料：角色经验（回忆之蕾 匹诺康尼）", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色经验（回忆之蕾 仙舟罗浮）", + "Calyx_Golden_Memories_Jarilo_VI": "材料：角色经验（回忆之蕾 雅利洛-Ⅵ）", "Calyx_Golden_Aether_Penacony": "材料：武器经验（以太之蕾）", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "材料：武器经验（以太之蕾）", "Calyx_Golden_Aether_Jarilo_VI": "材料：武器经验（以太之蕾）", @@ -295,9 +295,9 @@ "NameAtDoubleCalyx": { "name": "有双倍花活动时，选择副本", "help": "次数耗尽后回退到默认打本设置", - "Calyx_Golden_Memories_Penacony": "材料：角色经验（回忆之蕾）", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色经验（回忆之蕾）", - "Calyx_Golden_Memories_Jarilo_VI": "材料：角色经验（回忆之蕾）", + "Calyx_Golden_Memories_Penacony": "材料：角色经验（回忆之蕾 匹诺康尼）", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色经验（回忆之蕾 仙舟罗浮）", + "Calyx_Golden_Memories_Jarilo_VI": "材料：角色经验（回忆之蕾 雅利洛-Ⅵ）", "Calyx_Golden_Aether_Penacony": "材料：武器经验（以太之蕾）", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "材料：武器经验（以太之蕾）", "Calyx_Golden_Aether_Jarilo_VI": "材料：武器经验（以太之蕾）", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index b935a3f62..54526740a 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -238,9 +238,9 @@ "Name": { "name": "副本名稱", "help": "默認打本設定", - "Calyx_Golden_Memories_Penacony": "材料：角色經驗（回憶之蕾）", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色經驗（回憶之蕾）", - "Calyx_Golden_Memories_Jarilo_VI": "材料：角色經驗（回憶之蕾）", + "Calyx_Golden_Memories_Penacony": "材料：角色經驗（回憶之蕾 匹諾康尼）", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色經驗（回憶之蕾 仙舟羅浮）", + "Calyx_Golden_Memories_Jarilo_VI": "材料：角色經驗（回憶之蕾 雅利洛-Ⅵ）", "Calyx_Golden_Aether_Penacony": "材料：武器經驗（乙太之蕾）", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "材料：武器經驗（乙太之蕾）", "Calyx_Golden_Aether_Jarilo_VI": "材料：武器經驗（乙太之蕾）", @@ -295,9 +295,9 @@ "NameAtDoubleCalyx": { "name": "有雙倍花活動時，選擇副本", "help": "次數耗儘後回退到默認打本設定", - "Calyx_Golden_Memories_Penacony": "材料：角色經驗（回憶之蕾）", - "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色經驗（回憶之蕾）", - "Calyx_Golden_Memories_Jarilo_VI": "材料：角色經驗（回憶之蕾）", + "Calyx_Golden_Memories_Penacony": "材料：角色經驗（回憶之蕾 匹諾康尼）", + "Calyx_Golden_Memories_The_Xianzhou_Luofu": "材料：角色經驗（回憶之蕾 仙舟羅浮）", + "Calyx_Golden_Memories_Jarilo_VI": "材料：角色經驗（回憶之蕾 雅利洛-Ⅵ）", "Calyx_Golden_Aether_Penacony": "材料：武器經驗（乙太之蕾）", "Calyx_Golden_Aether_The_Xianzhou_Luofu": "材料：武器經驗（乙太之蕾）", "Calyx_Golden_Aether_Jarilo_VI": "材料：武器經驗（乙太之蕾）",