X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=server%2Factions.py;h=dd9d9e7f21c294685d76248b0e02b731b2cdec71;hb=e94d05a97d5470560b69d55f0394dce096d8638b;hp=302c36d7c8c00d801b6ad61d8f31f9e21d703677;hpb=d29cadf50b9a1daed21fa1d68a5c86ca5d953856;p=plomrogue
diff --git a/server/actions.py b/server/actions.py
index 302c36d..dd9d9e7 100644
--- a/server/actions.py
+++ b/server/actions.py
@@ -16,7 +16,7 @@ def actor_wait(t):
def actor_move(t):
"""If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
from server.build_fov_map import build_fov_map
- from server.world import decrement_lifepoints
+ 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, symbols_passable
passable = False
@@ -38,7 +38,7 @@ def actor_move(t):
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]) in symbols_passable
dir = [dir for dir in directions_db
@@ -98,6 +98,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]:
- 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.")