Make ability events separate from skill events