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

Remove “same hint area” requirements if all hints are off #51

Closed
wants to merge 1 commit into from
Closed

Remove “same hint area” requirements if all hints are off #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion EntranceShuffle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ def validate_world(world, worlds, entrance_placed, locations_to_ensure_reachable
if not max_search.visited(location):
raise EntranceShuffleError('%s is unreachable' % location.name)

if world.shuffle_interior_entrances and \
if world.shuffle_interior_entrances and (world.misc_hints or world.hints != 'none') and \
(entrance_placed == None or entrance_placed.type in ['Interior', 'SpecialInterior']):
# Ensure Kak Potion Shop entrances are in the same hint area so there is no ambiguity as to which entrance is used for hints
potion_front_entrance = get_entrance_replacing(world.get_region('Kak Potion Shop Front'), 'Kakariko Village -> Kak Potion Shop Front')
Expand Down
2 changes: 1 addition & 1 deletion Main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def make_spoiler(settings, worlds, window=dummy_window()):
update_required_items(spoiler)
buildGossipHints(spoiler, worlds)
window.update_progress(55)
else:
elif settings.misc_hints:
# Ganon may still provide the Light Arrows hint
find_light_arrows(spoiler)
spoiler.build_file_hash()
Expand Down