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

extend hint system with group names

This commit is contained in:
Fabian Dill 2020-06-07 00:19:19 +02:00
parent fbd00136e7
commit 00d7667771
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MultiServer.py
View File

@ -27,7 +27,7 @@ import Utils
from Utils import get_item_name_from_id, get_location_name_from_address, ReceivedItem from Utils import get_item_name_from_id, get_location_name_from_address, ReceivedItem
from NetUtils import Node, Endpoint from NetUtils import Node, Endpoint
console_names = frozenset(set(Items.item_table) | set(Regions.location_table)) console_names = frozenset(set(Items.item_table) | set(Regions.location_table) | set(Items.item_name_groups))
CLIENT_PLAYING = 0 CLIENT_PLAYING = 0
CLIENT_GOAL = 1 CLIENT_GOAL = 1
@ -668,6 +668,10 @@ class ClientMessageProcessor(CommandProcessor):
if item_name in Items.hint_blacklist: if item_name in Items.hint_blacklist:
self.output(f"Sorry, \"{item_name}\" is marked as non-hintable.") self.output(f"Sorry, \"{item_name}\" is marked as non-hintable.")
hints = [] hints = []
elif item_name in Items.item_name_groups:
hints = []
for item in Items.item_name_groups[item_name]:
hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item))
elif item_name in Items.item_table: # item name elif item_name in Items.item_table: # item name
hints = collect_hints(self.ctx, self.client.team, self.client.slot, item_name) hints = collect_hints(self.ctx, self.client.team, self.client.slot, item_name)
else: # location name else: # location name
@ -929,12 +933,15 @@ class ServerCommandProcessor(CommandProcessor):
item = " ".join(item_or_location) item = " ".join(item_or_location)
item, usable, response = get_intended_text(item) item, usable, response = get_intended_text(item)
if usable: if usable:
if item in Items.item_table: # item name if item in Items.item_name_groups:
hints = []
for item in Items.item_name_groups[item]:
hints.extend(collect_hints(self.ctx, team, slot, item))
elif item in Items.item_table: # item name
hints = collect_hints(self.ctx, team, slot, item) hints = collect_hints(self.ctx, team, slot, item)
notify_hints(self.ctx, team, hints)
else: # location name else: # location name
hints = collect_hints_location(self.ctx, team, slot, item) hints = collect_hints_location(self.ctx, team, slot, item)
notify_hints(self.ctx, team, hints) notify_hints(self.ctx, team, hints)
return True return True
else: else:
self.output(response) self.output(response)