X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=6532b72bbe027ebb65d0805025140a49da8145d4;hb=9316d59ddce7a7b8ee70d2b4e111330f1a691e37;hp=c0470ba8a1909d212fee3ca2580b82c85aaf3ef9;hpb=1f65215b70d2a8a255aa9327497b88b94c4b1f17;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index c0470ba..6532b72 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,6 +22,7 @@ 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
@@ -89,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'
 
@@ -113,15 +116,25 @@ 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
     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:
@@ -150,20 +163,20 @@ def cmd_GET_GAMESTATE(game, connection_id):
     game.send_gamestate(connection_id)
 cmd_GET_GAMESTATE.argtypes = ''
 
-#def cmd_QUERY(game, target_nick, msg, connection_id):
-#    if not connection_id in game.sessions:
-#        raise GameError('can only query when logged in')
-#    t = game.get_thing(game.sessions[connection_id], False)
-#    source_nick = t.name
-#    for t in [t for t in game.things if t.type_ == 'Player' and t.name == target_nick]:
-#        for c_id in game.sessions:
-#            if game.sessions[c_id] == t.id_:
-#                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
-#                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
-#                return
-#        raise GameError('target user offline')
-#    raise GameError('can only query with registered nicknames')
-#cmd_QUERY.argtypes = 'string string'
+# def cmd_QUERY(game, target_nick, msg, connection_id):
+#     if not connection_id in game.sessions:
+#         raise GameError('can only query when logged in')
+#     t = game.get_thing(game.sessions[connection_id], False)
+#     source_nick = t.name
+#     for t in [t for t in game.things if t.type_ == 'Player' and t.name == target_nick]:
+#         for c_id in game.sessions:
+#             if game.sessions[c_id] == t.id_:
+#                 game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
+#                 game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
+#                 return
+#         raise GameError('target user offline')
+#     raise GameError('can only query with registered nicknames')
+# cmd_QUERY.argtypes = 'string string'
 
 def cmd_PING(game, connection_id):
     game.io.send('PONG', connection_id)
@@ -185,7 +198,7 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
             if little_yx in game.annotations[big_yx]:
                 del game.annotations[big_yx][little_yx]
     else:
-        if not big_yx in game.annotations:
+        if big_yx not in game.annotations:
             game.annotations[big_yx] = {}
         game.annotations[big_yx][little_yx] = msg
     game.changed = True
@@ -201,23 +214,23 @@ 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:
+        if big_yx not in game.portals:
             game.portals[big_yx] = {}
         game.portals[big_yx][little_yx] = msg
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
 def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg):
-    if not big_yx in game.annotations:
+    if big_yx not in game.annotations:
         game.annotations[big_yx] = {}
     game.annotations[big_yx][little_yx] = msg
     game.changed = True
 cmd_GOD_ANNOTATE.argtypes = 'yx_tuple yx_tuple:nonneg string'
 
 def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
-    if not big_yx in game.portals:
+    if big_yx not in game.portals:
         game.portals[big_yx] = {}
     game.portals[big_yx][little_yx] = msg
     game.changed = True
@@ -226,9 +239,9 @@ cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string'
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     player = game.get_player(connection_id)
     big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
-    annotation = '(unknown)';
+    annotation = '(unknown)'
     if player.fov_test(big_yx, little_yx):
-        annotation = '(none)';
+        annotation = '(none)'
         if big_yx in game.annotations:
             if little_yx in game.annotations[big_yx]:
                 annotation = game.annotations[big_yx][little_yx]
@@ -241,7 +254,10 @@ def cmd_MAP_LINE(game, big_yx, y, line):
 cmd_MAP_LINE.argtypes = 'yx_tuple int:nonneg string'
 
 def cmd_MAP(game, geometry, size):
-    map_geometry_class = globals()['MapGeometry' + geometry]
+    from plomrogue.mapping import MapGeometryHex, MapGeometrySquare
+    map_geometry_class = MapGeometrySquare
+    if geometry == 'Hex':
+        map_geometry_class = MapGeometryHex
     game.new_world(map_geometry_class(size))
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
 
@@ -255,9 +271,9 @@ def cmd_MAP_CONTROL_PW(game, tile_class, password):
 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:
+    if thing_type not 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)
@@ -270,9 +286,27 @@ 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):
+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
-cmd_THING_NAME.argtypes = 'int:pos string'
+    game.changed = True
+cmd_THING_NAME.argtypes = 'int:pos string string'
+
+def cmd_GOD_THING_NAME(game, thing_id, name):
+    t = game.get_thing(thing_id)
+    if not t:
+        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'