X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server%2Fworld.py;h=c00b5f14374bfb1fb2ca45c2b3af2e5c76255591;hb=2b56602240cad39f31b40445d8932856777295bd;hp=f0156a355b6519119faaac8f71b5e48a5e3f6100;hpb=d3e3ad21ec1da876646952af07d992c054e8739a;p=plomrogue
diff --git a/server/world.py b/server/world.py
index f0156a3..c00b5f1 100644
--- a/server/world.py
+++ b/server/world.py
@@ -6,7 +6,6 @@
from server.config.world_data import world_db
from server.io import log
from server.utils import rand
-from server.utils import id_setter
def try_healing(t):
@@ -52,11 +51,12 @@ 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 thingproliferation_func, calc_effort_func
+ from server.ai import ai
+ from server.config.actions import action_db
+ from server.config.misc import calc_effort_func
from server.update_map_memory import update_map_memory
+ from server.thingproliferation import thingproliferation
id = 0
- whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
proliferable_map = world_db["MAP"][:]
for id in [id for id in world_db["Things"]
@@ -73,9 +73,8 @@ def turn_over():
if not Thing["T_COMMAND"]:
update_map_memory(Thing)
if 0 == id:
- whilebreaker = True
- break
- ai_func(Thing)
+ return
+ ai(Thing)
try_healing(Thing)
hunger(Thing)
if Thing["T_LIFEPOINTS"]:
@@ -89,7 +88,5 @@ def turn_over():
action(Thing)
Thing["T_COMMAND"] = 0
Thing["T_PROGRESS"] = 0
- thingproliferation_func(Thing, proliferable_map)
- if whilebreaker:
- break
+ thingproliferation(Thing, proliferable_map)
world_db["TURN"] += 1