Start computing damage based on crit/hit change in MapCombatResolver. Test it a bit.