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

Update messages that get sent to client with aliases.

This commit is contained in:
caitsith2 2020-04-27 23:49:46 -07:00
parent 00da5dfd65
commit 7a3511e1ef
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MultiServer.py
View File

@ -263,7 +263,7 @@ async def on_client_joined(ctx: Context, client: Client):
client.tags)) client.tags))
async def on_client_left(ctx: Context, client: Client): async def on_client_left(ctx: Context, client: Client):
notify_all(ctx, "%s (Team #%d) has left the game" % (client.name, client.team + 1)) notify_all(ctx, "%s (Team #%d) has left the game" % (ctx.get_aliased_name(client.team, client.slot), client.team + 1))
async def countdown(ctx: Context, timer): async def countdown(ctx: Context, timer):
notify_all(ctx, f'[Server]: Starting countdown of {timer}s') notify_all(ctx, f'[Server]: Starting countdown of {timer}s')
@ -638,7 +638,7 @@ class ClientMessageProcessor(CommandProcessor):
if usable: if usable:
new_item = ReceivedItem(Items.item_table[item_name][3], -1, self.client.slot) new_item = ReceivedItem(Items.item_table[item_name][3], -1, self.client.slot)
get_received_items(self.ctx, self.client.team, self.client.slot).append(new_item) get_received_items(self.ctx, self.client.team, self.client.slot).append(new_item)
notify_all(self.ctx, 'Cheat console: sending "' + item_name + '" to ' + self.client.name) notify_all(self.ctx, 'Cheat console: sending "' + item_name + '" to ' + self.ctx.get_aliased_name(self.client.team, self.client.slot))
send_new_items(self.ctx) send_new_items(self.ctx)
return True return True
else: else:
@ -798,7 +798,7 @@ async def process_client_cmd(ctx: Context, client: Client, cmd, args):
elif cmd == 'GameFinished': elif cmd == 'GameFinished':
if ctx.client_game_state[client.team, client.slot] != CLIENT_GOAL: if ctx.client_game_state[client.team, client.slot] != CLIENT_GOAL:
finished_msg = f'{client.name} (Team #{client.team + 1}) has found the triforce.' finished_msg = f'{ctx.get_aliased_name(client.team, client.slot)} (Team #{client.team + 1}) has found the triforce.'
notify_all(ctx, finished_msg) notify_all(ctx, finished_msg)
print(finished_msg) print(finished_msg)
ctx.client_game_state[client.team, client.slot] = CLIENT_GOAL ctx.client_game_state[client.team, client.slot] = CLIENT_GOAL
@ -835,7 +835,7 @@ class ServerCommandProcessor(CommandProcessor):
for client in self.ctx.clients: for client in self.ctx.clients:
if client.auth and client.name.lower() == player_name.lower() and client.socket and not client.socket.closed: if client.auth and client.name.lower() == player_name.lower() and client.socket and not client.socket.closed:
asyncio.create_task(client.socket.close()) asyncio.create_task(client.socket.close())
self.output(f"Kicked {client.name}") self.output(f"Kicked {self.ctx.get_aliased_name(client.team, client.slot)}")
return True return True
self.output(f"Could not find player {player_name} to kick") self.output(f"Could not find player {player_name} to kick")
@ -911,7 +911,7 @@ class ServerCommandProcessor(CommandProcessor):
if client.name == seeked_player: if client.name == seeked_player:
new_item = ReceivedItem(Items.item_table[item][3], -1, client.slot) new_item = ReceivedItem(Items.item_table[item][3], -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)
notify_all(self.ctx, 'Cheat console: sending "' + item + '" to ' + client.name) notify_all(self.ctx, '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: