X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server%2Fworld.py;h=f0156a355b6519119faaac8f71b5e48a5e3f6100;hb=5125831a6f58c986b71ac1cbd7125b88d1ad5c87;hp=3a68ee407428b5d14cab74db7d5a50f5ba57c04b;hpb=0dd5be3b48b45d1be5cec5ff18f3cb633f99886d;p=plomrogue
diff --git a/server/world.py b/server/world.py
index 3a68ee4..f0156a3 100644
--- a/server/world.py
+++ b/server/world.py
@@ -53,7 +53,7 @@ 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
+ from server.config.misc import thingproliferation_func, calc_effort_func
from server.update_map_memory import update_map_memory
id = 0
whilebreaker = False
@@ -83,7 +83,8 @@ def turn_over():
taid = [a for a in world_db["ThingActions"]
if a == Thing["T_COMMAND"]][0]
ThingAction = world_db["ThingActions"][taid]
- if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
+ effort = calc_effort_func(ThingAction, Thing)
+ if Thing["T_PROGRESS"] == effort:
action = action_db["actor_" + ThingAction["TA_NAME"]]
action(Thing)
Thing["T_COMMAND"] = 0