Skip to content
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

Core: Let location name groups work with /hint_location #2814

Merged
merged 3 commits into from
Apr 14, 2024
Merged

Core: Let location name groups work with /hint_location #2814

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f62a9f6
Let location name groups work with /hint_location
alwaysintreble Feb 12, 2024
e0dc1ab
Merge branch 'main' into server_hint_loc_group
alwaysintreble Mar 12, 2024
1378a22
check the client's game is in all names lookup
alwaysintreble Mar 12, 2024
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
9 changes: 7 additions & 2 deletions MultiServer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2086,15 +2086,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
Loading