X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=server%2Fworld.py;h=90b26de7db3807a394450f150c7beef6442ccb07;hb=4f88b914763e1a8e3ab8889d4affc6205b158e9b;hp=8c85d153219b73edafebed56ad5ad12fd8534c2b;hpb=a138cf3250a860e1bdec7f84248577030948d29b;p=plomrogue
diff --git a/server/world.py b/server/world.py
index 8c85d15..90b26de 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,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