calculate_damage() cleanup

reordered critical_hit_multiplier and