Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMs now get /rollp results + KK and KB package.

Browse Source
This commit is contained in:
Cerapter 2018-09-18 21:17:57 +02:00
parent 0156849cc2
commit c68c9daf27
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/commands.py
View File

@ -185,11 +185,9 @@ def ooc_cmd_rollp(client, arg):
roll = '(' + roll + ')' roll = '(' + roll + ')'
client.send_host_message('{} rolled {} out of {}.'.format(client.get_char_name(), roll, val[0])) client.send_host_message('{} rolled {} out of {}.'.format(client.get_char_name(), roll, val[0]))
for c in client.area.clients: client.area.send_host_message('{} rolled in secret.'.format(client.get_char_name()))
if c.is_cm: for c in client.area.owners:
c.send_host_message('{} secretly rolled {} out of {}.'.format(client.get_char_name(), roll, val[0])) c.send_host_message('[{}]{} secretly rolled {} out of {}.'.format(client.area.abbreviation, client.get_char_name(), roll, val[0]))
else:
c.send_host_message('{} rolled in secret.'.format(client.get_char_name()))
logger.log_server( logger.log_server(
'[{}][{}]Used /rollp and got {} out of {}.'.format(client.area.abbreviation, client.get_char_name(), roll, val[0]), client) '[{}][{}]Used /rollp and got {} out of {}.'.format(client.area.abbreviation, client.get_char_name(), roll, val[0]), client)
@ -371,6 +369,7 @@ def ooc_cmd_kick(client, arg):
logger.log_server('Kicked {} [{}]({}).'.format(c.get_char_name(), c.id, c.ipid), client) logger.log_server('Kicked {} [{}]({}).'.format(c.get_char_name(), c.id, c.ipid), client)
logger.log_mod('Kicked {} [{}]({}).'.format(c.get_char_name(), c.id, c.ipid), client) logger.log_mod('Kicked {} [{}]({}).'.format(c.get_char_name(), c.id, c.ipid), client)
client.send_host_message("{} was kicked.".format(c.get_char_name())) client.send_host_message("{} was kicked.".format(c.get_char_name()))
c.send_command('KK', c.char_id)
c.disconnect() c.disconnect()
else: else:
client.send_host_message("No targets with the IPID {} were found.".format(ipid)) client.send_host_message("No targets with the IPID {} were found.".format(ipid))
@ -395,6 +394,7 @@ def ooc_cmd_ban(client, arg):
targets = client.server.client_manager.get_targets(client, TargetType.IPID, ipid, False) targets = client.server.client_manager.get_targets(client, TargetType.IPID, ipid, False)
if targets: if targets:
for c in targets: for c in targets:
c.send_command('KB', c.char_id)
c.disconnect() c.disconnect()
client.send_host_message('{} clients was kicked.'.format(len(targets))) client.send_host_message('{} clients was kicked.'.format(len(targets)))
client.send_host_message('{} was banned.'.format(ipid)) client.send_host_message('{} was banned.'.format(ipid))