X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=3741033be49af5ddaa44f803d072951186442243;hb=3f6aeac609f6337713f6cca17e4f54960ecf4d7f;hp=88a5211245c5d22661c6e8ae4460efd5abb44121;hpb=dcb275a3ae06858ba25eee3c5cd7ab6c1d44a4df;p=plomrogue2-experiments
diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 88a5211..3741033 100644
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -11,21 +11,26 @@ def cmd_ALL(game, msg, connection_id):
game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
cmd_ALL.argtypes = 'string'
+# TOOD split into two commands
def cmd_LOGIN(game, nick, connection_id):
for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
raise GameError('name already in use')
if connection_id in game.sessions:
t_id = game.sessions[connection_id]
t = game.get_thing(t_id, False)
- game.io.send('META ' + quote('you rename yourself to: ' + nick), connection_id)
+ old_nick = t.nickname
+ t.nickname = nick
+ game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
else:
t = game.thing_types['player'](game)
t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
game.things += [t] # TODO refactor into Thing.__init__?
game.sessions[connection_id] = t.id_
- game.io.send('META ' + quote('you are now: ' + nick), connection_id)
- t.nickname = nick
- game.io.send('PLAYER_ID %s' % t.id_, connection_id)
+ game.io.send('LOGIN_OK', connection_id)
+ t.nickname = nick
+ game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
+ game.io.send('PLAYER_ID %s' % t.id_, connection_id)
+ game.changed = True
cmd_LOGIN.argtypes = 'string'
def cmd_GET_GAMESTATE(game, connection_id):
@@ -64,6 +69,15 @@ def cmd_ANNOTATE(game, yx, msg, connection_id):
game.changed = True
cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+def cmd_PORTAL(game, yx, msg, connection_id):
+ if msg == ' ':
+ if yx in game.portals:
+ del game.portals[yx]
+ else:
+ game.portals[yx] = msg
+ game.changed = True
+cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
+
def cmd_GET_ANNOTATION(game, yx, connection_id):
annotation = '(none)';
if yx in game.annotations: