Skip to content

Commit 2d71a6c

Browse files
authored
Rename dungeon_index as dungeon_indexes, refix the dungeon_location
1 parent 821d27c commit 2d71a6c

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

Messages.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,13 +1416,13 @@ def update_map_compass_messages(messages: list[Message], world: World):
14161416
dungeon_name, dungeon_gender = dungeon_list[dungeon.name]
14171417
compass_id, map_id = dungeon_id_list[dungeon.name]
14181418
if 'map_dungeon_location' in world.settings.enhance_map_compass and world.settings.shuffle_dungeon_entrances != 'off':
1419-
dungeon_index = [i for i, c in dungeon_entrances.items() if dungeon.name in c]
1419+
dungeon_indexes = [i for i, c in dungeon_entrances.items() if dungeon.name in c]
14201420
if dungeon.name not in ('Dodongos Cavern', 'Jabu Jabus Belly'):
14211421
for prefix in lang.hintPrefixes:
14221422
if dungeon_name.startswith(prefix):
14231423
dungeon_name = dungeon_name.replace(prefix, '', 1)
14241424
break
1425-
dungeon_location = dungeon_textbox_list[dungeon_index[0]]
1425+
dungeon_location = dungeon_textbox_list[dungeon_indexes[0]]
14261426
if 'map_mq' in world.settings.enhance_map_compass and (world.settings.mq_dungeons_mode == 'random' or world.settings.mq_dungeons_count != 0 and world.settings.mq_dungeons_count != 12):
14271427
map_message = lang.format_from_id(
14281428
"PATCH_TEXTS.map_location_mq",
@@ -1546,9 +1546,8 @@ def update_map_compass_messages(messages: list[Message], world: World):
15461546
update_message_by_id(messages, compass_id, compass_message, lang, allow_duplicates=True, force_left=True)
15471547
if maps_exist:
15481548
if 'map_dungeon_location' in world.settings.enhance_map_compass and world.settings.shuffle_dungeon_entrances != 'off':
1549-
dungeon_index = [i for i, c in enumerate(dungeon_entrances) if dungeon.name in c]
15501549
dungeon_name = dungeon_name.removeprefix('the ') # to make room
1551-
dungeon_location = dungeon_textbox_list[dungeon_index[0]]
1550+
dungeon_location = dungeon_textbox_list[dungeon.name]
15521551
if 'map_mq' in world.settings.enhance_map_compass and (world.settings.mq_dungeons_mode == 'random' or world.settings.mq_dungeons_count != 0 and world.settings.mq_dungeons_count != 12):
15531552
map_message = lang.format_from_id(
15541553
"PATCH_TEXTS.map_location_mq",

0 commit comments

Comments
 (0)