diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/aoprotocol.py | 2 | ||||
| -rw-r--r-- | server/client_manager.py | 4 | ||||
| -rw-r--r-- | server/evidence.py | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/server/aoprotocol.py b/server/aoprotocol.py index 4e725d05..d7a2c6c3 100644 --- a/server/aoprotocol.py +++ b/server/aoprotocol.py @@ -427,7 +427,7 @@ class AOProtocol(asyncio.Protocol): if self.client.pos: pos = self.client.pos else: - if pos not in ('def', 'pro', 'hld', 'hlp', 'jud', 'wit'): + if pos not in ('def', 'pro', 'hld', 'hlp', 'jud', 'wit', 'jur', 'sea'): return msg = text[:256] if self.client.shaken: diff --git a/server/client_manager.py b/server/client_manager.py index 23102986..5e6825bb 100644 --- a/server/client_manager.py +++ b/server/client_manager.py @@ -345,8 +345,8 @@ class ClientManager: return self.server.char_list[self.char_id] def change_position(self, pos=''): - if pos not in ('', 'def', 'pro', 'hld', 'hlp', 'jud', 'wit'): - raise ClientError('Invalid position. Possible values: def, pro, hld, hlp, jud, wit.') + if pos not in ('', 'def', 'pro', 'hld', 'hlp', 'jud', 'wit', 'jur', 'sea'): + raise ClientError('Invalid position. Possible values: def, pro, hld, hlp, jud, wit, jur, sea.') self.pos = pos def set_mod_call_delay(self): diff --git a/server/evidence.py b/server/evidence.py index ddd9ba30..efa2e254 100644 --- a/server/evidence.py +++ b/server/evidence.py @@ -24,7 +24,16 @@ class EvidenceList: def __init__(self): self.evidences = [] - self.poses = {'def':['def', 'hld'], 'pro':['pro', 'hlp'], 'wit':['wit'], 'hlp':['hlp', 'pro'], 'hld':['hld', 'def'], 'jud':['jud'], 'all':['hlp', 'hld', 'wit', 'jud', 'pro', 'def', ''], 'pos':[]} + self.poses = {'def':['def', 'hld'], + 'pro':['pro', 'hlp'], + 'wit':['wit', 'sea'], + 'sea':['sea', 'wit'], + 'hlp':['hlp', 'pro'], + 'hld':['hld', 'def'], + 'jud':['jud', 'jur'], + 'jur':['jur', 'jud'], + 'all':['hlp', 'hld', 'wit', 'jud', 'pro', 'def', 'jur', 'sea', ''], + 'pos':[]} def login(self, client): if client.area.evidence_mod == 'FFA': |