Allow player movement beyond central map. Lots of mapping rewrite.

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

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index ef18bbbedb9db5b5499e15bfa1c5a72e3234c045..bcab2d10702c13bda99a2fee684e210b5e7fa979 100644 (file)
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -1,4 +1,4 @@
-from plomrogue.misc import quote, stringify_yx
+from plomrogue.misc import quote
 
 
 
@@ -14,10 +14,14 @@ def cmd_SEED(game, seed):
     game.world.rand.prngod_seed = seed
 cmd_SEED.argtypes = 'int:nonneg'
 
-def cmd_MAP(game, map_pos, size):
-    """Create new map of size at position map_pos, and only '?' cells."""
-    game.world.new_map(map_pos, size)
-cmd_MAP.argtypes = 'yx_tuple yx_tuple:pos'
+def cmd_MAP_SIZE(game, size):
+    game.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.get_map(map_pos)
+cmd_MAP.argtypes = 'yx_tuple'
 
 def cmd_THING_TYPE(game, i, type_):
     t_old = game.world.get_thing(i)
@@ -36,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'
@@ -46,8 +51,12 @@ def cmd_THING_POS(game, i, big_yx, small_yx):
 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):
@@ -95,18 +104,16 @@ def cmd_SAVE(game):
     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.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: