Improved combat time calculation.