X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/add_free?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=a3d1f4ce685cfabb9f6108ff8bd7f0f154e8434b;hb=0a25fa6dadb1560ed64c22fe12a6c3d8de567b84;hp=3e8a476460687b873192d1cc0f54f03215b358e9;hpb=27c9f26f715fd388087beea4b2cfb7eb495b1cc3;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 3e8a476..a3d1f4c 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -82,6 +82,9 @@ def cmd_TURN(game, n):
 cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+    player = game.get_thing(game.sessions[connection_id], False)
+    if player.fov_stencil[yx] == '.':
+        raise GameError('cannot annotate tile outside field of view')
     if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
@@ -93,6 +96,9 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
 def cmd_PORTAL(game, yx, msg, pw, connection_id):
+    player = game.get_thing(game.sessions[connection_id], False)
+    if player.fov_stencil[yx] == '.':
+        raise GameError('cannot edit portal on tile outside field of view')
     if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
@@ -114,9 +120,12 @@ def cmd_GOD_PORTAL(game, yx, msg):
 cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
-    annotation = '(none)';
-    if yx in game.annotations:
-        annotation = game.annotations[yx]
+    player = game.get_thing(game.sessions[connection_id], False)
+    annotation = '(unknown)';
+    if player.fov_stencil[yx] == '.':
+        annotation = '(none)';
+        if yx in game.annotations:
+            annotation = game.annotations[yx]
     game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
 cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'