monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OoT: add misc_hints option

This commit is contained in:
espeon65536 2021-11-15 08:38:32 -06:00
parent af9ab30bdf
commit 4709902819
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/oot/Hints.py
View File

@ -649,9 +649,9 @@ def buildWorldGossipHints(world, checkedLocations=None):
if checkedLocations is None: if checkedLocations is None:
checkedLocations = {player: set() for player in world.world.player_ids} 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 # 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: try:
light_arrow_location = world.world.find_item("Light Arrows", world.player) light_arrow_location = world.world.find_item("Light Arrows", world.player)
checkedLocations[light_arrow_location.player].add(light_arrow_location.name) checkedLocations[light_arrow_location.player].add(light_arrow_location.name)

5
worlds/oot/Options.py
View File

@ -563,6 +563,11 @@ class Hints(Choice):
alias_false = 0 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): class HintDistribution(Choice):
"""Choose the hint distribution to use. Affects the frequency of strong hints, which items are always hinted, etc.""" """Choose the hint distribution to use. Affects the frequency of strong hints, which items are always hinted, etc."""
displayname = "Hint Distribution" displayname = "Hint Distribution"

1
worlds/oot/__init__.py
View File

@ -191,7 +191,6 @@ class OOTWorld(World):
self.keysanity = self.shuffle_smallkeys in ['keysanity', 'remove', 'any_dungeon', 'overworld'] self.keysanity = self.shuffle_smallkeys in ['keysanity', 'remove', 'any_dungeon', 'overworld']
# Hint stuff # 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.clearer_hints = True # this is being enforced since non-oot items do not have non-clear hint text
self.gossip_hints = {} self.gossip_hints = {}
self.required_locations = [] self.required_locations = []