X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fcommands.py;h=ef18bbbedb9db5b5499e15bfa1c5a72e3234c045;hb=387100e78f7cf7c7378d9c324f14718d28f6cb9c;hp=f9aa5fa1281d3e0a56d55ca797ad725ab61aa1f1;hpb=3b7db36664e8989b106d8975d7a115e8a872b473;p=plomrogue2-experiments

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index f9aa5fa..ef18bbb 100644
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -4,16 +4,20 @@ from plomrogue.misc import quote, stringify_yx
 
 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, yx):
-    """Create new map of size yx and only '?' cells."""
-    game.world.new_map((0,0), yx)
-cmd_MAP.argtypes = 'yx_tuple:pos'
+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_THING_TYPE(game, i, type_):
     t_old = game.world.get_thing(i)
@@ -39,7 +43,7 @@ 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_)
@@ -59,9 +63,9 @@ def cmd_GET_PICKABLE_ITEMS(game, connection_id):
     else:
         game.io.send('PICKABLE_ITEMS ,')
 
-def cmd_TERRAIN_LINE(game, y, terrain_line):
-    game.world.maps[(0,0)].set_line(y, terrain_line)
-cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
+def cmd_TERRAIN_LINE(game, big_yx, y, terrain_line):
+    game.world.maps[big_yx].set_line(y, terrain_line)
+cmd_TERRAIN_LINE.argtypes = 'yx_tuple int:nonneg string'
 
 def cmd_PLAYER_ID(game, id_):
     # TODO: test whether valid thing ID
@@ -90,9 +94,14 @@ 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, 'MAP ' + stringify_yx(game.world.maps[(0,0)].size))
-        for y, line in game.world.maps[(0,0)].lines():
-            write(f, 'TERRAIN_LINE %5s %s' % (y, quote(line)))
+        write(f, 'SEED %s' % game.world.rand.prngod_seed)
+        for map_pos in game.world.maps:
+            write(f, 'MAP ' + stringify_yx(map_pos) + ' ' +
+                  stringify_yx(game.world.maps[(0,0)].size))
+        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)))
         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_,