Misc Updates

Resists and Vulnerabilities fixed to no longer crash endCombat and to
apply the correct state icons
endCombat() output changed to be more obvious
Damage rolls now account for Weakened state
Changed getTargets() functionality to include/exclude self as a
parameter
getTargets() logic for sorting by effect was fixed
Player macros edited to include better affinity display, accept rolls in
misc fields, and allow coup de grace crits