Added / modified some selectors and conditions to ensure units equip weapons before going to attack.