X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fio.py;h=01d04365770ace851b97568ea7f0c22cd19dc451;hb=0a790da8aa952ed96d46c913aadebf9fc361fc43;hp=877e525e3b23c14eccff83df2e9c572fd99bb7b1;hpb=117674cb8473e064058f6f99d99f7ed4aa2c8779;p=plomrogue

diff --git a/server/io.py b/server/io.py
index 877e525..01d0436 100644
--- a/server/io.py
+++ b/server/io.py
@@ -167,24 +167,59 @@ def save_world():
 
     def helper(category, id_string, special_keys={}):
         string = ""
-        for id in sorted(world_db[category].keys()):
-            string = string + id_string + " " + str(id) + "\n"
-            for key in sorted(world_db[category][id].keys()):
+        for _id in sorted(world_db[category].keys()):
+            string = string + id_string + " " + str(_id) + "\n"
+            for key in sorted(world_db[category][_id].keys()):
                 if not key in special_keys:
-                    x = world_db[category][id][key]
+                    x = world_db[category][_id][key]
                     argument = quote_escape(x) if str == type(x) else str(x)
                     string = string + key + " " + argument + "\n"
                 elif special_keys[key]:
-                    string = string + special_keys[key](id)
+                    string = string + special_keys[key](_id)
         return string
 
+    def helper_things():
+        string = ""
+        memmap = mapsetter("T_MEMMAP")
+        memdepthmap = mapsetter("T_MEMDEPTHMAP")
+        for tid in sorted(world_db["Things"].keys()):
+            string += "T_ID " + str(tid) + "\n"
+            t = world_db["Things"][tid]
+            for key in sorted(t.keys()):
+                if key not in {"T_CARRIES", "carried", "fovmap", "T_MEMMAP",
+                               "T_MEMTHING", "T_MEMDEPTHMAP"}:
+                    argument = t[key]
+                    string += key + " " + (quote_escape(argument) if \
+                            str == type(argument) else str(argument)) + "\n"
+            string += memthing(tid) + memmap(tid) + memdepthmap(tid)
+        return string
+
+    # ALTERNATIVE TO helper_things, but not more efficient despite listcomp
+    # def helper4():
+    #     def foo(t, key):
+    #         argument = t[key]
+    #         return key + " " + (quote_escape(argument) if \
+    #                 str == type(argument) else str(argument)) + "\n"
+    #     string = ""
+    #     memmap = mapsetter("T_MEMMAP")
+    #     memdepthmap = mapsetter("T_MEMDEPTHMAP")
+    #     for tid in sorted(world_db["Things"].keys()):
+    #         string += "T_ID " + str(tid) + "\n"
+    #         t = world_db["Things"][tid]
+    #         lines = [foo(t, key) for key in sorted(t.keys())
+    #                  if key not in {"T_CARRIES", "carried", "fovmap",
+    #                  "T_MEMMAP", "T_MEMTHING", "T_MEMDEPTHMAP"}]
+    #         string += "".join(lines)
+    #         string += memthing(tid) + memmap(tid) + memdepthmap(tid)
+    #     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
             not isinstance(world_db[key], list)) and key != "MAP" and \
-           key != "WORLD_ACTIVE":
+           key != "WORLD_ACTIVE" and key[0].isupper():
             string = string + key + " " + str(world_db[key]) + "\n"
     string = string + mapsetter("MAP")()
     string = string + helper("ThingActions", "TA_ID")
@@ -192,15 +227,11 @@ def save_world():
     for id in sorted(world_db["ThingTypes"].keys()):
         string = string + "TT_ID " + str(id) + "\n" + "TT_CORPSE_ID " + \
             str(world_db["ThingTypes"][id]["TT_CORPSE_ID"]) + "\n"
-    string = string + helper("Things", "T_ID",
-                             {"T_CARRIES": False, "carried": False,
-                              "T_MEMMAP": mapsetter("T_MEMMAP"),
-                              "T_MEMTHING": memthing, "fovmap": False,
-                              "T_MEMDEPTHMAP": mapsetter("T_MEMDEPTHMAP")})
-    for id in sorted(world_db["Things"].keys()):
-        if [] != world_db["Things"][id]["T_CARRIES"]:
-            string = string + "T_ID " + str(id) + "\n"
-            for carried in sorted(world_db["Things"][id]["T_CARRIES"]):
+    string += helper_things()
+    for tid in sorted(world_db["Things"].keys()):
+        if [] != world_db["Things"][tid]["T_CARRIES"]:
+            string = string + "T_ID " + str(tid) + "\n"
+            for carried in sorted(world_db["Things"][tid]["T_CARRIES"]):
                 string = string + "T_CARRIES " + str(carried) + "\n"
     string = string + "SEED_RANDOMNESS " + str(rand.seed) + "\n" + \
         "WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"])