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

Area numbers replaced by area abbreviations.

Browse Source
This commit is contained in:
Cerapter 2018-08-12 00:12:09 +02:00
parent c22606b5a7
commit 3759131a8f
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/aoprotocol.py
View File

@ -603,15 +603,13 @@ class AOProtocol(asyncio.Protocol):
current_time = strftime("%H:%M", localtime())
if len(args) < 1:
self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} ({}) without reason (not using the Case Café client?)'
.format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name,
self.client.area.id), pred=lambda c: c.is_mod)
self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} without reason (not using the Case Café client?)'
.format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name), pred=lambda c: c.is_mod)
self.client.set_mod_call_delay()
logger.log_server('[{}][{}]{} called a moderator.'.format(self.client.get_ip(), self.client.area.id, self.client.get_char_name()))
else:
self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} ({}) with reason: {}'
.format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name,
self.client.area.id, args[0][:100]), pred=lambda c: c.is_mod)
self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} with reason: {}'
.format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name, args[0][:100]), pred=lambda c: c.is_mod)
self.client.set_mod_call_delay()
logger.log_server('[{}][{}]{} called a moderator: {}.'.format(self.client.get_ip(), self.client.area.id, self.client.get_char_name(), args[0]))

12
server/area_manager.py
View File

@ -187,6 +187,18 @@ class AreaManager:
"""
for client in self.clients:
client.send_command('LE', *self.get_evidence_list(client))
def get_abbreviation(self):
if self.name.lower().startswith("courtroom"):
return "CR" + self.name.split()[-1]
elif self.name.lower().startswith("area"):
return "A" + self.name.split()[-1]
elif len(self.name.split()) > 1:
return "".join(item[0].upper() for item in self.name.split())
elif len(self.name) > 3:
return self.name[:3].upper()
else:
return self.name.upper()
def __init__(self, server):

4
server/client_manager.py
View File

@ -203,7 +203,7 @@ class ClientManager:
for client in [x for x in area.clients if x.is_cm]:
owner = 'MASTER: {}'.format(client.get_char_name())
break
msg += '\r\nArea {}: {} (users: {}) [{}][{}]{}'.format(i, area.name, len(area.clients), area.status, owner, lock[area.is_locked])
msg += '\r\nArea {}: {} (users: {}) [{}][{}]{}'.format(area.get_abbreviation(), area.name, len(area.clients), area.status, owner, lock[area.is_locked])
if self.area == area:
msg += ' [*]'
self.send_host_message(msg)
@ -214,7 +214,7 @@ class ClientManager:
area = self.server.area_manager.get_area_by_id(area_id)
except AreaError:
raise
info += '= Area {}: {} =='.format(area.id, area.name)
info += '=== {} ==='.format(area.name)
sorted_clients = []
for client in area.clients:
if (not mods) or client.is_mod:

2
server/commands.py
View File

@ -593,7 +593,7 @@ def ooc_cmd_invite(client, arg):
c = client.server.client_manager.get_targets(client, TargetType.ID, int(arg), False)[0]
client.area.invite_list[c.ipid] = None
client.send_host_message('{} is invited to your area.'.format(c.get_char_name()))
c.send_host_message('You were invited and given access to area {}.'.format(client.area.id))
c.send_host_message('You were invited and given access to {}.'.format(client.area.name))
except:
raise ClientError('You must specify a target. Use /invite <id>')

4
server/tsuserver.py
View File

@ -232,7 +232,7 @@ class TsuServer3:
def broadcast_global(self, client, msg, as_mod=False):
char_name = client.get_char_name()
ooc_name = '{}[{}][{}]'.format('<dollar>G', client.area.id, char_name)
ooc_name = '{}[{}][{}]'.format('<dollar>G', client.area.get_abbreviation(), char_name)
if as_mod:
ooc_name += '[M]'
self.send_all_cmd_pred('CT', ooc_name, msg, pred=lambda x: not x.muted_global)
@ -243,7 +243,7 @@ class TsuServer3:
def broadcast_need(self, client, msg):
char_name = client.get_char_name()
area_name = client.area.name
area_id = client.area.id
area_id = client.area.get_abbreviation()
self.send_all_cmd_pred('CT', '{}'.format(self.config['hostname']),
'=== Advert ===\r\n{} in {} [{}] needs {}\r\n==============='
.format(char_name, area_name, area_id, msg), pred=lambda x: not x.muted_adverts)