X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=0c3da0ada3b9e49dc784dbd9000c674f0a86b142;hb=3efcac66212325fecbbf28e3c19762821fb65d76;hp=1df56bc4ed49ce36bd6e1cecd723f24f0997a2ba;hpb=d3167bc558c709d7f10a237def2763530b7fed32;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 1df56bc..0c3da0a 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,13 +1,11 @@
 from plomrogue.misc import quote
 from plomrogue.errors import GameError
-from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, DijkstraMap
 
 
 
 # TODO: instead of sending tasks, thing types etc. on request, send them on connection
 
 def cmd_TASKS(game, connection_id):
-    tasks = []
     game.io.send('TASKS ' + ','.join(game.tasks.keys()), connection_id)
 cmd_TASKS.argtypes = ''
 
@@ -24,10 +22,11 @@ def cmd_TERRAINS(game, connection_id):
 cmd_TERRAINS.argtypes = ''
 
 def cmd_ALL(game, msg, connection_id):
+    from plomrogue.mapping import DijkstraMap
 
     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 +64,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 +97,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'
@@ -118,6 +124,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'
@@ -189,7 +197,7 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id):
     if msg == ' ':
         if big_yx in game.portals:
             if little_yx in game.portals[big_yx]:
-                del game.portals[big_yx][little_xy]
+                del game.portals[big_yx][little_yx]
     else:
         if not big_yx in game.portals:
             game.portals[big_yx] = {}
@@ -245,7 +253,7 @@ cmd_MAP_CONTROL_PW.argtypes = 'char string'
 def cmd_THING(game, big_yx, little_yx, thing_type, thing_id):
     if not thing_type in game.thing_types:
         raise GameError('illegal thing type %s' % thing_type)
-    map_ = game.get_map(big_yx)
+    _ = game.get_map(big_yx)
     t_old = None
     if thing_id > 0:
         t_old = game.get_thing(thing_id)