Minor code style improvements.

[plomrogue2-experiments] / new / plomrogue / commands.py

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index 84985f63e1453d11dce6784aeacbd10e25360c02..ad53438b75974759b19a4bb29394a60b581b2e84 100644 (file)
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -41,6 +41,11 @@ def cmd_THING_POS(game, i, yx):
     t.position = list(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_TERRAIN_LINE(game, y, terrain_line):
     game.world.map_.set_line(y, terrain_line)
 cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
@@ -55,10 +60,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 +84,8 @@ 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 hasattr(thing, 'task'):
                 task = thing.task
                 if task is not None: