fix most issues from 9849a54081e330b2868cb54b2c48931d14a931da

Ali from Cairo and Sustaining Spirit still have issue with how damage is dealt