X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=94d1c591045dcee8ffbdbcf0f7dd0ab5b5186efa;hb=6f5e2612e8d2b2515612e3dee6dc5ab115f0c1a3;hp=65b054019b0f38dbb6d492803ec72e821baff28f;hpb=df9a8d0a788b29913dae3eec4ef8113e2d8e9a41;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 65b0540..94d1c59 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -44,7 +44,7 @@ def cmd_ALL(game, msg, connection_id):
     if not speaker:
         raise GameError('need to be logged in for this')
     largest_audible_distance = 20
-    dijkstra_map = DijkstraMap(game.maps, speaker.position,
+    dijkstra_map = DijkstraMap(game.things, game.maps, speaker.position,
                                largest_audible_distance, game.get_map)
     for c_id in game.sessions:
         listener = game.get_player(c_id)
@@ -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:
@@ -237,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'
 
@@ -266,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'