diff --git a/worlds/oot/Hints.py b/worlds/oot/Hints.py index 014b852f..246ad6d9 100644 --- a/worlds/oot/Hints.py +++ b/worlds/oot/Hints.py @@ -649,9 +649,9 @@ def buildWorldGossipHints(world, checkedLocations=None): if checkedLocations is None: checkedLocations = {player: set() for player in world.world.player_ids} - # If Ganondorf can be reached without Light Arrows, add to checkedLocations to prevent extra hinting + # If Ganondorf hints Light Arrows and is reachable without them, add to checkedLocations to prevent extra hinting # Can only be forced with vanilla bridge or trials - if world.bridge != 'vanilla' and world.trials == 0: + if world.bridge != 'vanilla' and world.trials == 0 and world.misc_hints: try: light_arrow_location = world.world.find_item("Light Arrows", world.player) checkedLocations[light_arrow_location.player].add(light_arrow_location.name) diff --git a/worlds/oot/Options.py b/worlds/oot/Options.py index b37233bc..833a44fe 100644 --- a/worlds/oot/Options.py +++ b/worlds/oot/Options.py @@ -563,6 +563,11 @@ class Hints(Choice): alias_false = 0 +class MiscHints(DefaultOnToggle): + """Controls whether the Temple of Time altar gives dungeon prize info and whether Ganondorf hints the Light Arrows.""" + displayname = "Misc Hints" + + class HintDistribution(Choice): """Choose the hint distribution to use. Affects the frequency of strong hints, which items are always hinted, etc.""" displayname = "Hint Distribution" diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index be894682..8bfbb71c 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -191,7 +191,6 @@ class OOTWorld(World): self.keysanity = self.shuffle_smallkeys in ['keysanity', 'remove', 'any_dungeon', 'overworld'] # Hint stuff - self.misc_hints = True # this is just always on self.clearer_hints = True # this is being enforced since non-oot items do not have non-clear hint text self.gossip_hints = {} self.required_locations = []