Skip to content

Fix misc. location hints not being counted as always hints #2391

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

Open
wants to merge 4 commits into
base: Dev
Choose a base branch
from
Open

Fix misc. location hints not being counted as always hints #2391

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
821b3dc
Fix misc. location hints not being counted as always hints
fenhl Mar 20, 2025
f66d4c6
Fix location name being used instead of location
fenhl Mar 20, 2025
d5d3a48
Fix previous fix
fenhl Mar 20, 2025
a797ead
Account for non-location names in checked_always_locations
fenhl Mar 20, 2025
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
42 changes: 18 additions & 24 deletions Hints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,20 +1258,11 @@ def build_bingo_hint_list(board_url: str) -> list[str]:
return hints


def always_named_item(world: World, locations: Iterable[Location]):
for location in locations:
if location.item.name in bingoBottlesForHints and world.settings.hint_dist == 'bingo':
always_item = 'Bottle'
else:
always_item = location.item.name
if always_item in world.named_item_pool and world.settings.world_count == 1:
world.named_item_pool.remove(always_item)


def build_gossip_hints(spoiler: Spoiler, worlds: list[World]) -> None:
from Dungeon import Dungeon

checked_locations = dict()
checked_locations = {}
checked_always_locations = {}
# Add misc. item hint locations to "checked" locations if the respective hint is reachable without the hinted item.
for world in worlds:
for location in world.hinted_dungeon_reward_locations.values():
Expand Down Expand Up @@ -1327,18 +1318,18 @@ def build_gossip_hints(spoiler: Spoiler, worlds: list[World]) -> None:
location = world.get_location(misc_location_hint_table[hint_type]['item_location'])
if hint_type in world.settings.misc_hints and can_reach_hint(worlds, world.get_location(misc_location_hint_table[hint_type]['hint_location']), location):
item_world = location.world
if item_world.id not in checked_locations:
checked_locations[item_world.id] = set()
checked_locations[item_world.id].add(location.name)
if item_world.id not in checked_always_locations:
checked_always_locations[item_world.id] = set()
checked_always_locations[item_world.id].add(location.name)

# Build all the hints.
for world in worlds:
world.update_useless_areas(spoiler)
build_world_gossip_hints(spoiler, world, checked_locations.pop(world.id, None))
build_world_gossip_hints(spoiler, world, checked_locations.pop(world.id, set()), checked_always_locations.pop(world.id, set()))


# builds out general hints based on location and whether an item is required or not
def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations: Optional[set[str]] = None) -> None:
def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations: set[str], checked_always_locations: set[str]) -> None:
world.barren_dungeon = 0
world.woth_dungeon = 0

Expand All @@ -1348,10 +1339,6 @@ def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations:
search.spot_access(world.get_location(stone.location))
and search.state_list[world.id].guarantee_hint())

if checked_locations is None:
checked_locations = set()
checked_always_locations = set()

stone_ids = list(gossipLocations.keys())

world.distribution.configure_gossip(spoiler, stone_ids)
Expand Down Expand Up @@ -1472,8 +1459,6 @@ def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations:
checked_always_locations.add(first_location.name)
checked_always_locations.add(second_location.name)

always_named_item(world, [first_location, second_location])

if hint.name in world.hint_text_overrides:
location_text = world.hint_text_overrides[hint.name]
else:
Expand All @@ -1495,8 +1480,6 @@ def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations:
location = world.get_location(hint.name)
checked_always_locations.add(hint.name)

always_named_item(world, [location])

if location.name in world.hint_text_overrides:
location_text = world.hint_text_overrides[location.name]
else:
Expand Down Expand Up @@ -1553,6 +1536,17 @@ def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations:

# Add user-specified hinted item locations if using a built-in hint distribution
# Raise error if hint copies is zero
for location_name in checked_always_locations:
try:
location = world.get_location(location_name)
except KeyError:
continue
if location.item.name in bingoBottlesForHints and world.settings.hint_dist == 'bingo':
always_item = 'Bottle'
else:
always_item = location.item.name
if always_item in world.named_item_pool and world.settings.world_count == 1:
world.named_item_pool.remove(always_item)
if len(world.named_item_pool) > 0 and world.hint_dist_user['named_items_required']:
if hint_dist['named-item'][1] == 0:
raise Exception('User-provided item hints were requested, but copies per named-item hint is zero')
Expand Down