X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=861aa64d8a65e5f231e3edccfe4dc9c9fd463a4f;hb=17297a31bffcb7f6175498951365d92c2c638641;hp=8175b2ecdb997f5db4c62eb585f26ec90626567a;hpb=e6e708c2398e9d5130fcc54e36e81c9dc68707ff;p=plomrogue2-experiments diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py index 8175b2e..861aa64 100644 --- a/new2/plomrogue/commands.py +++ b/new2/plomrogue/commands.py @@ -7,7 +7,7 @@ def cmd_ALL(game, msg, connection_id): if not connection_id in game.sessions: raise GameError('need to be logged in for this') t = game.get_thing(game.sessions[connection_id], False) - game.io.send('LOG ' + quote(t.nickname + ': ' + msg)) + game.io.send('CHAT ' + quote(t.nickname + ': ' + msg)) cmd_ALL.argtypes = 'string' def cmd_LOGIN(game, nick, connection_id): @@ -34,8 +34,8 @@ def cmd_QUERY(game, target_nick, msg, connection_id): 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('LOG ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id) - game.io.send('LOG ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_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') @@ -49,6 +49,11 @@ def cmd_TURN(game, n): game.turn = n cmd_TURN.argtypes = 'int:nonneg' +# TODO: disallow these commands from clients? (maybe by failing on connection_id?) def cmd_MAP_LINE(game, y, line): game.map.set_line(y, line) cmd_MAP_LINE.argtypes = 'int:nonneg string' + +def cmd_MAP(game, size): + game.new_map(size) +cmd_MAP.argtypes = 'yx_tuple:pos'