Fixed conflicts between different return types in tables.combat.calculate_odds()