Add install/uninstall feedback messages.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 2061fe7b782560f50911753fcee3f1cf9395afac..373d32931beaa587dc3bd8f453e4274c5fdf6f60 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -202,18 +202,6 @@ def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
     game.changed = True
 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)'
-    if player.fov_test(big_yx, little_yx):
-        annotation = '(none)'
-        if big_yx in game.annotations:
-            if little_yx in game.annotations[big_yx]:
-                annotation = game.annotations[big_yx][little_yx]
-    game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
-cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
-
 def cmd_MAP_LINE(game, big_yx, y, line):
     map_ = game.get_map(big_yx)
     map_.set_line(y, line)
@@ -316,3 +304,12 @@ def cmd_THING_BOTTLE_EMPTY(game, thing_id):
         raise GameError('thing of ID %s not bottle' % thing_id)
     t.empty()
 cmd_THING_BOTTLE_EMPTY.argtypes = 'int:pos'
+
+def cmd_THING_INSTALLED(game, thing_id):
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    if not hasattr(t, 'installable'):
+        raise GameError('thing of ID %s not installable' % thing_id)
+    t.install()
+cmd_THING_INSTALLED.argtypes = 'int:pos'