X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=dea07173c6181f2233260823977c95766732bd60;hb=534f93bc6b5d46e282401c9698430f660b149fd6;hp=2061fe7b782560f50911753fcee3f1cf9395afac;hpb=920a6e5b6e7d355aaaf0ae79ed194eab6e00b999;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 2061fe7..dea0717 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -57,6 +57,7 @@ def cmd_LOGIN(game, nick, connection_id):
         t.position = s.position
         break
     game.changed = True
+    game.changed_fovs = True
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_BECOME_ADMIN(game, password, connection_id):
@@ -84,6 +85,7 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
     map_control = game.get_map(big_yx, 'control')
     map_control[little_yx] = control_char
     game.changed = True
+    game.changed_fovs = True
 cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
 
 def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
@@ -192,28 +194,16 @@ def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg):
     if big_yx not in game.annotations:
         game.annotations[big_yx] = {}
     game.annotations[big_yx][little_yx] = msg
-    game.changed = True
+    #game.changed = True
 cmd_GOD_ANNOTATE.argtypes = 'yx_tuple yx_tuple:nonneg string'
 
 def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
     if big_yx not in game.portals:
         game.portals[big_yx] = {}
     game.portals[big_yx][little_yx] = msg
-    game.changed = True
+    #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)
@@ -250,6 +240,7 @@ def cmd_THING(game, big_yx, little_yx, thing_type, thing_id):
     else:
         game.things += [t_new]
     game.changed = True
+    game.changed_fovs = True
 cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
 
 def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
@@ -297,7 +288,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)
@@ -316,3 +307,45 @@ 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'
+
+def cmd_PLAYER_FACE(game, face, connection_id):
+    t = game.get_player(connection_id)
+    if not t:
+        raise GameError('can only draw face when already logged in')
+    if len(face) != 18:
+        raise GameError('wrong face string length')
+    game.faces[t.name] = face
+    game.changed = True
+cmd_PLAYER_FACE.argtypes = 'string'
+
+def cmd_GOD_PLAYER_FACE(game, name, face):
+    if len(face) != 18:
+        raise GameError('wrong face string length')
+    game.faces[name] = face
+cmd_GOD_PLAYER_FACE.argtypes = 'string string'
+
+def cmd_GOD_PLAYER_HAT(game, name, hat):
+    if len(hat) != 18:
+        raise GameError('wrong hat string length')
+    game.hats[name] = hat
+cmd_GOD_PLAYER_HAT.argtypes = 'string string'
+
+def cmd_THING_HAT_DESIGN(game, thing_id, design):
+    if len(design) != 18:
+        raise GameError('hat design of wrong length')
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    if t.type_ != 'Hat':
+        raise GameError('thing of ID %s not a hat' % thing_id)
+    t.design = design
+cmd_THING_HAT_DESIGN.argtypes = 'int:pos string'