Server: Save PLUGIN command at top of save file.

[plomrogue] / server / io.py

diff --git a/server/io.py b/server/io.py
index 65d1c351484b07fbbfeec06add24da55b2bd498b..877e525e3b23c14eccff83df2e9c572fd99bb7b1 100644 (file)
--- a/server/io.py
+++ b/server/io.py
@@ -179,8 +179,11 @@ def save_world():
         return string
 
     string = ""
+    for plugin in world_db["PLUGIN"]:
+        string = string + "PLUGIN " + plugin + "\n"
     for key in sorted(world_db.keys()):
-        if (not isinstance(world_db[key], dict)) and key != "MAP" and \
+        if (not isinstance(world_db[key], dict) and
+            not isinstance(world_db[key], list)) and key != "MAP" and \
            key != "WORLD_ACTIVE":
             string = string + key + " " + str(world_db[key]) + "\n"
     string = string + mapsetter("MAP")()
@@ -257,7 +260,7 @@ def obey(command, prefix, replay=False, do_record=False):
                     io_db["save_wait"] = time.time()
             io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"]
     elif 0 != len(tokens):
-        print("Invalid command/argument, or bad number of tokens.")
+        print("Invalid command/argument, or bad number of tokens: " + command)
 
 
 def obey_lines_in_file(path, name, do_record=False):
@@ -273,56 +276,15 @@ def obey_lines_in_file(path, name, do_record=False):
 
 def try_worldstate_update():
     """Write worldstate file if io_db["worldstate_updateable"] is set."""
-    from server.config.commands import commands_db
     if io_db["worldstate_updateable"]:
-
-        def write_map(string, map):
-            for i in range(length):
-                line = map[i * length:(i * length) + length].decode()
-                string = string + line + "\n"
-            return string
-
-        inventory = ""
-        if [] == world_db["Things"][0]["T_CARRIES"]:
-            inventory = "(none)\n"
-        else:
-            for id in world_db["Things"][0]["T_CARRIES"]:
-                type_id = world_db["Things"][id]["T_TYPE"]
-                name = world_db["ThingTypes"][type_id]["TT_NAME"]
-                inventory = inventory + name + "\n"
-        string = str(world_db["TURN"]) + "\n" + \
-            str(world_db["Things"][0]["T_LIFEPOINTS"]) + "\n" + \
-            str(world_db["Things"][0]["T_SATIATION"]) + "\n" + \
-            inventory + "%\n" + \
-            str(world_db["Things"][0]["T_POSY"]) + "\n" + \
-            str(world_db["Things"][0]["T_POSX"]) + "\n" + \
-            str(world_db["MAP_LENGTH"]) + "\n"
-        length = world_db["MAP_LENGTH"]
-        fov = bytearray(b' ' * (length ** 2))
-        ord_v = ord("v")
-        for pos in [pos for pos in range(length ** 2)
-                        if ord_v == world_db["Things"][0]["fovmap"][pos]]:
-            fov[pos] = world_db["MAP"][pos]
-        length = world_db["MAP_LENGTH"]
-        for id in [id for tid in reversed(sorted(list(world_db["ThingTypes"])))
-                      for id in world_db["Things"]
-                      if not world_db["Things"][id]["carried"]
-                      if world_db["Things"][id]["T_TYPE"] == tid
-                      if world_db["Things"][0]["fovmap"][
-                           world_db["Things"][id]["T_POSY"] * length
-                           + world_db["Things"][id]["T_POSX"]] == ord_v]:
-            type = world_db["Things"][id]["T_TYPE"]
-            c = ord(world_db["ThingTypes"][type]["TT_SYMBOL"])
-            fov[world_db["Things"][id]["T_POSY"] * length
-                + world_db["Things"][id]["T_POSX"]] = c
-        string = write_map(string, fov)
-        mem = world_db["Things"][0]["T_MEMMAP"][:]
-        for mt in [mt for tid in reversed(sorted(list(world_db["ThingTypes"])))
-                      for mt in world_db["Things"][0]["T_MEMTHING"]
-                      if mt[0] == tid]:
-             c = world_db["ThingTypes"][mt[0]]["TT_SYMBOL"]
-             mem[(mt[1] * length) + mt[2]] = ord(c)
-        string = write_map(string, mem)
+        string = ""
+        for entry in io_db["worldstate_write_order"]:
+            if entry[1] == "world_int":
+                string += str(world_db[entry[0]]) + "\n"
+            elif entry[1] == "player_int":
+                string += str(world_db["Things"][0][entry[0]]) + "\n"
+            elif entry[1] == "func":
+                string += entry[0]()
         atomic_write(io_db["path_worldstate"], string, delete=False)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
         io_db["worldstate_updateable"] = False