From 364dd01142873c20f073593b54a509f03aee0c24 Mon Sep 17 00:00:00 2001 From: Warmist Date: Thu, 29 Nov 2012 12:41:27 +0200 Subject: [PATCH] Allowed moving up/down in advfort, now correctly checks for main weapon. --- scripts/gui/advfort.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/gui/advfort.lua b/scripts/gui/advfort.lua index 04aa17a7f..5cb0deabd 100644 --- a/scripts/gui/advfort.lua +++ b/scripts/gui/advfort.lua @@ -109,7 +109,7 @@ function MakePredicateWieldsItem(item_skill) local inv=args.unit.inventory for k,v in pairs(inv) do if v.mode==1 and df.item_weaponst:is_instance(v.item) then - if v.item.subtype.skill_melee==item_skill then --and unit.body.weapon_bp==v.body_part_id + if v.item.subtype.skill_melee==item_skill and args.unit.body.weapon_bp==v.body_part_id then return true end end @@ -357,7 +357,8 @@ MOVEMENT_KEYS = { } ALLOWED_KEYS={ A_MOVE_N=true,A_MOVE_S=true,A_MOVE_W=true,A_MOVE_E=true,A_MOVE_NW=true, - A_MOVE_NE=true,A_MOVE_SW=true,A_MOVE_SE=true,A_STANCE=true,SELECT=true + A_MOVE_NE=true,A_MOVE_SW=true,A_MOVE_SE=true,A_STANCE=true,SELECT=true,A_MOVE_DOWN_AUX=true, + A_MOVE_UP_AUX=true } function moddedpos(pos,delta) return {x=pos.x+delta[1],y=pos.y+delta[2],z=pos.z+delta[3]}