X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=7e45e15370e18051fc3bf51ad47bd9c69f85dbc0;hb=4a99efd6b0320ad9bc718b43a52b7d9981f75a17;hp=95b46d0f18fd4595e82db847daa1780d2e8d0e87;hpb=1a424fe732e404f79b5e67243af46291d192134b;p=plomrogue

diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index 95b46d0..7e45e15 100644
--- 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
@@ -211,7 +211,7 @@ def actor_move(t):
             altar_msg_wait(100)
         elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] >= 100:
             world_db["FAVOR_STAGE"] = 2
-            log(altar_msg_2)
+            log(altar_msg_1)
             id = id_setter(-1, "Things")
             world_db["Things"][id] = new_Thing(world_db["PLANT_1"],
                                                world_db["altar"])
@@ -378,10 +378,12 @@ def play_use_attempt_hook(t, tt):
             log("You CAN'T use a " + world_db["ThingTypes"][type]["TT_NAME"]
                 + " without some wood in your inventory.")
             return False
-    elif (tt["TT_TOOL"] == "fertilizer"
-          and not world_db["MAP"][pos] == ord(".")):
-        log("Can only make soil out of NON-SOIL earth.")
-        return False
+        return True
+    elif tt["TT_TOOL"] == "fertilizer":
+        if not world_db["MAP"][pos] == ord("."):
+            log("Can only make soil out of NON-SOIL earth.")
+            return False
+        return True
     elif tt["TT_TOOL"] == "wood":
         log("To use wood, you NEED a carpentry tool.")
         return False
@@ -492,6 +494,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
@@ -536,12 +541,5 @@ 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.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
-
 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