X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=blobdiff_plain;f=server%2Factions.py;h=0fd598671e60133be0f330844b87eb4b84a85dc5;hp=302c36d7c8c00d801b6ad61d8f31f9e21d703677;hb=0dd5be3b48b45d1be5cec5ff18f3cb633f99886d;hpb=90fdc3ef90aed80920b2d5529bb186032942fb42 diff --git a/server/actions.py b/server/actions.py index 302c36d..0fd5986 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