X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=389b534da2bb7783dbd254a5ba16eb19f94289c0;hb=ebe7156740549c11953efc4058d318c141e0505d;hp=a80731da48336af7db5dbd9359a00ad56a4ad05f;hpb=540aec0e9bf55d0452cffda4b34e1995d3724abf;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index a80731d..389b534 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -4,6 +4,11 @@ from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
 
 
 
+def cmd_TASKS(game, connection_id):
+    tasks = []
+    game.io.send('TASKS ' + ','.join(game.tasks.keys()), connection_id)
+cmd_TASKS.argtypes = ''
+
 def cmd_ALL(game, msg, connection_id):
     if not connection_id in game.sessions:
         raise GameError('need to be logged in for this')
@@ -11,28 +16,35 @@ 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)
-        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('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)
+        raise GameError('cannot log in twice')
+    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('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_NICK(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 not connection_id in game.sessions:
+        raise GameError('can only rename when already logged in')
+    t_id = game.sessions[connection_id]
+    t = game.get_thing(t_id, False)
+    old_nick = t.nickname
+    t.nickname = nick
+    game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
+    game.changed = True
+cmd_NICK.argtypes = 'string'
+
 def cmd_GET_GAMESTATE(game, connection_id):
     game.send_gamestate(connection_id)
 cmd_GET_GAMESTATE.argtypes = ''
@@ -60,23 +72,37 @@ def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 
-def cmd_ANNOTATE(game, yx, msg, connection_id):
+def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
+        raise GameError('wrong password for tile')
     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'
+cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
-def cmd_PORTAL(game, yx, msg, connection_id):
+def cmd_PORTAL(game, yx, msg, pw, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
+        raise GameError('wrong password for tile')
     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'
+cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
+
+def cmd_GOD_ANNOTATE(game, yx, msg):
+    game.annotations[yx] = msg
+    game.changed = True
+cmd_GOD_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+
+def cmd_GOD_PORTAL(game, yx, msg):
+    game.portals[yx] = msg
+    game.changed = True
+cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
@@ -93,3 +119,11 @@ def cmd_MAP(game, geometry, size):
     map_geometry_class = globals()['MapGeometry' + geometry]
     game.new_world(map_geometry_class(size))
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
+
+def cmd_MAP_CONTROL_LINE(game, y, line):
+    game.map_control.set_line(y, line)
+cmd_MAP_CONTROL_LINE.argtypes = 'int:nonneg string'
+
+def cmd_MAP_CONTROL_PW(game, tile_class, password):
+    game.map_control_passwords[tile_class] = password
+cmd_MAP_CONTROL_PW.argtypes = 'char string'