replace different types of ships with single class

The inheritance used by the CombatShip was not useful because we neither
changed any behaviour. It was only used for naming purposes which is
better served using a factory method.