X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fworld.py;h=a313eae76f916a0b17056a101726bf76dfbbeed8;hb=c3d814a6e3a1e021427e3b543290a358c43a8c9f;hp=b9f9114630ef51233883d5c8fa5d67e729b1e0ef;hpb=c94c0575b191d0162d8a1cbbbe4e59cca2e40324;p=plomrogue

diff --git a/server/world.py b/server/world.py
index b9f9114..a313eae 100644
--- a/server/world.py
+++ b/server/world.py
@@ -30,7 +30,7 @@ def hunger_per_turn(type_id):
 
 def hunger(t):
     """Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
-    from server.config.misc import decrement_lifepoints_func
+    from server.config.misc import decrement_lifepoints
     if t["T_SATIATION"] > -32768:
         t["T_SATIATION"] -= hunger_per_turn(t["T_TYPE"])
     if 0 != t["T_SATIATION"] and 0 == int(rand.next() / abs(t["T_SATIATION"])):
@@ -39,7 +39,7 @@ def hunger(t):
                 log("You SUFFER from hunger.")
             else:
                 log("You SUFFER from over-eating.")
-        decrement_lifepoints_func(t)
+        decrement_lifepoints(t)
 
 
 def set_world_inactive():
@@ -51,17 +51,18 @@ def set_world_inactive():
 
 def turn_over():
     """Run game world and its inhabitants until new player input expected."""
-    from server.config.actions import action_db, ai_func
-    from server.config.misc import calc_effort_func
+    from server.ai import ai
+    from server.config.actions import action_db
+    from server.config.misc import calc_effort
     from server.update_map_memory import update_map_memory
     from server.thingproliferation import thingproliferation
     id = 0
     while world_db["Things"][0]["T_LIFEPOINTS"]:
         proliferable_map = world_db["MAP"][:]
-        for id in [id for id in world_db["Things"]
-                   if not world_db["Things"][id]["carried"]]:
-            y = world_db["Things"][id]["T_POSY"]
-            x = world_db["Things"][id]["T_POSX"]
+        for tid in [tid for tid in world_db["Things"]
+                   if not world_db["Things"][tid]["carried"]]:
+            y = world_db["Things"][tid]["T_POSY"]
+            x = world_db["Things"][tid]["T_POSX"]
             proliferable_map[y * world_db["MAP_LENGTH"] + x] = ord('X')
         for id in [id for id in world_db["Things"]]:  # Only what's from start!
             if not id in world_db["Things"] or \
@@ -73,7 +74,7 @@ def turn_over():
                     update_map_memory(Thing)
                     if 0 == id:
                         return
-                    ai_func(Thing)
+                    ai(Thing)
                 try_healing(Thing)
                 hunger(Thing)
                 if Thing["T_LIFEPOINTS"]:
@@ -81,7 +82,7 @@ def turn_over():
                     taid = [a for a in world_db["ThingActions"]
                               if a == Thing["T_COMMAND"]][0]
                     ThingAction = world_db["ThingActions"][taid]
-                    effort = calc_effort_func(ThingAction, Thing)
+                    effort = calc_effort(ThingAction, Thing)
                     if Thing["T_PROGRESS"] == effort:
                         action = action_db["actor_" + ThingAction["TA_NAME"]]
                         action(Thing)