X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Factions.py;h=0fd598671e60133be0f330844b87eb4b84a85dc5;hb=0dd5be3b48b45d1be5cec5ff18f3cb633f99886d;hp=60313876fecab80b9c28611fa23065b578dce201;hpb=08f8592f1a1e5d340b6c2372551f0a3da28a07d8;p=plomrogue

diff --git a/server/actions.py b/server/actions.py
index 6031387..0fd5986 100644
--- 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
 
@@ -10,9 +15,10 @@ def actor_wait(t):
 
 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.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"])
@@ -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"]
-                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.")
-            decrement_lifepoints(world_db["Things"][hit_id])
+            decrement_lifepoints_func(world_db["Things"][hit_id])
             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:
@@ -48,7 +54,7 @@ def actor_move(t):
             log("You MOVE " + dir + ".")
 
 
-def actor_pick_up(t):
+def actor_pickup(t):
     """Make t pick up (topmost?) Thing from ground into inventory.
 
     Define topmostness by how low the thing's type ID is.