Ship description, combat refactoring