X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=0c3da0ada3b9e49dc784dbd9000c674f0a86b142;hb=3efcac66212325fecbbf28e3c19762821fb65d76;hp=26576d052649b9b3f903650729ad760c79f6bf3c;hpb=b1c482d48bf1772d23b98bb93f95292e76afa765;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 26576d0..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
@@ -44,7 +43,7 @@ def cmd_ALL(game, msg, connection_id):
     speaker = game.get_player(connection_id)
     if not speaker:
         raise GameError('need to be logged in for this')
-    largest_audible_distance = 40
+    largest_audible_distance = 20
     dijkstra_map = DijkstraMap(game.maps, speaker.position,
                                largest_audible_distance, game.get_map)
     for c_id in game.sessions:
@@ -98,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'
@@ -112,9 +112,6 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, 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 not (control_char == '.'
-            or control_char in game.map_control_passwords.keys()):
-        raise GameError('no password set for this tile class')
     big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
     map_control = game.get_map(big_yx, 'control')
     map_control[little_yx] = control_char
@@ -200,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] = {}
@@ -256,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)