Divided combat resolution into two functions
- calculate_odds gets the combat odds
- resolve_combat calls calculate_odds and generates the result