Skip to content

Commit

Permalink
Final Cleanup for PR
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaybone25 committed Dec 30, 2024
1 parent 5de3d55 commit ca80546
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions HintList.py
Original file line number Diff line number Diff line change
Expand Up @@ -1943,9 +1943,9 @@ def rainbow_bridge_hint_kind(world: World) -> str:
},
}

#Adds capability for dual misc hints. Required keys "id" for text ID to replace. 'hint_location_0' and 'hint_location_1', name of the hint. These must have _0 for the first hint and _1 for the second hint.
#'item_location_0' and 'item_location_1' the location of the check per spoiler log. This also must have _0 for the first location and _1 for the second location. 'location_text', is the text for the
#dual hint where item_1 is the item from item_location_0 and item_2 is the item from item_location_1. 'location_fallback', text to handle if the misc hint is not turned on. 'text_style', argument for text box style.
# Adds capability for dual misc hints. Required keys "id" for text ID to replace. 'hint_location_0' and 'hint_location_1', name of the hint. These must have _0 for the first hint and _1 for the second hint.
# 'item_location_0' and 'item_location_1' the location of the check per spoiler log. This also must have _0 for the first location and _1 for the second location. 'location_text', is the text for the
# dual hint where item_1 is the item from item_location_0 and item_2 is the item from item_location_1. 'location_fallback', text to handle if the misc hint is not turned on. 'text_style', argument for text box style.
misc_dual_hint_table: dict[str, dict[str, Any]] = {
'mask_shop_dual': {
'id': 0x0344,
Expand Down
6 changes: 3 additions & 3 deletions Hints.py
Original file line number Diff line number Diff line change
Expand Up @@ -1839,13 +1839,13 @@ def build_misc_location_hints(world: World, messages: list[Message]) -> None:
world.settings.clearer_hints).text)

update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'], allow_duplicates=True)
#Allows for other misc hints to use 'location_fallback, but avoids the mask hints from being overwritten.
# Allows for other misc hints to use 'location_fallback, but avoids the mask hints from being overwritten.
if hint_type not in ['skull_mask', 'mask_of_truth'] and hint_type not in world.settings.misc_hints:
update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'], allow_duplicates=True)
update_message_by_id(messages, data['id'], str(GossipText(text, ['Green'], prefix='')), data['text_style'], allow_duplicates=True)

def build_misc_dual_hints(world: World, messages: list[Message]) -> None:
for hint_type, data in misc_dual_hint_table.items():
#Change misc_hints list to use the Skull Mask and Mask of Truth Dual hint
# Change misc_hints list to use the Skull Mask and Mask of Truth Dual hint
if 'skull_mask' in world.settings.misc_hints and 'mask_of_truth' in world.settings.misc_hints:
world.settings.misc_hints.remove('skull_mask')
world.settings.misc_hints.remove('mask_of_truth')
Expand Down
3 changes: 1 addition & 2 deletions Location.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ def maybe_set_misc_hints(self) -> None:
key = 'item_location_'+ str(i)
if key not in data:
break
item_location = data[key]
the_location = item_location
the_location = data[key]
if hint_type not in self.world.misc_dual_hint_items and self.name == the_location:
self.world.misc_dual_hint_items[hint_type + '_' + str(i)] = self.item
logging.getLogger('').debug(f'{the_location} [{self.world.id}] set to [{self.item.name}]')
Expand Down
4 changes: 2 additions & 2 deletions SettingsList.py
Original file line number Diff line number Diff line change
Expand Up @@ -3605,7 +3605,7 @@ class SettingInfos:
The sign in Deku Theater will tell the reward for showing
the Skull Mask.
The sign in Deku Theater will tell the reward for showing
The sign in Deku Theater will tell the reward for showing
the Mask of Truth.
If both Skull Mask and Mask of Truth are selected, the sign
Expand All @@ -3614,7 +3614,7 @@ class SettingInfos:
shared = True,
default = ['altar', 'ganondorf', 'warp_songs_and_owls'],
)

correct_chest_appearances = Combobox(
gui_text = 'Chest Appearance Matches Contents',
default = 'off',
Expand Down

0 comments on commit ca80546

Please sign in to comment.