Server: Don't calculate eat_vs_hunger_threshold more often than needed.

[plomrogue] / plugins / server / PleaseTheIslandGod.py

diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index fba17fc6a6325c0008206072d7892ec5397a5402..8f658d5b578720dffd88f5ffba174a9e342b0019 100644 (file)
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -46,16 +46,16 @@ def make_map():
             world_db["altar"] = (y, x)
             altar_placed = True
 
-def field_spreadable(c, t):
+def thingprol_field_spreadable(c, t):
     return ":" == c or (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
                         and "." == c)
 
-def thingprol_plugin_conditions(t):
+def thingprol_test(t):
     tt = world_db["ThingTypes"][t["T_TYPE"]]
     return (tt["TT_LIFEPOINTS"] == 0 or \
             t["T_LIFEPOINTS"] >= 0.9 * tt["TT_LIFEPOINTS"])
 
-def thingprol_plugin_post_create_hook(t):
+def thingprol_post_create(t):
     tt = world_db["ThingTypes"][t["T_TYPE"]]
     if (world_db["FAVOR_STAGE"] > 0 and t["T_TYPE"] == world_db["PLANT_0"]):
         world_db["GOD_FAVOR"] += 5
@@ -85,10 +85,10 @@ def actor_pickup(t):
         log("CAN'T pick up object: No storage room to carry more.")
 
 def actor_pickup_test_hook(t, tid):
-    from server.ai import eat_vs_hunger_threshold
     tt = world_db["ThingTypes"][tid]
     return not (t != world_db["Things"][0] and (tt["TT_TOOL"] != "food" or
-            (tt["TT_TOOLPOWER"] <= eat_vs_hunger_threshold(t["T_TYPE"]))))
+            (tt["TT_TOOLPOWER"] <=
+             world_db["ThingTypes"][t["T_TYPE"]]["eat_vs_hunger_threshold"])))
 
 def actor_drop(t):
     from server.actions import actor_drop
@@ -492,6 +492,9 @@ io_db["worldstate_write_order"] += [[write_metamap_B, "func"]]
 
 import server.config.world_data
 server.config.world_data.symbols_passable += ":_"
+server.config.world_data.thingprol_field_spreadable = thingprol_field_spreadable
+server.config.world_data.thingprol_test_hook = thingprol_test
+server.config.world_data.thingprol_post_create_hook = thingprol_post_create
 
 from server.config.world_data import thing_defaults, thingtype_defaults
 thing_defaults["T_PLAYERDROP"] = 0
@@ -527,21 +530,14 @@ server.config.commands.play_use_attempt_hook = play_use_attempt_hook
 server.config.commands.play_pickup_attempt_hook = play_pickup_attempt_hook
 
 import server.config.misc
-server.config.misc.make_map_func = make_map
+server.config.misc.make_map = make_map
 server.config.misc.decrement_lifepoints = decrement_lifepoints
-server.config.misc.calc_effort_func = calc_effort
+server.config.misc.calc_effort = calc_effort
 
 import server.config.make_world_helpers
-server.config.make_world_helpers.pos_test_func = pos_test
-server.config.make_world_helpers.world_makable_func = world_makable
-server.config.make_world_helpers.make_map_func = make_map
-
-import server.config.thingproliferation
-server.config.thingproliferation.field_spreadable = field_spreadable
-server.config.thingproliferation.thingprol_plugin_conditions = \
-    thingprol_plugin_conditions
-server.config.thingproliferation.thingprol_plugin_post_create_hook = \
-    thingprol_plugin_post_create_hook
+server.config.make_world_helpers.pos_test = pos_test
+server.config.make_world_helpers.world_makable = world_makable
+server.config.make_world_helpers.make_map = make_map
 
 import server.config.ai
-server.config.ai.ai_hook_pickup = ai_hook_pickup_test
+server.config.ai.ai_hook_pickup_test = ai_hook_pickup_test