X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=server%2Fworld.py;h=cde01988a2fe542e5cb7c95a2b61e3928bd2efb7;hb=1a424fe732e404f79b5e67243af46291d192134b;hp=c00b5f14374bfb1fb2ca45c2b3af2e5c76255591;hpb=81f8bee1a21642c56b1fead9ba79afdad0c8b451;p=plomrogue
diff --git a/server/world.py b/server/world.py
index c00b5f1..cde0198 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():
@@ -53,7 +53,7 @@ def turn_over():
"""Run game world and its inhabitants until new player input expected."""
from server.ai import ai
from server.config.actions import action_db
- from server.config.misc import calc_effort_func
+ from server.config.misc import calc_effort
from server.update_map_memory import update_map_memory
from server.thingproliferation import thingproliferation
id = 0
@@ -82,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)