refactored lots of the map code into the ship (movement of the ships, cannon zones etc)
merge conflicts