Add combatant ids to the equals / hashcode impl.