X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=df347289f64459ce4718df6aefb6a87a6ec920d2;hb=47d047c10bacf2463f48aec3e7f3cc3b92a78198;hp=a68efc230a8791aa8ee4294bd07dea2ccbb42788;hpb=33bfdaf647c6736d99aadc017ee935f3301d758a;p=plomrogue2-experiments

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index a68efc2..df34728 100644
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -1,29 +1,28 @@
 from plomrogue.misc import quote
+from plomrogue.errors import GameError
 
 
 
 def cmd_ALL(game, msg, connection_id):
     if not connection_id in game.sessions:
-        game.io.send('LOG' + quote('need to be logged in for this'), connection_id)
-        return
+        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))
 cmd_ALL.argtypes = 'string'
 
 def cmd_LOGIN(game, nick, connection_id):
     for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
-        game.io.send('LOG ' + quote('name already in use'), connection_id)
-        return
+        raise GameError('name already in use')
     t = game.thing_types['player'](game)
     t.nickname = nick
     game.things += [t]  # TODO refactor into Thing.__init__?
     game.sessions[connection_id] = t.id_ 
-    game.io.send('LOG ' + quote('your are now: ' + nick), connection_id)
+    game.io.send('META ' + quote('you are now: ' + nick), connection_id)
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_QUERY(game, target_nick, msg, connection_id):
     if not connection_id in game.sessions:
-        game.io.send('LOG ' + quote('can only query when logged in'), connection_id)
+        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]:
@@ -32,6 +31,29 @@ def cmd_QUERY(game, target_nick, msg, connection_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)
                 return
-        game.io.send('LOG ' + quote('target user offline?'))
-    game.io.send('LOG ' + quote('can only query with registered nicknames'))
+        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')
+cmd_PING.argtypes = ''
+
+def cmd_SAVE(game):
+
+    def write(f, msg):
+        f.write(msg + '\n')
+
+    with open(game.io.save_file, 'w') as f:
+        write(f, 'TURN %s' % game.turn)
+        for y, line in game.map.lines():
+            write(f, 'MAP_LINE %5s %s' % (y, quote(line)))
+cmd_SAVE.argtypes = ''
+
+def cmd_TURN(game, n):
+    game.turn = n
+cmd_TURN.argtypes = 'int:nonneg'
+
+def cmd_MAP_LINE(game, y, line):
+    game.map.set_line(y, line)
+cmd_MAP_LINE.argtypes = 'int:nonneg string'