Fix broken THING_MUSICPLAYER_SETTINGS.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 7a05ae8fa07bd0a9e8150ef53bc4c645bc509556..daa43576cd7181ed4e285e3a389abf7dce0b5bbd 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,5 +1,5 @@
 from plomrogue.misc import quote
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, ArgError
 
 
 
@@ -96,7 +96,7 @@ def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
     if not t:
         raise GameError('thing of ID %s not found' % thing_id)
     t.protection = protection_char
-    game.changed = True
+    #game.changed = True
 cmd_THING_PROTECTION.argtypes = 'int:pos char'
 
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
@@ -108,7 +108,7 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
     if tile_class == '.':
         raise GameError('tile class "." must remain unprotected')
     game.map_control_passwords[tile_class] = password
-    game.changed = True
+    #game.changed = True
 cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
 
 def cmd_NICK(game, nick, connection_id):
@@ -151,6 +151,8 @@ def cmd_TURN(game, n):
 cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+    if len(msg) > 500:
+        raise ArgError('annotation text must be <= 500 characters')
     player = game.get_player(connection_id)
     big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
     if not player.fov_test(big_yx, little_yx):
@@ -200,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)
@@ -295,7 +285,7 @@ def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
     t.playing = playing
     t.playlist_index = index
     t.repeat = repeat
-cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int:nonneg bool'
+cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int bool'
 
 def cmd_THING_MUSICPLAYER_PLAYLIST_ITEM(game, thing_id, title, length):
     t = game.get_thing(thing_id)
@@ -314,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'