resolveAttack now just accepts a pendingAttack

will probably move it to a method on pendingAttack() itself later