Remove need for set password on tile control edit.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index c0795991666f941cb85ecfe11d446b61d8dab9f8..a4507b1b74f011654b62de6f319df45fdf963c57 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -27,7 +27,7 @@ def cmd_ALL(game, msg, connection_id):
 
     def lower_msg_by_volume(msg, volume, largest_audible_distance):
         import random
-        factor = largest_audible_distance / 8
+        factor = largest_audible_distance / 4
         lowered_msg = ''
         for c in msg:
             c = c
@@ -65,14 +65,20 @@ def cmd_ALL(game, msg, connection_id):
                      c_id)
 cmd_ALL.argtypes = 'string'
 
+def cmd_SPAWN_POINT(game, big_yx, little_yx):
+    if little_yx.y >= game.map_geometry.size.y or \
+       little_yx.x >= game.map_geometry.size.x:
+        raise GameError('illegal spawn point')
+    game.spawn_point = big_yx, little_yx
+cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
+
 def cmd_LOGIN(game, nick, connection_id):
     for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         raise GameError('name already in use')
     if game.get_player(connection_id):
         raise GameError('cannot log in twice')
     t = game.thing_types['Player'](game)
-    t.position = (YX(0,0),
-                  YX(game.map_geometry.size.y // 2, game.map_geometry.size.x // 2))
+    t.position = game.spawn_point
     game.things += [t]  # TODO refactor into Thing.__init__?
     t.player_char = game.get_next_player_char()
     game.sessions[connection_id] = {
@@ -92,6 +98,7 @@ def cmd_BECOME_ADMIN(game, password, connection_id):
         raise GameError('need to be logged in for this')
     if password in game.admin_passwords:
         game.sessions[connection_id]['status'] = 'admin'
+        game.io.send('ADMIN_OK', connection_id)
     else:
         raise GameError('wrong password')
 cmd_BECOME_ADMIN.argtypes = 'string'
@@ -109,7 +116,8 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
     big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
     map_control = game.get_map(big_yx, 'control')
     map_control[little_yx] = control_char
-cmd_SET_TILE_CONTROL.argtypes = 'yx:nonneg char'
+    game.changed = True
+cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
 
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
     player = game.get_player(connection_id)
@@ -117,6 +125,8 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
         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')
+    if tile_class == '.':
+        raise GameError('tile class "." must remain unprotected')
     game.map_control_passwords[tile_class] = password
     game.changed = True
 cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'