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

The Witness: Make item links work properly with the hint system (#3110)

This commit is contained in:
NewSoupVi 2024-04-18 18:57:22 +02:00 committed by GitHub
parent 233eba6681
commit fbfe82f57f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
worlds/witness/hints.py
View File

@ -2,7 +2,7 @@ import logging
from dataclasses import dataclass
from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple, Union
from BaseClasses import CollectionState, Item, Location, LocationProgressType
from BaseClasses import CollectionState, Item, Location, LocationProgressType, MultiWorld
from .data import static_logic as static_witness_logic
from .data.utils import weighted_sample
@ -184,17 +184,26 @@ def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> Witnes
def hint_from_item(world: "WitnessWorld", item_name: str, own_itempool: List[Item]) -> Optional[WitnessLocationHint]:
def get_real_location(multiworld: MultiWorld, location: Location):
"""If this location is from an item_link pseudo-world, get the location that the item_link item is on.
Return the original location otherwise / as a fallback."""
if location.player not in world.multiworld.groups:
return location
locations = [item.location for item in own_itempool if item.name == item_name and item.location]
try:
return multiworld.find_item(location.item.name, location.player)
except StopIteration:
return location
locations = [
get_real_location(world.multiworld, item.location)
for item in own_itempool if item.name == item_name and item.location
]
if not locations:
return None
location_obj = world.random.choice(locations)
location_name = location_obj.name
if location_obj.player != world.player:
location_name += " (" + world.multiworld.get_player_name(location_obj.player) + ")"
return WitnessLocationHint(location_obj, False)