X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fcommands.py;h=bcab2d10702c13bda99a2fee684e210b5e7fa979;hb=97049163acc0844e1656df3f761c9ca612afdeb0;hp=48457f9ab1e4b82f49a32742a6693191c2ea8d83;hpb=1aa93f6152f585ae1b0e69e99e0f68254b0716ee;p=plomrogue2-experiments

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index 48457f9..bcab2d1 100644
--- 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
 
 
 
@@ -15,12 +15,12 @@ def cmd_SEED(game, seed):
 cmd_SEED.argtypes = 'int:nonneg'
 
 def cmd_MAP_SIZE(game, size):
-    game.world.map_size = size
+    game.map_size = size
 cmd_MAP_SIZE.argtypes = 'yx_tuple:pos'
 
 def cmd_MAP(game, map_pos):
-    """Create new map at position map_pos and only of '?' cells."""
-    game.world.new_map(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_):
@@ -104,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 ' + stringify_yx(game.world.map_size))
+        write(f, 'MAP_SIZE %s' % (game.map_size,))
         for map_pos in game.world.maps:
-            write(f, 'MAP ' + stringify_yx(map_pos))
+            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: