X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fworld.py;h=a05a010dc4636310e4c95b259862b802c07119af;hb=a30d43cc0aba8898c7ea07d445243ee20d009e67;hp=9bd9f6d197f3e65bc09f0bcfebd27643189ceef1;hpb=c8f535af53bd1478065ee5daf1ff4230fe423249;p=plomrogue

diff --git a/server/world.py b/server/world.py
index 9bd9f6d..a05a010 100644
--- a/server/world.py
+++ b/server/world.py
@@ -82,24 +82,18 @@ def build_fov_map(t):
         raise RuntimeError("Malloc error in build_fov_Map().")
 
 
-def new_Thing(type, pos=(0, 0)):
+def new_Thing(_type, pos=(0, 0)):
     """Return Thing of type T_TYPE, with fovmap if alive and world active."""
-    thing = {
-        "T_LIFEPOINTS": world_db["ThingTypes"][type]["TT_LIFEPOINTS"],
-        "T_ARGUMENT": 0,
-        "T_PROGRESS": 0,
-        "T_SATIATION": 0,
-        "T_COMMAND": 0,
-        "T_TYPE": type,
-        "T_POSY": pos[0],
-        "T_POSX": pos[1],
-        "T_CARRIES": [],
-        "carried": False,
-        "T_MEMTHING": [],
-        "T_MEMMAP": False,
-        "T_MEMDEPTHMAP": False,
-        "fovmap": False
-    }
+    from server.config.world_data import thing_defaults
+    thing = {}
+    for key in thing_defaults:
+        thing[key] = thing_defaults[key]
+        if type(thing[key]) == list:
+            thing[key] = thing[key][:]
+    thing["T_LIFEPOINTS"] = world_db["ThingTypes"][_type]["TT_LIFEPOINTS"]
+    thing["T_TYPE"] = _type
+    thing["T_POSY"] = pos[0]
+    thing["T_POSX"] = pos[1]
     if world_db["WORLD_ACTIVE"] and thing["T_LIFEPOINTS"]:
         build_fov_map(thing)
     return thing