X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=97001e0a313f294854eeed5165944418ad1e44e6;hb=1d9e41e7df05336a6688382c9374c547979cf11e;hp=861aa64d8a65e5f231e3edccfe4dc9c9fd463a4f;hpb=17297a31bffcb7f6175498951365d92c2c638641;p=plomrogue2-experiments

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 861aa64..97001e0 100644
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -1,5 +1,6 @@
 from plomrogue.misc import quote
 from plomrogue.errors import GameError
+from plomrogue.mapping import YX
 
 
 
@@ -10,22 +11,32 @@ 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):
+    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')
@@ -49,11 +60,26 @@ 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_ANNOTATE(game, yx, msg, connection_id):
+    if msg == ' ':
+        if yx in game.annotations:
+            del game.annotations[yx]
+    else:
+        game.annotations[yx] = msg
+    game.changed = True
+cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+
+def cmd_GET_ANNOTATION(game, yx, connection_id):
+    annotation = '(none)';
+    if yx in game.annotations:
+        annotation = game.annotations[yx]
+    game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
+cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
+
 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)
+    game.new_world(size)
 cmd_MAP.argtypes = 'yx_tuple:pos'