diff options
| author | Cerapter <cerap@protonmail.com> | 2018-09-03 12:55:57 +0200 |
|---|---|---|
| committer | Cerapter <cerap@protonmail.com> | 2018-09-03 12:55:57 +0200 |
| commit | 22e0cb8e1a97e57a6235c23afc6508f5e441aefc (patch) | |
| tree | c52badf9edec4561b4b158002266037d3f0d9a50 /server | |
| parent | 739142f8ddd194b7f4ed42fe813979655d04262a (diff) | |
Dual characters on screen Part 2.
- UI option to change pairup.
- Fixed a bug on the prosecution side.
- Dual characters now allow for iniswapped characters.
- Zooming now doesn't stay on the field, instead, the game defaults to
the last emote.
Diffstat (limited to 'server')
| -rw-r--r-- | server/aoprotocol.py | 8 | ||||
| -rw-r--r-- | server/client_manager.py | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/server/aoprotocol.py b/server/aoprotocol.py index 800ae6a..31b45d9 100644 --- a/server/aoprotocol.py +++ b/server/aoprotocol.py @@ -420,11 +420,14 @@ class AOProtocol(asyncio.Protocol): # and an other offset. self.client.charid_pair = charid_pair self.client.offset_pair = offset_pair - self.client.last_sprite = anim + if anim_type not in (5, 6): + self.client.last_sprite = anim self.client.flip = flip + self.client.claimed_folder = folder other_offset = 0 other_emote = '' other_flip = 0 + other_folder = '' confirmed = False if charid_pair > -1: @@ -434,6 +437,7 @@ class AOProtocol(asyncio.Protocol): other_offset = target.offset_pair other_emote = target.last_sprite other_flip = target.flip + other_folder = target.claimed_folder break if not confirmed: @@ -442,7 +446,7 @@ class AOProtocol(asyncio.Protocol): self.client.area.send_command('MS', msg_type, pre, folder, anim, msg, pos, sfx, anim_type, cid, sfx_delay, button, self.client.evi_list[evidence], flip, ding, color, showname, - charid_pair, other_emote, offset_pair, other_offset, other_flip) + charid_pair, other_folder, other_emote, offset_pair, other_offset, other_flip) self.client.area.set_next_msg_delay(len(msg)) logger.log_server('[IC][{}][{}]{}'.format(self.client.area.abbreviation, self.client.get_char_name(), msg), self.client) diff --git a/server/client_manager.py b/server/client_manager.py index ec9a26a..bb2bcd9 100644 --- a/server/client_manager.py +++ b/server/client_manager.py @@ -63,6 +63,7 @@ class ClientManager: self.offset_pair = 0 self.last_sprite = '' self.flip = 0 + self.claimed_folder = '' #flood-guard stuff self.mus_counter = 0 |