[mr3074] Small rework for damage calculation (no algo changes)