X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=server%2Fworld.py;h=1280269fe1c7ab80877c478124b6ba641990dde5;hb=599249e2b0b374b12e65fb92a9a6dc524afba40f;hp=902a554dfe9c534bce435fdb620f3030f42d3d1e;hpb=119e91aece4fc1de4b4cd1744502ea58f9bae323;p=plomrogue

diff --git a/server/world.py b/server/world.py
index 902a554..1280269 100644
--- a/server/world.py
+++ b/server/world.py
@@ -84,22 +84,14 @@ def build_fov_map(t):
 
 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]
+    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
@@ -309,8 +301,7 @@ def make_world(seed):
 
 def turn_over():
     """Run game world and its inhabitants until new player input expected."""
-    from server.config.actions import action_db
-    from server.ai import ai
+    from server.config.actions import action_db, ai_func
     id = 0
     whilebreaker = False
     while world_db["Things"][0]["T_LIFEPOINTS"]:
@@ -331,7 +322,7 @@ def turn_over():
                     if 0 == id:
                         whilebreaker = True
                         break
-                    ai(Thing)
+                    ai_func(Thing)
                 try_healing(Thing)
                 hunger(Thing)
                 if Thing["T_LIFEPOINTS"]:
@@ -342,7 +333,6 @@ def turn_over():
                     if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
                         action = action_db["actor_" + ThingAction["TA_NAME"]]
                         action(Thing)
-                        #eval("actor_" + ThingAction["TA_NAME"])(Thing)
                         Thing["T_COMMAND"] = 0
                         Thing["T_PROGRESS"] = 0
             thingproliferation(Thing, proliferable_map)