From d3e3ad21ec1da876646952af07d992c054e8739a Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 24 Feb 2016 23:33:14 +0100 Subject: [PATCH] Server: Make thing action effort calculation selectable. --- server/config/misc.py | 2 ++ server/world.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/config/misc.py b/server/config/misc.py index c7a701e..bcec1fa 100644 --- a/server/config/misc.py +++ b/server/config/misc.py @@ -6,8 +6,10 @@ from server.make_map import make_map from server.thingproliferation import thingproliferation from server.make_world import make_world from server.decrement_lifepoints import decrement_lifepoints +from server.calc_effort import calc_effort decrement_lifepoints_func = decrement_lifepoints make_map_func = make_map thingproliferation_func = thingproliferation make_world_func = make_world +calc_effort_func = calc_effort 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 -- 2.30.2