Some modifications to Combat

Combat is not yet fully developed and still results in multiple units
attacking the same opponent.