X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Factions.py;h=6393a0ff249bc0c91e360252c27986688baec0c8;hb=8ab4874e22de6584f9b309bbd3d7e2e7b613a0db;hp=537dcb175512fc89779f7f49f9b3e1a3d223c203;hpb=009f06a7a2baef5af4474b18fd75b19c05befb4f;p=plomrogue diff --git a/server/actions.py b/server/actions.py index 537dcb1..6393a0f 100644 --- a/server/actions.py +++ b/server/actions.py @@ -17,7 +17,7 @@ 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.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"]) @@ -33,13 +33,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]) 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: