Updated Combat chance calculation - in progress