X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server%2Factions.py;h=7f1f657452ea00a30a044c783b868f34593ac24a;hb=c29d6ff72609528521634104c636658325a07796;hp=849b02661174b41df67658fe92ffddadfd5558d6;hpb=fbfdf2ed32f5fed64b3940c84c0b0b0aa814818b;p=plomrogue
diff --git a/server/actions.py b/server/actions.py
index 849b026..7f1f657 100644
--- a/server/actions.py
+++ b/server/actions.py
@@ -15,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"])
@@ -37,9 +38,9 @@ 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])
+ 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:
@@ -54,7 +55,7 @@ def actor_move(t):
def actor_pickup(t):
- """Make t pick up (topmost?) Thing from ground into inventory.
+ """Make t pick up (topmost?) Thing from ground into inventory. Return it.
Define topmostness by how low the thing's type ID is.
"""
@@ -66,17 +67,19 @@ def actor_pickup(t):
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.")
-
+ return world_db["Things"][id]
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"]]
@@ -84,7 +87,7 @@ def actor_drop(t):
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."""
@@ -97,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]:
- 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.")