From 98e2d89a1c98c1c4d3f4c53f66511e5cdd2ce366 Mon Sep 17 00:00:00 2001 From: Aaron Wagener Date: Sat, 13 Apr 2024 19:25:27 -0500 Subject: [PATCH] Core: Let location name groups work with /hint_location (#2814) --- MultiServer.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index b70f2dea..f12e96c8 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -2090,8 +2090,8 @@ class ServerCommandProcessor(CommonCommandProcessor): 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 @@ -2099,6 +2099,11 @@ class ServerCommandProcessor(CommonCommandProcessor): 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: