X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fcommands.py;h=2d9ecb6e1a2088aef39cb4449f00bc6c9446cfad;hb=bc8966e5d8af45c551f7b2b42503b08609887475;hp=fc3a8a0d52d4fe66a7301f10812a834c2b854d1d;hpb=298e8d0b4c7529ee4ad35005ad9bb9295def1086;p=plomrogue2-experiments

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index fc3a8a0..2d9ecb6 100644
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -1,19 +1,27 @@
-from plomrogue.misc import quote, stringify_yx
+from plomrogue.misc import quote
 
 
 
 def cmd_GEN_WORLD(game, yx, seed):
     game.world.make_new(yx, seed)
-cmd_GEN_WORLD.argtypes = 'yx_tuple:pos string'
+cmd_GEN_WORLD.argtypes = 'yx_tuple:pos int:nonneg'
 
 def cmd_GET_GAMESTATE(game, connection_id):
     """Send game state to caller."""
     game.send_gamestate(connection_id)
 
-def cmd_MAP(game, big_yx, small_yx):
-    """Create new map of size small_yx at pos big_yx and only '?' cells."""
-    game.world.new_map(big_yx, small_yx)
-cmd_MAP.argtypes = 'yx_tuple yx_tuple:pos'
+def cmd_SEED(game, seed):
+    game.world.rand.prngod_seed = seed
+cmd_SEED.argtypes = 'int:nonneg'
+
+def cmd_MAP_SIZE(game, size):
+    game.world.map_size = size
+cmd_MAP_SIZE.argtypes = 'yx_tuple:pos'
+
+def cmd_MAP(game, map_pos):
+    """Ensure (possibly empty/'?'-filled) map at position map_pos."""
+    game.world.ensure_map(map_pos)
+cmd_MAP.argtypes = 'yx_tuple'
 
 def cmd_THING_TYPE(game, i, type_):
     t_old = game.world.get_thing(i)
@@ -32,6 +40,7 @@ def cmd_THING_TYPE(game, i, type_):
     #        continue
     #    setattr(t_new, attr_name, attr_old)
     t_new.position = t_old.position
+    t_new.in_inventory = t_old.in_inventory
     t_old_index = game.world.things.index(t_old)
     game.world.things[t_old_index] = t_new
 cmd_THING_TYPE.argtypes = 'int:nonneg string:thingtype'
@@ -39,11 +48,15 @@ cmd_THING_TYPE.argtypes = 'int:nonneg string:thingtype'
 def cmd_THING_POS(game, i, big_yx, small_yx):
     t = game.world.get_thing(i)
     t.position = (big_yx, small_yx)
-cmd_THING_POS.argtypes = 'int:nonneg yx_tuple yx_tuple'
+cmd_THING_POS.argtypes = 'int:nonneg yx_tuple yx_tuple:nonneg'
 
 def cmd_THING_INVENTORY(game, id_, ids):
-    t = game.world.get_thing(id_)
-    t.inventory = ids  # TODO: test whether valid IDs
+    carrier = game.world.get_thing(id_)
+    carrier.inventory = ids
+    for id_ in ids:
+        t = game.world.get_thing(id_)
+        t.in_inventory = True
+        t.position = carrier.position
 cmd_THING_INVENTORY.argtypes = 'int:nonneg seq:int:nonneg'
 
 def cmd_THING_HEALTH(game, id_, health):
@@ -90,18 +103,17 @@ def cmd_SAVE(game):
     save_file_name = game.io.game_file_name + '.save'
     with open(save_file_name, 'w') as f:
         write(f, 'TURN %s' % game.world.turn)
+        write(f, 'SEED %s' % game.world.rand.prngod_seed)
+        write(f, 'MAP_SIZE %s' % (game.world.map_size,))
         for map_pos in game.world.maps:
-            write(f, 'MAP ' + stringify_yx(map_pos) + ' ' +
-                  stringify_yx(game.world.maps[(0,0)].size))
+            write(f, 'MAP %s' % (map_pos,))
         for map_pos in game.world.maps:
             for y, line in game.world.maps[map_pos].lines():
-                 write(f, 'TERRAIN_LINE %s %5s %s' % (stringify_yx(map_pos),
-                                                      y, quote(line)))
+                 write(f, 'TERRAIN_LINE %s %5s %s' % (map_pos, y, quote(line)))
         for thing in game.world.things:
             write(f, 'THING_TYPE %s %s' % (thing.id_, thing.type_))
-            write(f, 'THING_POS %s %s %s' % (thing.id_,
-                                             stringify_yx(thing.position[0]),
-                                             stringify_yx(thing.position[1])))
+            write(f, 'THING_POS %s %s %s' % (thing.id_, thing.position[0],
+                                             thing.position[1]))
             if hasattr(thing, 'health'):
                 write(f, 'THING_HEALTH %s %s' % (thing.id_, thing.health))
             if len(thing.inventory) > 0: