Skip to content

Commit

Permalink
Core: Let location name groups work with /hint_location (ArchipelagoM…
Browse files Browse the repository at this point in the history
  • Loading branch information
alwaysintreble authored Apr 14, 2024
1 parent 5bda265 commit 98e2d89
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions MultiServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2090,15 +2090,20 @@ def _cmd_hint_location(self, player_name: str, *location_name: str) -> bool:

if full_name.isnumeric():
location, usable, response = int(full_name), True, None
elif self.ctx.location_names_for_game(game) is not None:
location, usable, response = get_intended_text(full_name, self.ctx.location_names_for_game(game))
elif game in self.ctx.all_location_and_group_names:
location, usable, response = get_intended_text(full_name, self.ctx.all_location_and_group_names[game])
else:
self.output("Can't look up location for unknown game. Hint for ID instead.")
return False

if usable:
if isinstance(location, int):
hints = collect_hint_location_id(self.ctx, team, slot, location)
elif game in self.ctx.location_name_groups and location in self.ctx.location_name_groups[game]:
hints = []
for loc_name_from_group in self.ctx.location_name_groups[game][location]:
if loc_name_from_group in self.ctx.location_names_for_game(game):
hints.extend(collect_hint_location_name(self.ctx, team, slot, loc_name_from_group))
else:
hints = collect_hint_location_name(self.ctx, team, slot, location)
if hints:
Expand Down

0 comments on commit 98e2d89

Please sign in to comment.