xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-09-28 06:45:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upd: Add new dungeon and weekly in gui by config updater (#447)

Browse Source 
* Fix: Food_Improvement_Plan does not exist anymore

* Upd: Add new dungeon and weekly in gui by config updater

* Fix: OCR of TM in dungeon

* Fix: remove TM in keywords

* Fix: remove TM in GUI

* Fix: Remove redundant i18n in en-US

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
This commit is contained in:
Yinhr 2024-05-09 17:40:41 +08:00 committed by GitHub
parent 880bb2a911
commit 4e05aa37a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev_tools/keywords/map_plane.py
View File

@ -68,3 +68,7 @@ class GenerateMapPlane(GenerateKeyword):
return f'Special_{text}'
else:
return f'{world.short_name}_{text}'
def convert_keyword(self, text: str, lang: str) -> str:
text = text.replace('™', '')
return super().convert_keyword(text, lang=lang)

8
module/config/argument/args.json
View File

@ -238,6 +238,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden",
"Calyx_Crimson_Erudition_Jarilo_RivetTown",
@ -247,6 +248,7 @@
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission",
"Stagnant_Shadow_Spike",
"Stagnant_Shadow_Perdition",
"Stagnant_Shadow_Duty",
"Stagnant_Shadow_Blaze",
"Stagnant_Shadow_Scorch",
"Stagnant_Shadow_Ire",
@ -291,6 +293,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden",
"Calyx_Crimson_Erudition_Jarilo_RivetTown",
@ -358,6 +361,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden",
"Calyx_Crimson_Erudition_Jarilo_RivetTown",
@ -374,6 +378,7 @@
"do_not_achieve",
"Stagnant_Shadow_Spike",
"Stagnant_Shadow_Perdition",
"Stagnant_Shadow_Duty",
"Stagnant_Shadow_Blaze",
"Stagnant_Shadow_Scorch",
"Stagnant_Shadow_Ire",
@ -1306,7 +1311,8 @@
"Echo_of_War_Destruction_Beginning",
"Echo_of_War_End_of_the_Eternal_Freeze",
"Echo_of_War_Divine_Seed",
"Echo_of_War_Borehole_Planet_Old_Crater"
"Echo_of_War_Borehole_Planet_Old_Crater",
"Echo_of_War_Salutations_of_Ashen_Dreams"
]
},
"Team": {

10
module/config/config_generated.py
View File

@ -46,15 +46,15 @@ class GeneratedConfig:
CloudStorage_CloudRemainFree = {}
# Group `Dungeon`
Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories_Jarilo_VI, Calyx_Golden_Memories_The_Xianzhou_Luofu, Calyx_Golden_Memories_Penacony, Calyx_Golden_Aether_Jarilo_VI, Calyx_Golden_Aether_The_Xianzhou_Luofu, Calyx_Golden_Aether_Penacony, Calyx_Golden_Treasures_Jarilo_VI, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Penacony, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission, Stagnant_Shadow_Spike, Stagnant_Shadow_Perdition, Stagnant_Shadow_Blaze, Stagnant_Shadow_Scorch, Stagnant_Shadow_Ire, Stagnant_Shadow_Rime, Stagnant_Shadow_Icicle, Stagnant_Shadow_Nectar, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Doom, Stagnant_Shadow_Gust, Stagnant_Shadow_Celestial, Stagnant_Shadow_Quanta, Stagnant_Shadow_Abomination, Stagnant_Shadow_Roast, Stagnant_Shadow_Mirage, Stagnant_Shadow_Puppetry, 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, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Dreamdive
Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories_Jarilo_VI, Calyx_Golden_Memories_The_Xianzhou_Luofu, Calyx_Golden_Memories_Penacony, Calyx_Golden_Aether_Jarilo_VI, Calyx_Golden_Aether_The_Xianzhou_Luofu, Calyx_Golden_Aether_Penacony, Calyx_Golden_Treasures_Jarilo_VI, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Penacony, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission
Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories_Jarilo_VI, Calyx_Golden_Memories_The_Xianzhou_Luofu, Calyx_Golden_Memories_Penacony, Calyx_Golden_Aether_Jarilo_VI, Calyx_Golden_Aether_The_Xianzhou_Luofu, Calyx_Golden_Aether_Penacony, Calyx_Golden_Treasures_Jarilo_VI, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Penacony, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission, Stagnant_Shadow_Spike, Stagnant_Shadow_Perdition, Stagnant_Shadow_Duty, Stagnant_Shadow_Blaze, Stagnant_Shadow_Scorch, Stagnant_Shadow_Ire, Stagnant_Shadow_Rime, Stagnant_Shadow_Icicle, Stagnant_Shadow_Nectar, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Doom, Stagnant_Shadow_Gust, Stagnant_Shadow_Celestial, Stagnant_Shadow_Quanta, Stagnant_Shadow_Abomination, Stagnant_Shadow_Roast, Stagnant_Shadow_Mirage, Stagnant_Shadow_Puppetry, 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, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Dreamdive
Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories_Jarilo_VI, Calyx_Golden_Memories_The_Xianzhou_Luofu, Calyx_Golden_Memories_Penacony, Calyx_Golden_Aether_Jarilo_VI, Calyx_Golden_Aether_The_Xianzhou_Luofu, Calyx_Golden_Aether_Penacony, Calyx_Golden_Treasures_Jarilo_VI, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Penacony, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission
Dungeon_NameAtDoubleRelic = 'Cavern_of_Corrosion_Path_of_Providence' # 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, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Dreamdive
Dungeon_Team = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
# Group `DungeonDaily`
DungeonDaily_CalyxGolden = 'Calyx_Golden_Treasures_Jarilo_VI' # do_not_achieve, Calyx_Golden_Memories_Jarilo_VI, Calyx_Golden_Memories_The_Xianzhou_Luofu, Calyx_Golden_Memories_Penacony, Calyx_Golden_Aether_Jarilo_VI, Calyx_Golden_Aether_The_Xianzhou_Luofu, Calyx_Golden_Aether_Penacony, Calyx_Golden_Treasures_Jarilo_VI, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Penacony
DungeonDaily_CalyxCrimson = 'Calyx_Crimson_Destruction_Herta_StorageZone' # do_not_achieve, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission
DungeonDaily_StagnantShadow = 'Stagnant_Shadow_Quanta' # do_not_achieve, Stagnant_Shadow_Spike, Stagnant_Shadow_Perdition, Stagnant_Shadow_Blaze, Stagnant_Shadow_Scorch, Stagnant_Shadow_Ire, Stagnant_Shadow_Rime, Stagnant_Shadow_Icicle, Stagnant_Shadow_Nectar, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Doom, Stagnant_Shadow_Gust, Stagnant_Shadow_Celestial, Stagnant_Shadow_Quanta, Stagnant_Shadow_Abomination, Stagnant_Shadow_Roast, Stagnant_Shadow_Mirage, Stagnant_Shadow_Puppetry
DungeonDaily_CalyxCrimson = 'Calyx_Crimson_Destruction_Herta_StorageZone' # do_not_achieve, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Calyx_Crimson_Abundance_Luofu_FyxestrollGarden, Calyx_Crimson_Erudition_Jarilo_RivetTown, Calyx_Crimson_Harmony_Jarilo_RobotSettlement, Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape, Calyx_Crimson_Nihility_Jarilo_GreatMine, Calyx_Crimson_Nihility_Luofu_AlchemyCommission
DungeonDaily_StagnantShadow = 'Stagnant_Shadow_Quanta' # do_not_achieve, Stagnant_Shadow_Spike, Stagnant_Shadow_Perdition, Stagnant_Shadow_Duty, Stagnant_Shadow_Blaze, Stagnant_Shadow_Scorch, Stagnant_Shadow_Ire, Stagnant_Shadow_Rime, Stagnant_Shadow_Icicle, Stagnant_Shadow_Nectar, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Doom, Stagnant_Shadow_Gust, Stagnant_Shadow_Celestial, Stagnant_Shadow_Quanta, Stagnant_Shadow_Abomination, Stagnant_Shadow_Roast, Stagnant_Shadow_Mirage, Stagnant_Shadow_Puppetry
DungeonDaily_CavernOfCorrosion = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_achieve, 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, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Dreamdive
# Group `DungeonSupport`
@ -72,7 +72,7 @@ class GeneratedConfig:
SupportReward_Collect = True
# Group `Weekly`
Weekly_Name = 'Echo_of_War_Divine_Seed' # Echo_of_War_Destruction_Beginning, Echo_of_War_End_of_the_Eternal_Freeze, Echo_of_War_Divine_Seed, Echo_of_War_Borehole_Planet_Old_Crater
Weekly_Name = 'Echo_of_War_Divine_Seed' # Echo_of_War_Destruction_Beginning, Echo_of_War_End_of_the_Eternal_Freeze, Echo_of_War_Divine_Seed, Echo_of_War_Borehole_Planet_Old_Crater, Echo_of_War_Salutations_of_Ashen_Dreams
Weekly_Team = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9
# Group `AchievableQuest`

4
module/config/config_updater.py
View File

@ -430,7 +430,7 @@ class ConfigGenerator:
value=i18n_crimson[ingame_lang].format(path=path, plane=plane))
if dungeon.is_Cavern_of_Corrosion:
value = deep_get(new, keys=['Dungeon', 'Name', dungeon.name], default='')
suffix = i18n_relic[ingame_lang].format(dungeon=dungeon_name)
suffix = i18n_relic[ingame_lang].format(dungeon=dungeon_name).replace('Cavern of Corrosion: ', '')
if not value.endswith(suffix):
deep_set(new, keys=['Dungeon', 'Name', dungeon.name], value=f'{value}{suffix}')
@ -489,7 +489,7 @@ class ConfigGenerator:
for dungeon in dungeons:
world = dungeon.plane.world
world_name = world.__getattribute__(ingame_lang)
dungeon_name = dungeon.__getattribute__(ingame_lang)
dungeon_name = dungeon.__getattribute__(ingame_lang).replace('Echo of War: ', '')
value = f'{dungeon_name} ({world_name})'
deep_set(new, keys=['Weekly', 'Name', dungeon.name], value=value)
# Rogue worlds

8
module/config/i18n/en-US.json
View File

@ -262,6 +262,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "Trace: Preservation (Clock Studios Theme Park)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Trace: The Hunt (Outlying Snow Plains)",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "Trace: The Hunt (SoulGlad Scorchsand Audition Venue)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Trace: Abundance (Fyxestroll Garden)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
@ -271,6 +272,7 @@
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)",
"Stagnant_Shadow_Spike": "Ascension: Physical (Natasha / Clara / Luka / Sushang)",
"Stagnant_Shadow_Perdition": "Ascension: Physical (Hanya / Argenti)",
"Stagnant_Shadow_Duty": "Ascension: Physical (Boothill / Robin)",
"Stagnant_Shadow_Blaze": "Ascension: Fire (Himeko / Asta / Hook)",
"Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby)",
"Stagnant_Shadow_Ire": "Ascension: Fire (Gallagher)",
@ -313,6 +315,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "Trace: Preservation (Clock Studios Theme Park)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Trace: The Hunt (Outlying Snow Plains)",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "Trace: The Hunt (SoulGlad Scorchsand Audition Venue)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Trace: Abundance (Fyxestroll Garden)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
@ -376,6 +379,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "Trace: Preservation (Clock Studios Theme Park)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Trace: The Hunt (Outlying Snow Plains)",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "Trace: The Hunt (SoulGlad Scorchsand Audition Venue)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Trace: Abundance (Fyxestroll Garden)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
@ -390,6 +394,7 @@
"do_not_achieve": "Don't Do This Quest",
"Stagnant_Shadow_Spike": "Ascension: Physical (Natasha / Clara / Luka / Sushang)",
"Stagnant_Shadow_Perdition": "Ascension: Physical (Hanya / Argenti)",
"Stagnant_Shadow_Duty": "Ascension: Physical (Boothill / Robin)",
"Stagnant_Shadow_Blaze": "Ascension: Fire (Himeko / Asta / Hook)",
"Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby)",
"Stagnant_Shadow_Ire": "Ascension: Fire (Gallagher)",
@ -535,7 +540,8 @@
"Echo_of_War_Destruction_Beginning": "Destruction's Beginning (Herta Space Station)",
"Echo_of_War_End_of_the_Eternal_Freeze": "End of the Eternal Freeze (Jarilo-VI)",
"Echo_of_War_Divine_Seed": "Divine Seed (The Xianzhou Luofu)",
"Echo_of_War_Borehole_Planet_Old_Crater": "Borehole Planet's Old Crater (Herta Space Station)"
"Echo_of_War_Borehole_Planet_Old_Crater": "Borehole Planet's Old Crater (Herta Space Station)",
"Echo_of_War_Salutations_of_Ashen_Dreams": "Salutations of Ashen Dreams (Penacony)"
},
"Team": {
"name": "Dungeon Team",

8
module/config/i18n/es-ES.json
View File

@ -262,6 +262,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "Rastros: Conservación (Parque temático de los Estudios Reloj)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Rastros: Cacería (Llanuras nevadas de las afueras)",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "Rastros: Cacería (Recinto de las Audiciones FelizAlma en la Arena Ardiente)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Rastros: Abundancia (Jardín del Sosiego)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Rastros: Erudición (Villarremache)",
@ -271,6 +272,7 @@
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Rastros: Nihilidad (Comisión de Alquimia)",
"Stagnant_Shadow_Spike": "Ascension: Físico (Natasha / Clara / Luka / Sushang)",
"Stagnant_Shadow_Perdition": "Ascension: Físico (Hanya / Argenti)",
"Stagnant_Shadow_Duty": "Ascension: Físico (Boothill / Robin)",
"Stagnant_Shadow_Blaze": "Ascension: Fuego (Himeko / Asta / Hook)",
"Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti)",
"Stagnant_Shadow_Ire": "Ascension: Fuego (Gallagher)",
@ -313,6 +315,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "Rastros: Conservación (Parque temático de los Estudios Reloj)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Rastros: Cacería (Llanuras nevadas de las afueras)",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "Rastros: Cacería (Recinto de las Audiciones FelizAlma en la Arena Ardiente)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Rastros: Abundancia (Jardín del Sosiego)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Rastros: Erudición (Villarremache)",
@ -376,6 +379,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "Rastros: Conservación (Parque temático de los Estudios Reloj)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Rastros: Cacería (Llanuras nevadas de las afueras)",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "Rastros: Cacería (Recinto de las Audiciones FelizAlma en la Arena Ardiente)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Rastros: Abundancia (Jardín del Sosiego)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Rastros: Erudición (Villarremache)",
@ -390,6 +394,7 @@
"do_not_achieve": "No hacer esta misión",
"Stagnant_Shadow_Spike": "Ascension: Físico (Natasha / Clara / Luka / Sushang)",
"Stagnant_Shadow_Perdition": "Ascension: Físico (Hanya / Argenti)",
"Stagnant_Shadow_Duty": "Ascension: Físico (Boothill / Robin)",
"Stagnant_Shadow_Blaze": "Ascension: Fuego (Himeko / Asta / Hook)",
"Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti)",
"Stagnant_Shadow_Ire": "Ascension: Fuego (Gallagher)",
@ -535,7 +540,8 @@
"Echo_of_War_Destruction_Beginning": "El principio de la Destrucción (Estación Espacial Herta)",
"Echo_of_War_End_of_the_Eternal_Freeze": "El fin del Hielo Eterno (Jarilo-VI)",
"Echo_of_War_Divine_Seed": "Semilla divina (El Luofu de Xianzhou)",
"Echo_of_War_Borehole_Planet_Old_Crater": "Cráter del planeta devorado (Estación Espacial Herta)"
"Echo_of_War_Borehole_Planet_Old_Crater": "Cráter del planeta devorado (Estación Espacial Herta)",
"Echo_of_War_Salutations_of_Ashen_Dreams": "Ecos de la guerra: Tributo del sueño ceniciento (Colonipenal)"
},
"Team": {
"name": "Equipo de mazmorra",

8
module/config/i18n/ja-JP.json
View File

@ -262,6 +262,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材：存護（サポート部分）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "軌跡素材：存護（クラークフィルムランド）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "軌跡素材：巡狩（郊外雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "軌跡素材：巡狩（スラーダ熱砂オーディション会場）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材：豊穣（外縁通路）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "軌跡素材：豊穣（綏園）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "軌跡素材：知恵（リベットタウン）",
@ -271,6 +272,7 @@
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "軌跡素材：虚無（丹鼎司）",
"Stagnant_Shadow_Spike": "キャラクター昇格素材：物理（ナターシャ / クラーラ / ルカ / 素裳）",
"Stagnant_Shadow_Perdition": "キャラクター昇格素材：物理（寒鴉 / アルジェンティ）",
"Stagnant_Shadow_Duty": "キャラクター昇格素材：物理（ブートヒル / ロビン）",
"Stagnant_Shadow_Blaze": "キャラクター昇格素材：炎（姫子 / アスター / フック）",
"Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）",
"Stagnant_Shadow_Ire": "キャラクター昇格素材：炎（ギャラガー）",
@ -313,6 +315,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材：存護（サポート部分）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "軌跡素材：存護（クラークフィルムランド）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "軌跡素材：巡狩（郊外雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "軌跡素材：巡狩（スラーダ熱砂オーディション会場）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材：豊穣（外縁通路）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "軌跡素材：豊穣（綏園）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "軌跡素材：知恵（リベットタウン）",
@ -376,6 +379,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材：存護（サポート部分）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "軌跡素材：存護（クラークフィルムランド）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "軌跡素材：巡狩（郊外雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "軌跡素材：巡狩（スラーダ熱砂オーディション会場）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材：豊穣（外縁通路）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "軌跡素材：豊穣（綏園）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "軌跡素材：知恵（リベットタウン）",
@ -390,6 +394,7 @@
"do_not_achieve": "do_not_achieve",
"Stagnant_Shadow_Spike": "キャラクター昇格素材：物理（ナターシャ / クラーラ / ルカ / 素裳）",
"Stagnant_Shadow_Perdition": "キャラクター昇格素材：物理（寒鴉 / アルジェンティ）",
"Stagnant_Shadow_Duty": "キャラクター昇格素材：物理（ブートヒル / ロビン）",
"Stagnant_Shadow_Blaze": "キャラクター昇格素材：炎（姫子 / アスター / フック）",
"Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）",
"Stagnant_Shadow_Ire": "キャラクター昇格素材：炎（ギャラガー）",
@ -535,7 +540,8 @@
"Echo_of_War_Destruction_Beginning": "歴戦余韻・壊滅の始まり (宇宙ステーション「ヘルタ」)",
"Echo_of_War_End_of_the_Eternal_Freeze": "歴戦余韻・寒波の幕切れ (ヤリーロ-VI)",
"Echo_of_War_Divine_Seed": "歴戦余韻・不死の神実 (仙舟「羅浮」)",
"Echo_of_War_Borehole_Planet_Old_Crater": "歴戦余韻・星を蝕む往日の面影 (宇宙ステーション「ヘルタ」)"
"Echo_of_War_Borehole_Planet_Old_Crater": "歴戦余韻・星を蝕む往日の面影 (宇宙ステーション「ヘルタ」)",
"Echo_of_War_Salutations_of_Ashen_Dreams": "歴戦余韻・現世の夢の礼賛 (ピノコニー)"
},
"Team": {
"name": "Weekly.Team.name",

8
module/config/i18n/zh-CN.json
View File

@ -262,6 +262,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料：存护（支援舱段）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "行迹材料：存护（克劳克影视乐园）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行迹材料：巡猎（城郊雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "行迹材料：巡猎（苏乐达热砂海选会场）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料：丰饶（边缘通路）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "行迹材料：丰饶（绥园）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "行迹材料：智识（铆钉镇）",
@ -271,6 +272,7 @@
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "行迹材料：虚无（丹鼎司）",
"Stagnant_Shadow_Spike": "角色晋阶材料：物理（娜塔莎 / 克拉拉 / 卢卡 / 素裳）",
"Stagnant_Shadow_Perdition": "角色晋阶材料：物理（寒鸦 / 银枝）",
"Stagnant_Shadow_Duty": "角色晋阶材料：物理（波提欧 / 知更鸟）",
"Stagnant_Shadow_Blaze": "角色晋阶材料：火（姬子 / 艾丝妲 / 虎克）",
"Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账）",
"Stagnant_Shadow_Ire": "角色晋阶材料：火（加拉赫）",
@ -313,6 +315,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料：存护（支援舱段）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "行迹材料：存护（克劳克影视乐园）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行迹材料：巡猎（城郊雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "行迹材料：巡猎（苏乐达热砂海选会场）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料：丰饶（边缘通路）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "行迹材料：丰饶（绥园）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "行迹材料：智识（铆钉镇）",
@ -376,6 +379,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料：存护（支援舱段）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "行迹材料：存护（克劳克影视乐园）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行迹材料：巡猎（城郊雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "行迹材料：巡猎（苏乐达热砂海选会场）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料：丰饶（边缘通路）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "行迹材料：丰饶（绥园）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "行迹材料：智识（铆钉镇）",
@ -390,6 +394,7 @@
"do_not_achieve": "不完成这个任务",
"Stagnant_Shadow_Spike": "角色晋阶材料：物理（娜塔莎 / 克拉拉 / 卢卡 / 素裳）",
"Stagnant_Shadow_Perdition": "角色晋阶材料：物理（寒鸦 / 银枝）",
"Stagnant_Shadow_Duty": "角色晋阶材料：物理（波提欧 / 知更鸟）",
"Stagnant_Shadow_Blaze": "角色晋阶材料：火（姬子 / 艾丝妲 / 虎克）",
"Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账）",
"Stagnant_Shadow_Ire": "角色晋阶材料：火（加拉赫）",
@ -535,7 +540,8 @@
"Echo_of_War_Destruction_Beginning": "毁灭的开端•历战余响 (空间站「黑塔」)",
"Echo_of_War_End_of_the_Eternal_Freeze": "寒潮的落幕•历战余响 (雅利洛-Ⅵ)",
"Echo_of_War_Divine_Seed": "不死的神实•历战余响 (仙舟「罗浮」)",
"Echo_of_War_Borehole_Planet_Old_Crater": "蛀星的旧靥•历战余响 (空间站「黑塔」)"
"Echo_of_War_Borehole_Planet_Old_Crater": "蛀星的旧靥•历战余响 (空间站「黑塔」)",
"Echo_of_War_Salutations_of_Ashen_Dreams": "尘梦的赞礼•历战余响 (匹诺康尼)"
},
"Team": {
"name": "打本队伍",

8
module/config/i18n/zh-TW.json
View File

@ -262,6 +262,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料：存護（支援艙段）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "行跡材料：存護（克勞克影視樂園）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行跡材料：巡獵（城郊雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "行跡材料：巡獵（蘇樂達熱砂海選會場）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料：豐饒（邊緣通道）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "行跡材料：豐饒（綏園）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "行跡材料：智識（鉚釘鎮）",
@ -271,6 +272,7 @@
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "行跡材料：虛無（丹鼎司）",
"Stagnant_Shadow_Spike": "角色晉階材料：物理（娜塔莎 / 克拉拉 / 盧卡 / 素裳）",
"Stagnant_Shadow_Perdition": "角色晉階材料：物理（寒鴉 / 銀枝）",
"Stagnant_Shadow_Duty": "角色晉階材料：物理（波提歐 / 知更鳥）",
"Stagnant_Shadow_Blaze": "角色晉階材料：火（姬子 / 艾絲妲 / 虎克）",
"Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）",
"Stagnant_Shadow_Ire": "角色晉階材料：火（加拉赫）",
@ -313,6 +315,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料：存護（支援艙段）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "行跡材料：存護（克勞克影視樂園）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行跡材料：巡獵（城郊雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "行跡材料：巡獵（蘇樂達熱砂海選會場）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料：豐饒（邊緣通道）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "行跡材料：豐饒（綏園）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "行跡材料：智識（鉚釘鎮）",
@ -376,6 +379,7 @@
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料：存護（支援艙段）",
"Calyx_Crimson_Preservation_Penacony_ClockStudiosThemePark": "行跡材料：存護（克勞克影視樂園）",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行跡材料：巡獵（城郊雪原）",
"Calyx_Crimson_The_Hunt_Penacony_SoulGladScorchsandAuditionVenue": "行跡材料：巡獵（蘇樂達熱砂海選會場）",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料：豐饒（邊緣通道）",
"Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "行跡材料：豐饒（綏園）",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "行跡材料：智識（鉚釘鎮）",
@ -390,6 +394,7 @@
"do_not_achieve": "不完成這個任務",
"Stagnant_Shadow_Spike": "角色晉階材料：物理（娜塔莎 / 克拉拉 / 盧卡 / 素裳）",
"Stagnant_Shadow_Perdition": "角色晉階材料：物理（寒鴉 / 銀枝）",
"Stagnant_Shadow_Duty": "角色晉階材料：物理（波提歐 / 知更鳥）",
"Stagnant_Shadow_Blaze": "角色晉階材料：火（姬子 / 艾絲妲 / 虎克）",
"Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）",
"Stagnant_Shadow_Ire": "角色晉階材料：火（加拉赫）",
@ -535,7 +540,8 @@
"Echo_of_War_Destruction_Beginning": "毀滅的開端•歷戰餘響 (太空站「黑塔」)",
"Echo_of_War_End_of_the_Eternal_Freeze": "寒潮的落幕•歷戰餘響 (雅利洛-Ⅵ)",
"Echo_of_War_Divine_Seed": "不死的神實•歷戰餘響 (仙舟「羅浮」)",
"Echo_of_War_Borehole_Planet_Old_Crater": "蛀星的舊靨•歷戰餘響 (太空站「黑塔」)"
"Echo_of_War_Borehole_Planet_Old_Crater": "蛀星的舊靨•歷戰餘響 (太空站「黑塔」)",
"Echo_of_War_Salutations_of_Ashen_Dreams": "塵夢的讚禮•歷戰餘響 (匹諾康尼)"
},
"Team": {
"name": "打本隊伍",

4
tasks/assignment/ui.py
View File

@ -40,8 +40,8 @@ class AssignmentOcr(Ocr):
(KEYWORDS_ASSIGNMENT_ENTRY.The_Wages_of_Humanity.name, '[赠]养人类'),
],
'en': [
(KEYWORDS_ASSIGNMENT_EVENT_ENTRY.Food_Improvement_Plan.name,
'Food\s*[I]{0}mprovement Plan'),
# (KEYWORDS_ASSIGNMENT_EVENT_ENTRY.Food_Improvement_Plan.name,
# 'Food\s*[I]{0}mprovement Plan'),
]
}

3
tasks/dungeon/ui.py
View File

@ -82,6 +82,9 @@ class OcrDungeonList(Ocr):
# 乙太之蕾•雅利洛-Ⅵ
result = re.sub(r'-[VⅤ][IⅠ]', '-Ⅵ', result)
# 苏乐达™热砂海选会场
result = re.sub(r'(苏乐达|蘇樂達|SoulGlad|スラーダ|FelizAlma)[rtT]*M', r'\1', result)
result = super().after_process(result)
if self.lang == 'cn':

10
tasks/map/keywords/plane.py
View File

@ -501,11 +501,11 @@ Penacony_DreamfluxReef = MapPlane(
Penacony_SoulGladScorchsandAuditionVenue = MapPlane(
id=46,
name='Penacony_SoulGladScorchsandAuditionVenue',
cn='苏乐达™热砂海选会场',
cht='蘇樂達™熱砂海選會場',
en='SoulGlad™ Scorchsand Audition Venue',
jp='スラーダ™熱砂オーディション会場',
es='Recinto de las Audiciones FelizAlma™ en la Arena Ardiente',
cn='苏乐达热砂海选会场',
cht='蘇樂達熱砂海選會場',
en='SoulGlad Scorchsand Audition Venue',
jp='スラーダ熱砂オーディション会場',
es='Recinto de las Audiciones FelizAlma en la Arena Ardiente',
world_id=3,
plane_id=2033101,
)