X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=server%2Factions.py;h=302c36d7c8c00d801b6ad61d8f31f9e21d703677;hb=f6a1bf0aa76165c104d74fe8dfaf674d3e63b52d;hp=849b02661174b41df67658fe92ffddadfd5558d6;hpb=fbfdf2ed32f5fed64b3940c84c0b0b0aa814818b;p=plomrogue diff --git a/server/actions.py b/server/actions.py index 849b026..302c36d 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.world import decrement_lifepoints 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"]) @@ -39,7 +40,7 @@ def actor_move(t): log(hitter_name +" WOUNDS you.") decrement_lifepoints(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: