X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=6532b72bbe027ebb65d0805025140a49da8145d4;hb=5e761a8855223b0b51a22b5f3b0de353fd2f8f86;hp=a2f98ed1bf989d3195096cf84456815e7da8fc0d;hpb=800aca691b359f448599160ba3d8aef28174596d;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index a2f98ed..6532b72 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -88,6 +88,10 @@ def cmd_LOGIN(game, nick, connection_id):
     t.name = nick
     game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
     game.io.send('PLAYER_ID %s' % t.id_, connection_id)
+    for s in [s for s in game.things
+              if s.type_ == 'SpawnPoint' and s.name == t.name]:
+        t.position = s.position
+        break
     game.changed = True
 cmd_LOGIN.argtypes = 'string'
 
@@ -118,6 +122,19 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
     game.changed = True
 cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
 
+def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
+    player = game.get_player(connection_id)
+    if not player:
+        raise GameError('need to be logged in for this')
+    if not game.sessions[connection_id]['status'] == 'admin':
+        raise GameError('need to be admin for this')
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    t.protection = protection_char
+    game.changed = True
+cmd_THING_PROTECTION.argtypes = 'int:pos char'
+
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
     player = game.get_player(connection_id)
     if not player:
@@ -269,13 +286,16 @@ def cmd_THING(game, big_yx, little_yx, thing_type, thing_id):
     game.changed = True
 cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
 
-def cmd_THING_NAME(game, thing_id, name, connection_id):
+def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
+    # TODO check if thing in FOV
     t = game.get_thing(thing_id)
     if not t:
         raise GameError('thing of ID %s not found' % thing_id)
+    if not game.can_do_thing_with_pw(t, pw):
+        raise GameError('wrong password for tile')
     t.name = name
     game.changed = True
-cmd_THING_NAME.argtypes = 'int:pos string'
+cmd_THING_NAME.argtypes = 'int:pos string string'
 
 def cmd_GOD_THING_NAME(game, thing_id, name):
     t = game.get_thing(thing_id)
@@ -283,3 +303,10 @@ def cmd_GOD_THING_NAME(game, thing_id, name):
         raise GameError('thing of ID %s not found' % thing_id)
     t.name = name
 cmd_GOD_THING_NAME.argtypes = 'int:pos string'
+
+def cmd_GOD_THING_PROTECTION(game, thing_id, protection_char):
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    t.protection = protection_char
+cmd_GOD_THING_PROTECTION.argtypes = 'int:pos char'