Fix: Entering calyx crimson

This commit is contained in:
LmeSzinc 2024-02-07 06:57:52 +08:00
parent 3f38deedd7
commit 5191674920
15 changed files with 197 additions and 145 deletions

View File

@ -47,8 +47,8 @@
"Team": 1
},
"DungeonDaily": {
"CalyxGolden": "Calyx_Golden_Treasures",
"CalyxCrimson": "Calyx_Crimson_Erudition",
"CalyxGolden": "Calyx_Golden_Treasures_Jarilo_VI",
"CalyxCrimson": "Calyx_Crimson_Destruction_Herta_StorageZone",
"StagnantShadow": "Stagnant_Shadow_Quanta",
"CavernOfCorrosion": "Cavern_of_Corrosion_Path_of_Providence"
},

View File

@ -566,6 +566,8 @@ class KeywordExtract:
self.load_keywords(['领取', '追踪'])
self.write_keywords(keyword_class='BattlePassQuestState',
output_file='./tasks/battle_pass/keywords/quest_state.py')
self.generate_map_planes()
self.generate_character_keywords()
from dev_tools.keywords.dungeon_list import GenerateDungeonList
GenerateDungeonList()()
self.load_keywords(['进入', '传送', '追踪'])
@ -578,8 +580,6 @@ class KeywordExtract:
output_file='./tasks/battle_pass/keywords/mission_tab.py')
self.generate_assignments()
self.generate_forgotten_hall_stages()
self.generate_map_planes()
self.generate_character_keywords()
self.generate_daily_quests()
self.generate_battle_pass_quests()
self.load_keywords(['养成材料', '光锥', '遗器', '其他材料', '消耗品', '任务', '贵重物'])

View File

@ -146,6 +146,11 @@ class GenerateKeyword:
def convert_name(self, text: str, keyword: dict) -> str:
return text_to_variable(text)
def iter_rows(self) -> t.Iterable[dict]:
for keyword in self.iter_keywords():
keyword = self.format_keywords(keyword)
yield keyword
def format_keywords(self, keyword: dict) -> dict | None:
base = self.keyword_format.copy()
text_id = keyword.pop('text_id')
@ -170,8 +175,7 @@ class GenerateKeyword:
self.gen_import()
self.gen.CommentAutoGenerage('dev_tools.keyword_extract')
for keyword in self.iter_keywords():
keyword = self.format_keywords(keyword)
for keyword in self.iter_rows():
with self.gen.Object(key=keyword['name'], object_class=self.keyword_class):
for key, value in keyword.items():
self.gen.ObjectAttr(key, value)

View File

@ -72,3 +72,26 @@ class GenerateDungeonList(GenerateKeyword):
plane = MapPlane.find_plane_id(keyword['plane_id'])
text = f'{text}_{plane.name}'
return text
def iter_rows(self) -> t.Iterable[dict]:
dungeons = list(super().iter_rows())
calyx = []
order = [
'Calyx_Golden',
'Calyx_Crimson_Destruction',
'Calyx_Crimson_Preservation',
'Calyx_Crimson_The_Hunt',
'Calyx_Crimson_Abundance',
'Calyx_Crimson_Erudition',
'Calyx_Crimson_Harmony',
'Calyx_Crimson_Nihility',
]
for keyword in order:
condition = lambda x: x['name'].startswith(keyword)
print([d for d in dungeons])
calyx += [d for d in dungeons if condition(d)]
dungeons = [d for d in dungeons if not condition(d)]
dungeons = calyx + dungeons
for row in dungeons:
yield row

View File

@ -204,14 +204,14 @@
"Calyx_Golden_Treasures_Penacony",
"Calyx_Crimson_Destruction_Herta_StorageZone",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"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",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"Stagnant_Shadow_Spike",
"Stagnant_Shadow_Perdition",
"Stagnant_Shadow_Blaze",
@ -255,14 +255,14 @@
"Calyx_Golden_Treasures_Penacony",
"Calyx_Crimson_Destruction_Herta_StorageZone",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"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",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission"
]
},
"NameAtDoubleRelic": {
@ -300,7 +300,7 @@
"DungeonDaily": {
"CalyxGolden": {
"type": "select",
"value": "Calyx_Golden_Treasures",
"value": "Calyx_Golden_Treasures_Jarilo_VI",
"option": [
"do_not_achieve",
"Calyx_Golden_Memories_Jarilo_VI",
@ -316,19 +316,19 @@
},
"CalyxCrimson": {
"type": "select",
"value": "Calyx_Crimson_Erudition",
"value": "Calyx_Crimson_Destruction_Herta_StorageZone",
"option": [
"do_not_achieve",
"Calyx_Crimson_Destruction_Herta_StorageZone",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass",
"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",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission"
]
},
"StagnantShadow": {

View File

@ -40,14 +40,14 @@ class GeneratedConfig:
Optimization_WhenTaskQueueEmpty = 'goto_main' # stay_there, goto_main, close_game
# 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_The_Hunt_Jarilo_OutlyingSnowPlains, 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, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, Stagnant_Shadow_Spike, Stagnant_Shadow_Perdition, Stagnant_Shadow_Blaze, Stagnant_Shadow_Scorch, 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' # do_not_participate, 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_The_Hunt_Jarilo_OutlyingSnowPlains, 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, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Abundance_Jarilo_BackwaterPass
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_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, 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_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' # do_not_participate, 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_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, 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' # do_not_participate, 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' # 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_Erudition' # do_not_achieve, Calyx_Crimson_Destruction_Herta_StorageZone, Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape, Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains, 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, Calyx_Crimson_Preservation_Herta_SupplyZone, Calyx_Crimson_Abundance_Jarilo_BackwaterPass
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_The_Hunt_Jarilo_OutlyingSnowPlains, Calyx_Crimson_Abundance_Jarilo_BackwaterPass, 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_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

View File

@ -70,8 +70,8 @@ class ConfigGenerator:
+ [dungeon.name for dungeon in DungeonList.instances.values() if dungeon.is_Calyx_Golden_Treasures]
# calyx_crimson
from tasks.rogue.keywords import KEYWORDS_ROGUE_PATH as Path
order = [Path.Destruction, Path.The_Hunt, Path.Erudition, Path.The_Harmony,
Path.Nihility, Path.Preservation, Path.Abundance]
order = [Path.Destruction, Path.Preservation, Path.The_Hunt, Path.Abundance,
Path.Erudition, Path.The_Harmony, Path.Nihility]
calyx_crimson = []
for path in order:
calyx_crimson += [dungeon.name for dungeon in DungeonList.instances.values()

View File

@ -234,14 +234,14 @@
"Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "Trace: Destruction (Scalegorge Waterscape)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Trace: The Hunt (Outlying Snow Plains)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
"Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: The Harmony (Robot Settlement)",
"Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: The Harmony (The Reverie (Dreamscape))",
"Calyx_Crimson_Nihility_Jarilo_GreatMine": "Trace: Nihility (Great Mine)",
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Stagnant_Shadow_Spike": "Ascension: Physical (Natasha / Clara / Luka / Sushang)",
"Stagnant_Shadow_Perdition": "Ascension: Physical (Hanya / Argenti)",
"Stagnant_Shadow_Blaze": "Ascension: Fire (Himeko / Asta / Hook)",
@ -283,14 +283,14 @@
"Calyx_Golden_Treasures_Penacony": "Material: Credit (Bud of Treasures (Penacony))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "Trace: Destruction (Scalegorge Waterscape)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Trace: The Hunt (Outlying Snow Plains)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
"Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: The Harmony (Robot Settlement)",
"Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: The Harmony (The Reverie (Dreamscape))",
"Calyx_Crimson_Nihility_Jarilo_GreatMine": "Trace: Nihility (Great Mine)",
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)"
},
"NameAtDoubleRelic": {
"name": "At Double Relic Event, choose dungeon",
@ -345,14 +345,14 @@
"do_not_achieve": "Don't Do This Quest",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Trace: Destruction (Storage Zone)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "Trace: Destruction (Scalegorge Waterscape)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Trace: The Hunt (Outlying Snow Plains)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
"Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: The Harmony (Robot Settlement)",
"Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: The Harmony (The Reverie (Dreamscape))",
"Calyx_Crimson_Nihility_Jarilo_GreatMine": "Trace: Nihility (Great Mine)",
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Trace: Preservation (Supply Zone)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Trace: Abundance (Backwater Pass)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)"
},
"StagnantShadow": {
"name": "Clear Stagnant Shadow 1 times",

View File

@ -234,14 +234,14 @@
"Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "Rastros: Destrucción (Desfiladero de Escamas)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Rastros: Cacería (Llanuras nevadas de las afueras)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Rastros: Erudición (Villarremache)",
"Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Rastros: Armonía (Asentamiento robot)",
"Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Rastros: Armonía (Hotel Fantasía (paisaje onírico))",
"Calyx_Crimson_Nihility_Jarilo_GreatMine": "Rastros: Nihilidad (Mina principal)",
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Rastros: Nihilidad (Comisión de Alquimia)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Stagnant_Shadow_Spike": "Ascension: Físico (Natasha / Clara / Luka / Sushang)",
"Stagnant_Shadow_Perdition": "Ascension: Físico (Hanya / Argenti)",
"Stagnant_Shadow_Blaze": "Ascension: Fuego (Himeko / Asta / Hook)",
@ -283,14 +283,14 @@
"Calyx_Golden_Treasures_Penacony": "Material: Créditos (Flor de tesoros (Colonipenal))",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "Rastros: Destrucción (Desfiladero de Escamas)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Rastros: Cacería (Llanuras nevadas de las afueras)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Rastros: Erudición (Villarremache)",
"Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Rastros: Armonía (Asentamiento robot)",
"Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Rastros: Armonía (Hotel Fantasía (paisaje onírico))",
"Calyx_Crimson_Nihility_Jarilo_GreatMine": "Rastros: Nihilidad (Mina principal)",
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Rastros: Nihilidad (Comisión de Alquimia)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Rastros: Nihilidad (Comisión de Alquimia)"
},
"NameAtDoubleRelic": {
"name": "En los eventos de x2 de Caverna de la corrosión",
@ -345,14 +345,14 @@
"do_not_achieve": "No hacer esta misión",
"Calyx_Crimson_Destruction_Herta_StorageZone": "Rastros: Destrucción (Zona de almacenamiento)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "Rastros: Destrucción (Desfiladero de Escamas)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "Rastros: Cacería (Llanuras nevadas de las afueras)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)",
"Calyx_Crimson_Erudition_Jarilo_RivetTown": "Rastros: Erudición (Villarremache)",
"Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Rastros: Armonía (Asentamiento robot)",
"Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Rastros: Armonía (Hotel Fantasía (paisaje onírico))",
"Calyx_Crimson_Nihility_Jarilo_GreatMine": "Rastros: Nihilidad (Mina principal)",
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Rastros: Nihilidad (Comisión de Alquimia)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "Rastros: Conservación (Zona de suministros)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "Rastros: Abundancia (Paso del Remanso)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Rastros: Nihilidad (Comisión de Alquimia)"
},
"StagnantShadow": {
"name": "Completar Sombra paralizada 1 vez",

View File

@ -234,14 +234,14 @@
"Calyx_Golden_Treasures_Penacony": "素材:クレジット(秘蔵の蕾・ピノコニー)",
"Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材:壊滅(収容部分)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "軌跡素材:壊滅(鱗淵境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材:存護(サポート部分)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "軌跡素材:巡狩(郊外雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材:豊穣(外縁通路)",
"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": "軌跡素材:虚無(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材:存護(サポート部分)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材:豊穣(外縁通路)",
"Stagnant_Shadow_Spike": "キャラクター昇格素材:物理(ナターシャ / クラーラ / ルカ / 素裳)",
"Stagnant_Shadow_Perdition": "キャラクター昇格素材:物理(寒鴉 / アルジェンティ)",
"Stagnant_Shadow_Blaze": "キャラクター昇格素材:炎(姫子 / アスター / フック)",
@ -283,14 +283,14 @@
"Calyx_Golden_Treasures_Penacony": "素材:クレジット(秘蔵の蕾・ピノコニー)",
"Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材:壊滅(収容部分)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "軌跡素材:壊滅(鱗淵境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材:存護(サポート部分)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "軌跡素材:巡狩(郊外雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材:豊穣(外縁通路)",
"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": "軌跡素材:虚無(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材:存護(サポート部分)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材:豊穣(外縁通路)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "軌跡素材:虚無(丹鼎司)"
},
"NameAtDoubleRelic": {
"name": "Dungeon.NameAtDoubleRelic.name",
@ -345,14 +345,14 @@
"do_not_achieve": "do_not_achieve",
"Calyx_Crimson_Destruction_Herta_StorageZone": "軌跡素材:壊滅(収容部分)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "軌跡素材:壊滅(鱗淵境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材:存護(サポート部分)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "軌跡素材:巡狩(郊外雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材:豊穣(外縁通路)",
"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": "軌跡素材:虚無(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "軌跡素材:存護(サポート部分)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "軌跡素材:豊穣(外縁通路)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "軌跡素材:虚無(丹鼎司)"
},
"StagnantShadow": {
"name": "DungeonDaily.StagnantShadow.name",

View File

@ -234,14 +234,14 @@
"Calyx_Golden_Treasures_Penacony": "材料:信用点(藏珍之蕾•匹诺康尼)",
"Calyx_Crimson_Destruction_Herta_StorageZone": "行迹材料:毁灭(收容舱段)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "行迹材料:毁灭(鳞渊境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料:存护(支援舱段)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行迹材料:巡猎(城郊雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料:丰饶(边缘通路)",
"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": "行迹材料:虚无(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料:存护(支援舱段)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料:丰饶(边缘通路)",
"Stagnant_Shadow_Spike": "角色晋阶材料:物理(娜塔莎 / 克拉拉 / 卢卡 / 素裳)",
"Stagnant_Shadow_Perdition": "角色晋阶材料:物理(寒鸦 / 银枝)",
"Stagnant_Shadow_Blaze": "角色晋阶材料:火(姬子 / 艾丝妲 / 虎克)",
@ -283,14 +283,14 @@
"Calyx_Golden_Treasures_Penacony": "材料:信用点(藏珍之蕾•匹诺康尼)",
"Calyx_Crimson_Destruction_Herta_StorageZone": "行迹材料:毁灭(收容舱段)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "行迹材料:毁灭(鳞渊境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料:存护(支援舱段)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行迹材料:巡猎(城郊雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料:丰饶(边缘通路)",
"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": "行迹材料:虚无(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料:存护(支援舱段)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料:丰饶(边缘通路)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "行迹材料:虚无(丹鼎司)"
},
"NameAtDoubleRelic": {
"name": "有遗器活动时,选择副本",
@ -345,14 +345,14 @@
"do_not_achieve": "不完成这个任务",
"Calyx_Crimson_Destruction_Herta_StorageZone": "行迹材料:毁灭(收容舱段)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "行迹材料:毁灭(鳞渊境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料:存护(支援舱段)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行迹材料:巡猎(城郊雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料:丰饶(边缘通路)",
"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": "行迹材料:虚无(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行迹材料:存护(支援舱段)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行迹材料:丰饶(边缘通路)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "行迹材料:虚无(丹鼎司)"
},
"StagnantShadow": {
"name": "完成1次凝滞虚影",

View File

@ -234,14 +234,14 @@
"Calyx_Golden_Treasures_Penacony": "材料:信用點(藏珍之蕾•匹諾康尼)",
"Calyx_Crimson_Destruction_Herta_StorageZone": "行跡材料:毀滅(收容艙段)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "行跡材料:毀滅(鱗淵境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料:存護(支援艙段)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行跡材料:巡獵(城郊雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料:豐饒(邊緣通道)",
"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": "行跡材料:虛無(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料:存護(支援艙段)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料:豐饒(邊緣通道)",
"Stagnant_Shadow_Spike": "角色晉階材料:物理(娜塔莎 / 克拉拉 / 盧卡 / 素裳)",
"Stagnant_Shadow_Perdition": "角色晉階材料:物理(寒鴉 / 銀枝)",
"Stagnant_Shadow_Blaze": "角色晉階材料:火(姬子 / 艾絲妲 / 虎克)",
@ -283,14 +283,14 @@
"Calyx_Golden_Treasures_Penacony": "材料:信用點(藏珍之蕾•匹諾康尼)",
"Calyx_Crimson_Destruction_Herta_StorageZone": "行跡材料:毀滅(收容艙段)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "行跡材料:毀滅(鱗淵境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料:存護(支援艙段)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行跡材料:巡獵(城郊雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料:豐饒(邊緣通道)",
"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": "行跡材料:虛無(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料:存護(支援艙段)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料:豐饒(邊緣通道)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "行跡材料:虛無(丹鼎司)"
},
"NameAtDoubleRelic": {
"name": "有遺器活動時,選擇副本",
@ -345,14 +345,14 @@
"do_not_achieve": "不完成這個任務",
"Calyx_Crimson_Destruction_Herta_StorageZone": "行跡材料:毀滅(收容艙段)",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape": "行跡材料:毀滅(鱗淵境)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料:存護(支援艙段)",
"Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains": "行跡材料:巡獵(城郊雪原)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料:豐饒(邊緣通道)",
"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": "行跡材料:虛無(丹鼎司)",
"Calyx_Crimson_Preservation_Herta_SupplyZone": "行跡材料:存護(支援艙段)",
"Calyx_Crimson_Abundance_Jarilo_BackwaterPass": "行跡材料:豐饒(邊緣通道)"
"Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "行跡材料:虛無(丹鼎司)"
},
"StagnantShadow": {
"name": "完成1次凝滯虛影",

View File

@ -7,7 +7,7 @@ import module.config.server as server
from module.exception import ScriptError
# ord('') = 65294
REGEX_PUNCTUATION = re.compile(r'[ ,.\'"“”,。…:;!??·・•*※\-—-/\\\n\t()\[\]()「」『』【】《》[]]')
REGEX_PUNCTUATION = re.compile(r'[ ,.\'"“”,。…:;!??·・•●〇*※\-—-/\\\n\t()\[\]()「」『』【】《》[]]')
def parse_name(n):

View File

@ -33,76 +33,6 @@ Calyx_Golden_Treasures_Jarilo_VI = DungeonList(
es='Flor de tesoros (Jarilo-VI)',
plane_id=2012101,
)
Calyx_Crimson_Destruction_Herta_StorageZone = DungeonList(
id=4,
name='Calyx_Crimson_Destruction_Herta_StorageZone',
cn='毁灭之蕾•拟造花萼(赤)',
cht='毀滅之蕾•擬造花萼(赤)',
en='Bud of Destruction',
jp='疑似花萼(赤)・壊滅の蕾',
es='Flor de la Destrucción',
plane_id=2000201,
)
Calyx_Crimson_Preservation_Herta_SupplyZone = DungeonList(
id=5,
name='Calyx_Crimson_Preservation_Herta_SupplyZone',
cn='存护之蕾•拟造花萼(赤)',
cht='存護之蕾•擬造花萼(赤)',
en='Bud of Preservation',
jp='疑似花萼(赤)・存護の蕾',
es='Flor de la Conservación',
plane_id=2000301,
)
Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains = DungeonList(
id=6,
name='Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains',
cn='巡猎之蕾•拟造花萼(赤)',
cht='巡獵之蕾•擬造花萼(赤)',
en='Bud of The Hunt',
jp='疑似花萼(赤)・巡狩の蕾',
es='Flor de la Cacería',
plane_id=2010101,
)
Calyx_Crimson_Abundance_Jarilo_BackwaterPass = DungeonList(
id=7,
name='Calyx_Crimson_Abundance_Jarilo_BackwaterPass',
cn='丰饶之蕾•拟造花萼(赤)',
cht='豐饒之蕾•擬造花萼(赤)',
en='Bud of Abundance',
jp='疑似花萼(赤)・豊穣の蕾',
es='Flor de la Abundancia',
plane_id=2011101,
)
Calyx_Crimson_Erudition_Jarilo_RivetTown = DungeonList(
id=8,
name='Calyx_Crimson_Erudition_Jarilo_RivetTown',
cn='智识之蕾•拟造花萼(赤)',
cht='智識之蕾•擬造花萼(赤)',
en='Bud of Erudition',
jp='疑似花萼(赤)・知恵の蕾',
es='Flor de la Erudición',
plane_id=2012201,
)
Calyx_Crimson_Harmony_Jarilo_RobotSettlement = DungeonList(
id=9,
name='Calyx_Crimson_Harmony_Jarilo_RobotSettlement',
cn='同谐之蕾•拟造花萼(赤)',
cht='同諧之蕾•擬造花萼(赤)',
en='Bud of Harmony',
jp='疑似花萼(赤)・調和の蕾',
es='Flor de la Armonía',
plane_id=2012301,
)
Calyx_Crimson_Nihility_Jarilo_GreatMine = DungeonList(
id=10,
name='Calyx_Crimson_Nihility_Jarilo_GreatMine',
cn='虚无之蕾•拟造花萼(赤)',
cht='虛無之蕾•擬造花萼(赤)',
en='Bud of Nihility',
jp='疑似花萼(赤)・虚無の蕾',
es='Flor de la Nihilidad',
plane_id=2012101,
)
Calyx_Golden_Memories_The_Xianzhou_Luofu = DungeonList(
id=11,
name='Calyx_Golden_Memories_The_Xianzhou_Luofu',
@ -163,15 +93,15 @@ Calyx_Golden_Treasures_Penacony = DungeonList(
es='Flor de tesoros (Colonipenal)',
plane_id=2031101,
)
Calyx_Crimson_Nihility_Luofu_AlchemyCommission = DungeonList(
id=17,
name='Calyx_Crimson_Nihility_Luofu_AlchemyCommission',
cn='虚无之蕾•拟造花萼(赤)',
cht='虛無之蕾•擬造花萼(赤)',
en='Bud of Nihility',
jp='疑似花萼(赤)・虚無の蕾',
es='Flor de la Nihilidad',
plane_id=2023101,
Calyx_Crimson_Destruction_Herta_StorageZone = DungeonList(
id=4,
name='Calyx_Crimson_Destruction_Herta_StorageZone',
cn='毁灭之蕾•拟造花萼(赤)',
cht='毀滅之蕾•擬造花萼(赤)',
en='Bud of Destruction',
jp='疑似花萼(赤)・壊滅の蕾',
es='Flor de la Destrucción',
plane_id=2000201,
)
Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape = DungeonList(
id=18,
@ -183,6 +113,56 @@ Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape = DungeonList(
es='Flor de la Destrucción',
plane_id=2023201,
)
Calyx_Crimson_Preservation_Herta_SupplyZone = DungeonList(
id=5,
name='Calyx_Crimson_Preservation_Herta_SupplyZone',
cn='存护之蕾•拟造花萼(赤)',
cht='存護之蕾•擬造花萼(赤)',
en='Bud of Preservation',
jp='疑似花萼(赤)・存護の蕾',
es='Flor de la Conservación',
plane_id=2000301,
)
Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains = DungeonList(
id=6,
name='Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains',
cn='巡猎之蕾•拟造花萼(赤)',
cht='巡獵之蕾•擬造花萼(赤)',
en='Bud of The Hunt',
jp='疑似花萼(赤)・巡狩の蕾',
es='Flor de la Cacería',
plane_id=2010101,
)
Calyx_Crimson_Abundance_Jarilo_BackwaterPass = DungeonList(
id=7,
name='Calyx_Crimson_Abundance_Jarilo_BackwaterPass',
cn='丰饶之蕾•拟造花萼(赤)',
cht='豐饒之蕾•擬造花萼(赤)',
en='Bud of Abundance',
jp='疑似花萼(赤)・豊穣の蕾',
es='Flor de la Abundancia',
plane_id=2011101,
)
Calyx_Crimson_Erudition_Jarilo_RivetTown = DungeonList(
id=8,
name='Calyx_Crimson_Erudition_Jarilo_RivetTown',
cn='智识之蕾•拟造花萼(赤)',
cht='智識之蕾•擬造花萼(赤)',
en='Bud of Erudition',
jp='疑似花萼(赤)・知恵の蕾',
es='Flor de la Erudición',
plane_id=2012201,
)
Calyx_Crimson_Harmony_Jarilo_RobotSettlement = DungeonList(
id=9,
name='Calyx_Crimson_Harmony_Jarilo_RobotSettlement',
cn='同谐之蕾•拟造花萼(赤)',
cht='同諧之蕾•擬造花萼(赤)',
en='Bud of Harmony',
jp='疑似花萼(赤)・調和の蕾',
es='Flor de la Armonía',
plane_id=2012301,
)
Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape = DungeonList(
id=19,
name='Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape',
@ -193,6 +173,26 @@ Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape = DungeonList(
es='Flor de la Armonía',
plane_id=2031101,
)
Calyx_Crimson_Nihility_Jarilo_GreatMine = DungeonList(
id=10,
name='Calyx_Crimson_Nihility_Jarilo_GreatMine',
cn='虚无之蕾•拟造花萼(赤)',
cht='虛無之蕾•擬造花萼(赤)',
en='Bud of Nihility',
jp='疑似花萼(赤)・虚無の蕾',
es='Flor de la Nihilidad',
plane_id=2012101,
)
Calyx_Crimson_Nihility_Luofu_AlchemyCommission = DungeonList(
id=17,
name='Calyx_Crimson_Nihility_Luofu_AlchemyCommission',
cn='虚无之蕾•拟造花萼(赤)',
cht='虛無之蕾•擬造花萼(赤)',
en='Bud of Nihility',
jp='疑似花萼(赤)・虚無の蕾',
es='Flor de la Nihilidad',
plane_id=2023101,
)
Stagnant_Shadow_Quanta = DungeonList(
id=20,
name='Stagnant_Shadow_Quanta',

View File

@ -29,7 +29,7 @@ from tasks.dungeon.keywords import (
from tasks.dungeon.keywords.classes import DungeonEntrance
from tasks.dungeon.state import DungeonState
from tasks.map.interact.aim import inrange
from tasks.map.keywords import KEYWORDS_MAP_WORLD
from tasks.map.keywords import KEYWORDS_MAP_WORLD, MapPlane
class DungeonTabSwitch(Switch):
@ -92,9 +92,26 @@ class OcrDungeonList(Ocr):
result = re.sub('^灼之形', '燔灼之形', result)
# 蛀星的旧·历战余响
result = re.sub(r'蛀星的旧.*?历战', '蛀星的旧靥•历战', result)
# 9支援仓段
result = result.removeprefix('9')
result = result.removeprefix('Q')
return result
class OcrDungeonListCalyxCrimson(OcrDungeonList):
def _match_result(self, *args, **kwargs):
"""
Convert MapPlane object to their corresponding DungeonList object
"""
plane = super()._match_result(*args, **kwargs)
if plane is not None:
for dungeon in DungeonList.instances.values():
if dungeon.is_Calyx_Crimson and dungeon.plane == plane:
return dungeon
return plane
class OcrDungeonListLimitEntrance(OcrDungeonList):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@ -111,13 +128,21 @@ class DraggableDungeonList(DraggableList):
teleports: list[OcrResultButton] = []
navigates: list[OcrResultButton] = []
def load_rows(self, main: ModuleBase, allow_early_access=False):
def load_rows(self, main: ModuleBase, allow_early_access=False, use_plane=False):
"""
Args:
main:
allow_early_access: True to allow dungeons that are in temporarily early access during events
use_plane: True to use map planes to predict dungeons only.
Can only be True in Calyx Crimson
"""
relative_area = (0, 0, 1280, 120)
if use_plane:
self.keyword_class = [MapPlane, DungeonEntrance]
self.ocr_class = OcrDungeonListCalyxCrimson
else:
self.keyword_class = [DungeonList, DungeonEntrance]
self.ocr_class = OcrDungeonList
super().load_rows(main=main)
# Check early access dungeons
@ -158,7 +183,7 @@ class DraggableDungeonList(DraggableList):
DUNGEON_NAV_LIST = DraggableDungeonNav(
'DungeonNavList', keyword_class=DungeonNav, ocr_class=OcrDungeonNav, search_button=OCR_DUNGEON_NAV)
DUNGEON_LIST = DraggableDungeonList(
'DungeonList', keyword_class=[DungeonList, DungeonEntrance],
'DungeonList', keyword_class=[DungeonList, DungeonEntrance, MapPlane],
ocr_class=OcrDungeonList, search_button=OCR_DUNGEON_LIST)