Better combat duration calculation