replaced strings with ship and water classes, fixed tests to match this change. plus massive refactor in rules of war