X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fcommands.py;h=92f583dc4c90df047f0fbe5c036d2ee62d8bbc60;hb=88bb64ff4ad07e53f7a6b4e3ec9226ee52ac59a2;hp=35ced5cb0314d89cea9fbf51fbd3a9db7dad2cd9;hpb=115bcd418a32a8c0525f6989b2a78c06d64d3198;p=plomrogue2-experiments

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index 35ced5c..92f583d 100644
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -38,13 +38,21 @@ cmd_THING_TYPE.argtypes = 'int:nonneg string:thingtype'
 
 def cmd_THING_POS(game, i, yx):
     t = game.world.get_thing(i)
-    t.position = list(yx)
+    t.position = tuple(yx)
 cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
 
 def cmd_THING_INVENTORY(game, id_, ids):
     t = game.world.get_thing(id_)
-    t.inventory = [ids]  # TODO: test whether valid IDs
-cmd_THING_INVENTORY.argtypes = 'int:nonneg, seq:int:nonneg'
+    t.inventory = ids  # TODO: test whether valid IDs
+cmd_THING_INVENTORY.argtypes = 'int:nonneg seq:int:nonneg'
+
+def cmd_GET_PICKABLE_ITEMS(game, connection_id):
+    pickable_ids = game.world.player.get_pickable_items()
+    if len(pickable_ids) > 0:
+        game.io.send('PICKABLE_ITEMS %s' %
+                     ','.join([str(id_) for id_ in pickable_ids]))
+    else:
+        game.io.send('PICKABLE_ITEMS ,')
 
 def cmd_TERRAIN_LINE(game, y, terrain_line):
     game.world.map_.set_line(y, terrain_line)
@@ -84,9 +92,11 @@ def cmd_SAVE(game):
             write(f, 'THING_TYPE %s %s' % (thing.id_, thing.type_))
             write(f, 'THING_POS %s %s' % (thing.id_,
                                           stringify_yx(thing.position)))
-            write(f, 'THING_INVENTORY %s %s' % (thing.id_,
-                                                ','.join([str(i) for i in
-                                                          thing.inventory])))
+            if len(thing.inventory) > 0:
+                write(f, 'THING_INVENTORY %s %s' %
+                      (thing.id_,','.join([str(i) for i in thing.inventory])))
+            else:
+                write(f, 'THING_INVENTORY %s ,' % thing.id_)
             if hasattr(thing, 'task'):
                 task = thing.task
                 if task is not None: