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

some pep8

This commit is contained in:
Fabian Dill 2020-02-22 18:09:25 +01:00
parent 09fba10a53
commit 5c6815c1f6
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MultiServer.py
View File

@ -27,7 +27,7 @@ class Client:
version: typing.List[int] = [0, 0, 0] version: typing.List[int] = [0, 0, 0]
tags: typing.List[str] = [] tags: typing.List[str] = []
def __init__(self, socket): def __init__(self, socket: websockets.server.WebSocketServerProtocol):
self.socket = socket self.socket = socket
self.auth = False self.auth = False
self.name = None self.name = None
@ -206,9 +206,11 @@ def get_connected_players_string(ctx : Context):
def get_received_items(ctx: Context, team: int, player: int): def get_received_items(ctx: Context, team: int, player: int):
return ctx.received_items.setdefault((team, player), []) return ctx.received_items.setdefault((team, player), [])
def tuplize_received_items(items): def tuplize_received_items(items):
return [(item.item, item.location, item.player) for item in items] return [(item.item, item.location, item.player) for item in items]
def send_new_items(ctx: Context): def send_new_items(ctx: Context):
for client in ctx.clients: for client in ctx.clients:
if not client.auth: if not client.auth:
@ -219,13 +221,13 @@ def send_new_items(ctx : Context):
client.send_index = len(items) client.send_index = len(items)
def forfeit_player(ctx: Context, team, slot): def forfeit_player(ctx: Context, team: int, slot: int):
all_locations = [values[0] for values in Regions.location_table.values() if type(values[0]) is int] all_locations = {values[0] for values in Regions.location_table.values() if type(values[0]) is int}
notify_all(ctx, "%s (Team #%d) has forfeited" % (ctx.player_names[(team, slot)], team + 1)) notify_all(ctx, "%s (Team #%d) has forfeited" % (ctx.player_names[(team, slot)], team + 1))
register_location_checks(ctx, team, slot, all_locations) register_location_checks(ctx, team, slot, all_locations)
def register_location_checks(ctx: Context, team, slot, locations): def register_location_checks(ctx: Context, team: int, slot: int, locations):
ctx.location_checks[team, slot] |= set(locations) ctx.location_checks[team, slot] |= set(locations)
found_items = False found_items = False
@ -275,6 +277,7 @@ def collect_hints(ctx: Context, team: int, slot: int, item: str) -> typing.List[
return hints return hints
def collect_hints_location(ctx: Context, team: int, slot: int, location: str) -> typing.List[Utils.Hint]: def collect_hints_location(ctx: Context, team: int, slot: int, location: str) -> typing.List[Utils.Hint]:
hints = [] hints = []
location = Regions.lookup_lower_name_to_name[location.lower()] location = Regions.lookup_lower_name_to_name[location.lower()]
@ -288,6 +291,7 @@ def collect_hints_location(ctx: Context, team: int, slot: int, location: str) ->
break # each location has 1 item break # each location has 1 item
return hints return hints
def format_hint(ctx: Context, team: int, hint: Utils.Hint) -> str: def format_hint(ctx: Context, team: int, hint: Utils.Hint) -> str:
return f"[Hint]: {ctx.player_names[team, hint.receiving_player]}'s " \ return f"[Hint]: {ctx.player_names[team, hint.receiving_player]}'s " \
f"{Items.lookup_id_to_name[hint.item]} can be found " \ f"{Items.lookup_id_to_name[hint.item]} can be found " \
@ -295,6 +299,7 @@ def format_hint(ctx: Context, team: int, hint: Utils.Hint) -> str:
f"in {ctx.player_names[team, hint.finding_player]}'s World." \ f"in {ctx.player_names[team, hint.finding_player]}'s World." \
+ (" (found)" if hint.found else "") + (" (found)" if hint.found else "")
def get_intended_text(input_text: str, possible_answers: typing.Iterable[str]= console_names) -> typing.Tuple[str, bool, str]: def get_intended_text(input_text: str, possible_answers: typing.Iterable[str]= console_names) -> typing.Tuple[str, bool, str]:
picks = fuzzy_process.extract(input_text, possible_answers, limit=2) picks = fuzzy_process.extract(input_text, possible_answers, limit=2)
dif = picks[0][1] - picks[1][1] dif = picks[0][1] - picks[1][1]
@ -307,6 +312,7 @@ def get_intended_text(input_text: str, possible_answers: typing.Iterable[str]= c
else: else:
return picks[0][0], False, f"Too many close matches, did you mean {picks[0][0]}?" return picks[0][0], False, f"Too many close matches, did you mean {picks[0][0]}?"
async def process_client_cmd(ctx: Context, client: Client, cmd, args): async def process_client_cmd(ctx: Context, client: Client, cmd, args):
if type(cmd) is not str: if type(cmd) is not str:
await send_msgs(client.socket, [['InvalidCmd']]) await send_msgs(client.socket, [['InvalidCmd']])
@ -462,11 +468,11 @@ async def process_client_cmd(ctx: Context, client: Client, cmd, args):
notify_client(client, response) notify_client(client, response)
def set_password(ctx : Context, password): def set_password(ctx : Context, password):
ctx.password = password ctx.password = password
logging.warning('Password set to ' + password if password else 'Password disabled') logging.warning('Password set to ' + password if password else 'Password disabled')
async def console(ctx : Context): async def console(ctx : Context):
while True: while True:
input = await aioconsole.ainput() input = await aioconsole.ainput()
@ -551,6 +557,7 @@ async def console(ctx : Context):
import traceback import traceback
traceback.print_exc() traceback.print_exc()
async def main(): async def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--host', default=None) parser.add_argument('--host', default=None)