From: Christian Heller Date: Fri, 13 Nov 2020 20:23:49 +0000 (+0100) Subject: Remove chat QUERY. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/test.html?a=commitdiff_plain;h=e67306357a830cabdd5ce86b2b333499d99da325;p=plomrogue2 Remove chat QUERY. --- diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 0145157..8ec6f52 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -99,20 +99,20 @@ def cmd_GET_GAMESTATE(game, connection_id): game.send_gamestate(connection_id) cmd_GET_GAMESTATE.argtypes = '' -def cmd_QUERY(game, target_nick, msg, connection_id): - if not connection_id in game.sessions: - raise GameError('can only query when logged in') - t = game.get_thing(game.sessions[connection_id], False) - source_nick = t.nickname - for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]: - for c_id in game.sessions: - if game.sessions[c_id] == t.id_: - game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id) - game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id) - return - raise GameError('target user offline') - raise GameError('can only query with registered nicknames') -cmd_QUERY.argtypes = 'string string' +#def cmd_QUERY(game, target_nick, msg, connection_id): +# if not connection_id in game.sessions: +# raise GameError('can only query when logged in') +# t = game.get_thing(game.sessions[connection_id], False) +# source_nick = t.nickname +# for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]: +# for c_id in game.sessions: +# if game.sessions[c_id] == t.id_: +# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id) +# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id) +# return +# raise GameError('target user offline') +# raise GameError('can only query with registered nicknames') +#cmd_QUERY.argtypes = 'string string' def cmd_PING(game, connection_id): game.io.send('PONG', connection_id) diff --git a/rogue_chat.py b/rogue_chat.py index 948f698..4a9c56f 100755 --- a/rogue_chat.py +++ b/rogue_chat.py @@ -2,7 +2,7 @@ from plomrogue.game import Game from plomrogue.io_websocket import PlomWebSocketServer from plomrogue.io_tcp import PlomTCPServer -from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_QUERY, cmd_PING, +from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION, cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE, cmd_TASKS, cmd_MAP_CONTROL_LINE, cmd_MAP_CONTROL_PW, @@ -20,7 +20,6 @@ game.register_command(cmd_PING) game.register_command(cmd_ALL) game.register_command(cmd_LOGIN) game.register_command(cmd_NICK) -game.register_command(cmd_QUERY) game.register_command(cmd_TURN) game.register_command(cmd_MAP) game.register_command(cmd_MAP_LINE) diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index acd6fa1..3369aef 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -220,7 +220,7 @@ class TUI: self.mode_edit = self.Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.') self.mode_annotate = self.Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so). Hit Return to leave.', has_input_prompt=True, shows_info=True) self.mode_portal = self.Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so). Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target. Hit Return to leave.', has_input_prompt=True, shows_info=True) - self.mode_chat = self.Mode('chat', 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent to all users. Lines that start with a "/" are used for commands like:', has_input_prompt=True) + self.mode_chat = self.Mode('chat', 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:', has_input_prompt=True) self.mode_waiting_for_server = self.Mode('waiting_for_server', 'Waiting for a server response.', is_intro=True) self.mode_login = self.Mode('login', 'Pick your player name.', has_input_prompt=True, is_intro=True) self.mode_post_login_wait = self.Mode('post_login_wait', 'Waiting for a server response.', is_intro=True) @@ -533,7 +533,7 @@ class TUI: content += '[%s] – play mode\n' % self.keys['switch_to_play'] elif self.mode == self.mode_chat: content += '/nick NAME – re-name yourself to NAME\n' - content += '/msg USER TEXT – send TEXT to USER\n' + #content += '/msg USER TEXT – send TEXT to USER\n' content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play'] content += '/%s or /study – switch to study mode\n' % self.keys['switch_to_study'] for i in range(self.size.y): @@ -640,13 +640,13 @@ class TUI: self.send('NICK ' + quote(tokens[1])) else: self.log_msg('? need login name') - elif self.input_.startswith('/msg'): - tokens = self.input_.split(maxsplit=2) - if len(tokens) == 3: - self.send('QUERY %s %s' % (quote(tokens[1]), - quote(tokens[2]))) - else: - self.log_msg('? need message target and message') + #elif self.input_.startswith('/msg'): + # tokens = self.input_.split(maxsplit=2) + # if len(tokens) == 3: + # self.send('QUERY %s %s' % (quote(tokens[1]), + # quote(tokens[2]))) + # else: + # self.log_msg('? need message target and message') else: self.log_msg('? unknown command') else: diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html index 66cb795..e699a96 100644 --- a/rogue_chat_nocanvas_monochrome.html +++ b/rogue_chat_nocanvas_monochrome.html @@ -34,7 +34,8 @@ toggle terrain/control view (from study mode):