Bug fix to Extended Targeting (thx fxFire), should actually work now

Extended targeting options (based on conditions or boons) should work
now.
Also added the option to swap weapons when only in combat by Tormiasz.