Made spell set its type to either BLACK, WHITE, or RESURRECT based on the damage modifier being < 0, > 0, or = 0 respectively
Merge remote-tracking branch 'origin/battle' into battle