Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix #635

Merged
merged 4 commits into from
Sep 19, 2024
Merged

Bug fix #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f47c2a5
Upd: More Templates of STAMINA_ICON (fixed #632)
LmeSzinc Sep 18, 2024
52f34f2
Upd: Config update
LmeSzinc Sep 18, 2024
7eb55c0
Upd: OCR_DUNGEON_LIST
LmeSzinc Sep 19, 2024
a10dba4
I18n: Add world name to Calyx dungeons
LmeSzinc Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/share/combat/stamina/status/RESERVED_ICON.2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/share/combat/stamina/status/STAMINA_ICON.2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/share/dungeon/ui_list/OCR_DUNGEON_LIST.BUTTON.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/share/dungeon/ui_list/OCR_DUNGEON_LIST.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 35 additions & 35 deletions module/config/argument/args.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,15 +538,15 @@
"type": "select",
"value": "Calyx_Golden_Treasures_Jarilo_VI",
"option": [
"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_Memories_The_Xianzhou_Luofu",
"Calyx_Golden_Memories_Jarilo_VI",
"Calyx_Golden_Aether_Penacony",
"Calyx_Golden_Treasures_Jarilo_VI",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu",
"Calyx_Golden_Aether_The_Xianzhou_Luofu",
"Calyx_Golden_Aether_Jarilo_VI",
"Calyx_Golden_Treasures_Penacony",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu",
"Calyx_Golden_Treasures_Jarilo_VI",
"Calyx_Crimson_Destruction_Herta_StorageZone",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
Expand Down Expand Up @@ -581,31 +581,31 @@
"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_Cavalier",
"Cavern_of_Corrosion_Path_of_Dreamdive",
"Cavern_of_Corrosion_Path_of_Cavalier"
"Cavern_of_Corrosion_Path_of_Darkness",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers",
"Cavern_of_Corrosion_Path_of_Conflagration",
"Cavern_of_Corrosion_Path_of_Holy_Hymn",
"Cavern_of_Corrosion_Path_of_Providence",
"Cavern_of_Corrosion_Path_of_Drifting",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch",
"Cavern_of_Corrosion_Path_of_Gelid_Wind"
]
},
"NameAtDoubleCalyx": {
"type": "select",
"value": "Calyx_Golden_Treasures_Jarilo_VI",
"option": [
"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_Memories_The_Xianzhou_Luofu",
"Calyx_Golden_Memories_Jarilo_VI",
"Calyx_Golden_Aether_Penacony",
"Calyx_Golden_Treasures_Jarilo_VI",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu",
"Calyx_Golden_Aether_The_Xianzhou_Luofu",
"Calyx_Golden_Aether_Jarilo_VI",
"Calyx_Golden_Treasures_Penacony",
"Calyx_Golden_Treasures_The_Xianzhou_Luofu",
"Calyx_Golden_Treasures_Jarilo_VI",
"Calyx_Crimson_Destruction_Herta_StorageZone",
"Calyx_Crimson_Destruction_Luofu_ScalegorgeWaterscape",
"Calyx_Crimson_Preservation_Herta_SupplyZone",
Expand All @@ -626,16 +626,16 @@
"type": "select",
"value": "Cavern_of_Corrosion_Path_of_Providence",
"option": [
"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_Cavalier",
"Cavern_of_Corrosion_Path_of_Dreamdive",
"Cavern_of_Corrosion_Path_of_Cavalier"
"Cavern_of_Corrosion_Path_of_Darkness",
"Cavern_of_Corrosion_Path_of_Elixir_Seekers",
"Cavern_of_Corrosion_Path_of_Conflagration",
"Cavern_of_Corrosion_Path_of_Holy_Hymn",
"Cavern_of_Corrosion_Path_of_Providence",
"Cavern_of_Corrosion_Path_of_Drifting",
"Cavern_of_Corrosion_Path_of_Jabbing_Punch",
"Cavern_of_Corrosion_Path_of_Gelid_Wind"
]
},
"Team": {
Expand Down Expand Up @@ -1366,12 +1366,12 @@
"value": "Echo_of_War_Divine_Seed",
"options": [],
"option": [
"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_Inner_Beast_Battlefield",
"Echo_of_War_Salutations_of_Ashen_Dreams",
"Echo_of_War_Inner_Beast_Battlefield"
"Echo_of_War_Borehole_Planet_Old_Crater",
"Echo_of_War_Divine_Seed",
"Echo_of_War_End_of_the_Eternal_Freeze",
"Echo_of_War_Destruction_Beginning"
]
},
"Team": {
Expand Down
8 changes: 4 additions & 4 deletions module/config/config_generated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class GeneratedConfig:
Optimization_WhenTaskQueueEmpty = 'goto_main' # stay_there, goto_main, close_game

# Group `Dungeon`
Dungeon_Name = 'Calyx_Golden_Treasures_Jarilo_VI' # 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_Erudition_Penacony_PenaconyGrandTheater, 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_Mechwolf, Stagnant_Shadow_Gust, Stagnant_Shadow_Celestial, Stagnant_Shadow_Gloam, 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, Cavern_of_Corrosion_Path_of_Cavalier
Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures_Jarilo_VI' # 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_Erudition_Penacony_PenaconyGrandTheater, 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, Cavern_of_Corrosion_Path_of_Cavalier
Dungeon_Name = 'Calyx_Golden_Treasures_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, Calyx_Golden_Treasures_Penacony, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Jarilo_VI, 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_Erudition_Penacony_PenaconyGrandTheater, 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_Mechwolf, Stagnant_Shadow_Gust, Stagnant_Shadow_Celestial, Stagnant_Shadow_Gloam, Stagnant_Shadow_Quanta, Stagnant_Shadow_Abomination, Stagnant_Shadow_Roast, Stagnant_Shadow_Mirage, Stagnant_Shadow_Puppetry, Cavern_of_Corrosion_Path_of_Cavalier, Cavern_of_Corrosion_Path_of_Dreamdive, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Elixir_Seekers, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Gelid_Wind
Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures_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, Calyx_Golden_Treasures_Penacony, Calyx_Golden_Treasures_The_Xianzhou_Luofu, Calyx_Golden_Treasures_Jarilo_VI, 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_Erudition_Penacony_PenaconyGrandTheater, 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_Cavalier, Cavern_of_Corrosion_Path_of_Dreamdive, Cavern_of_Corrosion_Path_of_Darkness, Cavern_of_Corrosion_Path_of_Elixir_Seekers, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Gelid_Wind
Dungeon_Team = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9

# Group `TrailblazePower`
Expand Down Expand Up @@ -124,7 +124,7 @@ class GeneratedConfig:
Planner_Item_Shards_of_Desires = {}

# 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, Echo_of_War_Salutations_of_Ashen_Dreams, Echo_of_War_Inner_Beast_Battlefield
Weekly_Name = 'Echo_of_War_Divine_Seed' # Echo_of_War_Inner_Beast_Battlefield, Echo_of_War_Salutations_of_Ashen_Dreams, Echo_of_War_Borehole_Planet_Old_Crater, Echo_of_War_Divine_Seed, Echo_of_War_End_of_the_Eternal_Freeze, Echo_of_War_Destruction_Beginning
Weekly_Team = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9

# Group `DailyStorage`
Expand Down
20 changes: 12 additions & 8 deletions module/config/config_updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,11 @@ def deep_load(keys, default=True, words=('name', 'help')):
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}）',
Expand Down Expand Up @@ -409,15 +409,19 @@ def deep_load(keys, default=True, words=('name', 'help')):
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)
Expand Down
Loading