X-Git-Url: https://plomlompom.com/repos/?p=plomrogue2-experiments;a=blobdiff_plain;f=new%2Fplomrogue%2Fcommands.py;h=9d93e6cb8871b384986a8577b646492a6f04b374;hp=84985f63e1453d11dce6784aeacbd10e25360c02;hb=6c37a16df7e55754ca89a9de0aaf49c3c778155e;hpb=c7ed14237418f807473b11e49f17a878ff344f97

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index 84985f6..9d93e6c 100644
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -38,9 +38,27 @@ 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'
+
+def cmd_THING_HEALTH(game, id_, health):
+    t = game.world.get_thing(id_)
+    t.health = health
+cmd_THING_HEALTH.argtypes = 'int:nonneg 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)
 cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
@@ -55,10 +73,9 @@ def cmd_TURN(game, n):
 cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_SWITCH_PLAYER(game):
-    player = game.world.get_player()
-    player.set_task('WAIT')
+    game.world.player.set_task('WAIT')
     thing_ids = [t.id_ for t in game.world.things]
-    player_index = thing_ids.index(player.id_)
+    player_index = thing_ids.index(game.world.player.id_)
     if player_index == len(thing_ids) - 1:
         game.world.player_id = thing_ids[0]
     else:
@@ -80,6 +97,13 @@ 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)))
+            if hasattr(thing, 'health'):
+                write(f, 'THING_HEALTH %s %s' % (thing.id_, thing.health))
+            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: