Ability code partial & et al

Fixed attack to prevent movement also.