X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fthingproliferation.py;h=49d8a784cb4388155cb5f97b50b9cc9a1390e952;hb=56c719c341e67c42d28381e6d4a06a3e87f0688f;hp=fec8eb4ec22ea133788343a00e1aaae3b998d283;hpb=6e4d41846d1bf07db5c91724bdb559285c6ad096;p=plomrogue

diff --git a/server/thingproliferation.py b/server/thingproliferation.py
index fec8eb4..49d8a78 100644
--- a/server/thingproliferation.py
+++ b/server/thingproliferation.py
@@ -10,27 +10,26 @@ def thingproliferation(t, prol_map):
     marked passable in prol_map. If there are several map cell candidates, one
     is selected randomly.
     """
-    from server.config.world_data import directions_db, world_db
-    from server.config.thingproliferation import field_spreadable, \
-        thingprol_plugin_conditions, thingprol_plugin_post_create_hook
+    from server.config.world_data import directions_db, world_db, \
+        thingprol_field_spreadable, thingprol_test_hook, \
+        thingprol_post_create_hook
     from server.utils import mv_yx_in_dir_legal, rand, id_setter
     from server.new_thing import new_Thing
     prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
     if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)) and \
-        thingprol_plugin_conditions(t):
+        thingprol_test_hook(t):
         candidates = []
         for key in sorted(directions_db.keys()):
             mv_result = mv_yx_in_dir_legal(directions_db[key], t["T_POSY"],
                                            t["T_POSX"])
             c = chr(prol_map[mv_result[1] * world_db["MAP_LENGTH"]
                 + mv_result[2]])
-            if mv_result[0] and field_spreadable(c, t):
+            if mv_result[0] and thingprol_field_spreadable(c, t):
                 from server.io import log
-                log("PROL")
                 candidates.append((mv_result[1], mv_result[2]))
         if len(candidates):
             i = rand.next() % len(candidates)
             tid = id_setter(-1, "Things")
             newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1]))
             world_db["Things"][tid] = newT
-            thingprol_plugin_post_create_hook(t)
+            thingprol_post_create_hook(t)