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

allow more HK names in console commands

This commit is contained in:
Fabian Dill 2021-03-19 04:30:19 +01:00
parent 8d6bec8b9a
commit cdc330629b
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Main.py
View File

@ -487,7 +487,8 @@ def main(args, seed=None):
multidata = zlib.compress(pickle.dumps({"names": parsed_names, multidata = zlib.compress(pickle.dumps({"names": parsed_names,
"connect_names": connect_names, "connect_names": connect_names,
"remote_items": {player for player in range(1, world.players + 1) if "remote_items": {player for player in range(1, world.players + 1) if
world.remote_items[player]}, world.remote_items[player] or
world.game[player] == "Hollow Knight"},
"locations": { "locations": {
(location.address, location.player): (location.address, location.player):
(location.item.code, location.item.player) (location.item.code, location.item.player)

14
MultiServer.py
View File

@ -26,7 +26,8 @@ from prompt_toolkit.patch_stdout import patch_stdout
from fuzzywuzzy import process as fuzzy_process from fuzzywuzzy import process as fuzzy_process
from worlds.alttp import Items, Regions from worlds.alttp import Items, Regions
from worlds import network_data_package from worlds import network_data_package, lookup_any_item_id_to_name, lookup_any_item_name_to_id, \
lookup_any_location_id_to_name
import Utils import Utils
from Utils import get_item_name_from_id, get_location_name_from_address, \ from Utils import get_item_name_from_id, get_location_name_from_address, \
_version_tuple, restricted_loads, Version _version_tuple, restricted_loads, Version
@ -34,8 +35,8 @@ from NetUtils import Node, Endpoint, CLientStatus, NetworkItem, decode
colorama.init() colorama.init()
lttp_console_names = frozenset(set(Items.item_table) | set(Items.item_name_groups) | set(Regions.lookup_name_to_id)) lttp_console_names = frozenset(set(Items.item_table) | set(Items.item_name_groups) | set(Regions.lookup_name_to_id))
all_items = frozenset(network_data_package["lookup_any_item_id_to_name"].values()) all_items = frozenset(lookup_any_item_id_to_name)
all_locations = frozenset(network_data_package["lookup_any_location_id_to_name"].values()) all_locations = frozenset(lookup_any_location_id_to_name)
all_console_names = frozenset(all_items | all_locations) all_console_names = frozenset(all_items | all_locations)
class Client(Endpoint): class Client(Endpoint):
@ -1188,9 +1189,10 @@ class ServerCommandProcessor(CommonCommandProcessor):
if usable: if usable:
for client in self.ctx.endpoints: for client in self.ctx.endpoints:
if client.name == seeked_player: if client.name == seeked_player:
new_item = NetworkItem(Items.item_table[item][2], -1, client.slot) new_item = NetworkItem(lookup_any_item_name_to_id[item], -1, client.slot)
get_received_items(self.ctx, client.team, client.slot).append(new_item) get_received_items(self.ctx, client.team, client.slot).append(new_item)
self.ctx.notify_all('Cheat console: sending "' + item + '" to ' + self.ctx.get_aliased_name(client.team, client.slot)) self.ctx.notify_all('Cheat console: sending "' + item + '" to ' +
self.ctx.get_aliased_name(client.team, client.slot))
send_new_items(self.ctx) send_new_items(self.ctx)
return True return True
else: else:
@ -1213,7 +1215,7 @@ class ServerCommandProcessor(CommonCommandProcessor):
hints = [] hints = []
for item in Items.item_name_groups[item]: for item in Items.item_name_groups[item]:
hints.extend(collect_hints(self.ctx, team, slot, item)) hints.extend(collect_hints(self.ctx, team, slot, item))
elif item in Items.item_table: # item name elif item in all_items: # item name
hints = collect_hints(self.ctx, team, slot, item) hints = collect_hints(self.ctx, team, slot, item)
else: # location name else: # location name
hints = collect_hints_location(self.ctx, team, slot, item) hints = collect_hints_location(self.ctx, team, slot, item)

2
worlds/__init__.py
View File

@ -14,7 +14,7 @@ lookup_any_item_name_to_id = {name: id for id, name in lookup_any_item_id_to_nam
from .alttp import Regions from .alttp import Regions
from .hk import Locations from .hk import Locations
lookup_any_location_id_to_name = {**Regions.lookup_id_to_name, **Locations.lookup_id_to_name} lookup_any_location_id_to_name = {**Regions.lookup_id_to_name, **Locations.lookup_id_to_name}
lookup_any_location_name_to_id = {name: id for id, name in lookup_any_location_id_to_name.items()}
network_data_package = {"lookup_any_location_id_to_name": lookup_any_location_id_to_name, network_data_package = {"lookup_any_location_id_to_name": lookup_any_location_id_to_name,
"lookup_any_item_id_to_name": lookup_any_item_id_to_name, "lookup_any_item_id_to_name": lookup_any_item_id_to_name,
"version": 1} "version": 1}