Server, plugin: Refactor actor_drop plugin hooking.

[plomrogue] / server / actions.py

diff --git a/server/actions.py b/server/actions.py
index 60313876fecab80b9c28611fa23065b578dce201..7f1f657452ea00a30a044c783b868f34593ac24a 100644 (file)
--- a/server/actions.py
+++ b/server/actions.py
@@ -1,3 +1,8 @@
+# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+# or any later version. For details on its copyright, license, and warranties,
+# see the file NOTICE in the root directory of the PlomRogue source package.
+
+

 from server.config.world_data import world_db
 from server.io import log
 
 from server.config.world_data import world_db
 from server.io import log
 


@@ -10,9 +15,10 @@ def actor_wait(t):
 
 def actor_move(t):
     """If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
 
 def actor_move(t):
     """If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""

-    from server.world import build_fov_map, decrement_lifepoints
+    from server.build_fov_map import build_fov_map
+    from server.config.misc import decrement_lifepoints_func

     from server.utils import mv_yx_in_dir_legal
     from server.utils import mv_yx_in_dir_legal

-    from server.config.world_data import directions_db
+    from server.config.world_data import directions_db, symbols_passable

     passable = False
     move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]),
                                      t["T_POSY"], t["T_POSX"])
     passable = False
     move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]),
                                      t["T_POSY"], t["T_POSX"])


@@ -28,13 +34,13 @@ def actor_move(t):
             if t == world_db["Things"][0]:
                 hitted_type = world_db["Things"][hit_id]["T_TYPE"]
                 hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]
             if t == world_db["Things"][0]:
                 hitted_type = world_db["Things"][hit_id]["T_TYPE"]
                 hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]

-                log("You WOUND" + hitted_name + ".")
+                log("You WOUND " + hitted_name + ".")

             elif 0 == hit_id:
                 hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
                 log(hitter_name +" WOUNDS you.")
             elif 0 == hit_id:
                 hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
                 log(hitter_name +" WOUNDS you.")

-            decrement_lifepoints(world_db["Things"][hit_id])
+            decrement_lifepoints_func(world_db["Things"][hit_id])

             return
             return

-        passable = "." == chr(world_db["MAP"][pos])
+        passable = chr(world_db["MAP"][pos]) in symbols_passable

     dir = [dir for dir in directions_db
            if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
     if passable:
     dir = [dir for dir in directions_db
            if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
     if passable:


@@ -48,8 +54,8 @@ def actor_move(t):
             log("You MOVE " + dir + ".")
 
 
             log("You MOVE " + dir + ".")
 
 

-def actor_pick_up(t):
-    """Make t pick up (topmost?) Thing from ground into inventory.
+def actor_pickup(t):
+    """Make t pick up (topmost?) Thing from ground into inventory. Return it.

 
     Define topmostness by how low the thing's type ID is.
     """
 
     Define topmostness by how low the thing's type ID is.
     """


@@ -61,17 +67,19 @@ def actor_pick_up(t):
         lowest_tid = -1
         for iid in ids:
             tid = world_db["Things"][iid]["T_TYPE"]
         lowest_tid = -1
         for iid in ids:
             tid = world_db["Things"][iid]["T_TYPE"]

-            if lowest_tid == -1 or tid < lowest_tid:
+            from server.config.actions import actor_pickup_test_hook
+            if (lowest_tid == -1 or tid < lowest_tid) and \
+                    actor_pickup_test_hook(t, tid):

                 id = iid
                 lowest_tid = tid
         world_db["Things"][id]["carried"] = True
         t["T_CARRIES"].append(id)
         if t == world_db["Things"][0]:
                 log("You PICK UP an object.")
                 id = iid
                 lowest_tid = tid
         world_db["Things"][id]["carried"] = True
         t["T_CARRIES"].append(id)
         if t == world_db["Things"][0]:
                 log("You PICK UP an object.")

-
+        return world_db["Things"][id]

 
 def actor_drop(t):
 
 def actor_drop(t):

-    """Make t rop Thing from inventory to ground indexed by T_ARGUMENT."""
+    """Drop to ground from t's inventory, return T_ARGUMENT-indexed Thing."""

     # TODO: Handle case where T_ARGUMENT matches nothing.
     if len(t["T_CARRIES"]):
         id = t["T_CARRIES"][t["T_ARGUMENT"]]
     # TODO: Handle case where T_ARGUMENT matches nothing.
     if len(t["T_CARRIES"]):
         id = t["T_CARRIES"][t["T_ARGUMENT"]]


@@ -79,7 +87,7 @@ def actor_drop(t):
         world_db["Things"][id]["carried"] = False
         if t == world_db["Things"][0]:
             log("You DROP an object.")
         world_db["Things"][id]["carried"] = False
         if t == world_db["Things"][0]:
             log("You DROP an object.")

-
+            return world_db["Things"][id]

 
 def actor_use(t):
     """Make t use (for now: consume) T_ARGUMENT-indexed Thing in inventory."""
 
 def actor_use(t):
     """Make t use (for now: consume) T_ARGUMENT-indexed Thing in inventory."""


@@ -92,6 +100,6 @@ def actor_use(t):
             del world_db["Things"][id]
             t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_TOOLPOWER"]
             if t == world_db["Things"][0]:
             del world_db["Things"][id]
             t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_TOOLPOWER"]
             if t == world_db["Things"][0]:

-                log("You CONSUME this object.")
+                log("You CONSUME this thing.")

         elif t == world_db["Things"][0]:
             log("You try to use this object, but FAIL.")
         elif t == world_db["Things"][0]:
             log("You try to use this object, but FAIL.")