X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=server%2Fworld.py;h=c00b5f14374bfb1fb2ca45c2b3af2e5c76255591;hb=26b0310b0c61804a781149032818d1c6f9b47fd9;hp=8c85d153219b73edafebed56ad5ad12fd8534c2b;hpb=a138cf3250a860e1bdec7f84248577030948d29b;p=plomrogue diff --git a/server/world.py b/server/world.py index 8c85d15..c00b5f1 100644 --- a/server/world.py +++ b/server/world.py @@ -51,9 +51,11 @@ 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 while world_db["Things"][0]["T_LIFEPOINTS"]: proliferable_map = world_db["MAP"][:] @@ -72,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"]: @@ -86,5 +88,5 @@ def turn_over(): action(Thing) Thing["T_COMMAND"] = 0 Thing["T_PROGRESS"] = 0 - thingproliferation_func(Thing, proliferable_map) + thingproliferation(Thing, proliferable_map) world_db["TURN"] += 1