36 changed files with 75 additions and 2735 deletions
--- a/Battleship/Battleship/Battleship.csproj
+++ b/Battleship/Battleship/Battleship.csproj
@ -8,19 +8,4 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
 </Project>
--- a/Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs
@ -1,111 +0,0 @@
 using Battleship.Drawings;
 namespace Battleship.CollectionGenericObjects;
 public abstract class AbstractCompany
 {
    /// <summary>
    /// Размер места (ширина)
    /// </summary>
    protected readonly int _placeSizeWidth = 238;
    /// <summary>
    /// Размер места (высота)
    /// </summary>
    protected readonly int _placeSizeHeight = 80;
    /// <summary>
    /// Ширина окна
    /// </summary>
    protected int _pictureWidth;
    /// <summary>
    /// Высота окна
    /// </summary>
    protected int _pictureHeight;
    /// <summary>
    /// Коллекция объектов
    /// </summary>
    protected ICollectionGenericObjects<DrawingWarship>? _collection = null;
    /// <summary>
    /// Вычисление максимального количества элементов, который можно разместить в окне
    /// </summary>
    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight) + 2;
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="picWidth">Ширина окна</param>
    /// <param name="picHeight">Высота окна</param>
    /// <param name="collection">Коллеккция кораблей</param>
    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawingWarship> collection)
    {
        _pictureWidth = picWidth;
        _pictureHeight = picHeight;
        _collection = collection;
        _collection.SetMaxCount = GetMaxCount;
    }
    /// <summary>
    /// Перезагрузка оператора сложения для класса
    /// </summary>
    /// <param name="company">Компания</param>
    /// <param name="car">Добавляемый объект</param>
    /// <returns></returns>
    public static int operator +(AbstractCompany company, DrawingWarship warship)
    {
        return company._collection.Insert(warship);
    }
    /// <summary>
    /// Перезагрузка оператора удаления для класса
    /// </summary>
    /// <param name="company">Компания</param>
    /// <param name="position">Номер удаляемого объекта</param>
    /// <returns></returns>
    public static DrawingWarship operator -(AbstractCompany company, int position) 
    { 
        return company._collection.Remove(position);
    }
    /// <summary>
    /// Получение случайного объекта из коллекции
    /// </summary>
    /// <returns></returns>
    public DrawingWarship? GetRandomObject()
    {
        Random rnd = new();
        return _collection?.Get(rnd.Next(GetMaxCount));
    }
    /// <summary>
    /// Вывод всей коллекции
    /// </summary>
    /// <returns></returns>
    public Bitmap? Show()
    {
        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
        Graphics graphics = Graphics.FromImage(bitmap);
        DrawBackground(graphics);
        SetObjectsPosition();
        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
        {
            DrawingWarship? obj = _collection?.Get(i);
            obj?.DrawTransport(graphics);
        }
        return bitmap;
    }
    /// <summary>
    /// Вывод заднего фона
    /// </summary>
    /// <param name="g"></param>
    protected abstract void DrawBackground(Graphics g);
    /// <summary>
    /// Расстановка объектов
    /// </summary>
    protected abstract void SetObjectsPosition();
 }
--- a/Battleship/Battleship/CollectionGenericObjects/CollectionType.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/CollectionType.cs
@ -1,22 +0,0 @@
 namespace Battleship.CollectionGenericObjects;
 /// <summary>
 /// Тип коллекции
 /// </summary>
 public enum CollectionType
 {
    /// <summary>
    /// Неопределено
    /// </summary>
    None = 0,
    /// <summary>
    /// Массив
    /// </summary>
    Massive = 1,
    /// <summary>
    /// Список
    /// </summary>
    List = 2
 }
--- a/Battleship/Battleship/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/ICollectionGenericObjects.cs
@ -1,48 +0,0 @@
 namespace Battleship.CollectionGenericObjects;
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public interface ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
    /// Количество объектов в коллекции
    /// </summary>
    int Count { get; }
    /// <summary>
    /// Установка максимального количества элементов
    /// </summary>
    int SetMaxCount { set; }
    /// <summary>
    /// Добавление объекта в коллекцию
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
    int Insert(T obj);
    /// <summary>
    /// Добавление объекта в коллекцию на конкретную позицию
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
    /// <param name="position">Позиция</param>
    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
    int Insert(T obj, int position);
    /// <summary>
    /// Удаление объекта из коллекции с конкретной позиции
    /// </summary>
    /// <param name="position"></param>
    /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
    T? Remove(int position);
    /// <summary>
    /// Получение объекта по позиции
    /// </summary>
    /// <param name="position">Позиция</param>
    /// <returns>Объект</returns>
    T? Get(int position);
 }
--- a/Battleship/Battleship/CollectionGenericObjects/ListGenericObjects.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/ListGenericObjects.cs
@ -1,76 +0,0 @@
 namespace Battleship.CollectionGenericObjects;
 /// <summary>
 /// Конструктор
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
    /// Список объектов, которые храним
    /// </summary>
    private readonly List<T?> _collection;
    /// <summary>
    /// Максимально допустимое число объектов в списке
    /// </summary>
    private int _maxCount;
    public int Count => _collection.Count;
    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
    /// <summary>
    /// Конструктор
    /// </summary>
    public ListGenericObjects()
    {
        _collection = new();
    }
    public T? Get(int position)
    {
        // TODO проверка позиции
        if (position >= Count || position < 0) 
            return null;
        return _collection[position];
    }
    public int Insert(T obj)
    {
        // TODO проверка, что не превышено максимальное количество элементов
        // TODO проверка позиции
        // TODO вставка по позиции
        if (Count == _maxCount) return -1;
        _collection.Add(obj);
        return Count;
    }
    public int Insert(T obj, int position)
    {
        // TODO проверка, что не превышено максимальное количество элементов
        // TODO проверка позиции
        // TODO вставка по позиции
        if (position >= Count || position < 0)
        {
            return -1;
        }
        if (Count == _maxCount)
        {
            return -1;
        }
        _collection.Insert(position, obj);
        return position;
    }
    public T Remove(int position)
    {
        // TODO проверка позиции
        // TODO удаление объекта из списка
        if (position >= Count || position < 0) 
            return null;
        T obj = _collection[position];
        _collection.RemoveAt(position);
        return obj;
    }
 }
--- a/Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs
@ -1,116 +0,0 @@
 namespace Battleship.CollectionGenericObjects;
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
    /// Массив объектов, которые храним
    /// </summary>
    private T?[] _collection;
    public int Count => _collection.Length;
    public int SetMaxCount 
    {
        set
        {
            if (value > 0)
            {
                if (Count > 0)
                {
                    Array.Resize(ref _collection, value);
                }
                else
                {
                    _collection = new T?[value];
                }
            }
        }
    }
    /// <summary>
    /// Конструктор
    /// </summary>
    public MassiveGenericObjects()
    {
        _collection = Array.Empty<T?>();
    }
    public T Get(int position)
    {
        // TODO проверка позиции
        if (position >= _collection.Length || position < 0)
        {
            return null;
        }
        return _collection[position];
    }
    public int Insert(T obj)
    {
        // TODO вставка в свободное место набора
        int index = 0;
        while (index < _collection.Length)
        {
            if (_collection[index] == null)
            {
                _collection[index] = obj;
                return index;
            }
            ++index;
        }
        return -1;
    }
    public int Insert(T obj, int position)
    {
        // TODO проверка позиции
        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
        // ищется свободное место после этой позиции и идет вставка туда
        // если нет после, ищем до
        // TODO вставка
        if (position >= _collection.Length || position < 0)
            return -1;
        if (_collection[position] == null)
        {
            _collection[position] = obj;
            return position;
        }
        int index = position + 1;
        while (index < _collection.Length)
        {
            if (_collection[index] == null)
            {
                _collection[index] = obj;
                return index;
            }
            ++index;
        }
        index = position - 1;
        while (index >= 0)
        {
            if (_collection[index] == null)
            {
                _collection[index] = obj;
                return index;
            }
            --index;
        }
        return -1;
    }
    public T Remove(int position)
    {
        // TODO проверка позиции
        // TODO удаление объекта из массива, присвоив элементу массива значение null
        if (position >= _collection.Length || position < 0)
            return null;
        T obj = _collection[position];
        _collection[position] = null;
        return obj;
    }
 }
--- a/Battleship/Battleship/CollectionGenericObjects/StorageCollection.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/StorageCollection.cs
@ -1,79 +0,0 @@
 namespace Battleship.CollectionGenericObjects;
 /// <summary>
 /// Класс-хранилище коллекций
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
    where T : class
 {
    /// <summary>
    /// Словарь (хранилище) с коллекциями 
    /// </summary>
    private Dictionary<string, ICollectionGenericObjects<T>> _storages;
    /// <summary>
    /// Возвращение списка названий коллекции
    /// </summary>
    public List<string> Keys => _storages.Keys.ToList();
    /// <summary>
    /// Конструктор
    /// </summary>
    public StorageCollection()
    {
        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
    }
    /// <summary>
    /// Добавление коллекции в хранилище
    /// </summary>
    /// <param name="name">Название коллекции</param>
    /// <param name="collectionType">Тип коллекции</param>
    public void AddCollection(string name, CollectionType collectionType)
    {
        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
        if (_storages.ContainsKey(name)) 
            return;
        // TODO Прописать логику для добавления
        if (collectionType == CollectionType.List)
        {
            _storages.Add(name, new ListGenericObjects<T>());
        }
        if (collectionType == CollectionType.Massive)
        {
            _storages.Add(name, new MassiveGenericObjects<T>());
        }
    }
    /// <summary>
    /// Удаление коллекции
    /// </summary>
    /// <param name="name"></param>
    public void DelCollection(string name)
    {
        // TODO Прописать логику для удаления коллекции
        if (!_storages.ContainsKey(name)) 
            return;
        _storages.Remove(name);
    }
    /// <summary>
    /// Удаление коллекции 
    /// </summary>
    /// <param name="name"></param>
    /// <returns></returns>
    public ICollectionGenericObjects<T> this[string name]
    {
        get
        {
            // TODO Продумать логику получения объекта
            if (_storages.ContainsKey((string)name))
            {
                return _storages[name];
            }
            return null;
        }
    }
 }
--- a/Battleship/Battleship/CollectionGenericObjects/WarshipSharingService.cs
+++ b/Battleship/Battleship/CollectionGenericObjects/WarshipSharingService.cs
@ -1,63 +0,0 @@
 using Battleship.Drawings;
 namespace Battleship.CollectionGenericObjects;
 /// <summary>
 /// Реализация абстрактной компании - доки
 /// </summary>
 public class WarshipSharingService : AbstractCompany
 {
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="picWidth"></param>
    /// <param name="picHeight"></param>
    /// <param name="collection"></param>
    public WarshipSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingWarship> collection) : base(picWidth, picHeight, collection)
    {
    }
    protected override void DrawBackground(Graphics g)
    {
        Pen pen = new(Color.DarkSlateBlue, 4);
        for (int i = 0; i <= _pictureWidth / _placeSizeWidth; i++)
        {
            for (int j = 0; j <= _pictureHeight / _placeSizeHeight; j++)
            {
                g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
            }
            g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
        }
    }
    //установка объектов 
    protected override void SetObjectsPosition()
    {
        int width = _pictureWidth / _placeSizeWidth;
        int height = _pictureHeight / _placeSizeHeight;
        int posWidth = 0;
        int posHeight = height - 1;
        for (int i = 0; i < (_collection?.Count ?? 0); i++)
        {
            if (_collection?.Get(i) != null)
            {
                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
                _collection?.Get(i)?.SetPosition(_placeSizeWidth * posWidth + 4, posHeight * _placeSizeHeight + 4);
            }
            if (posWidth < width)
                posWidth++;
            else
            {
                posWidth = 0;
                posHeight--;
            }
            if (posHeight > height)
            {
                return;
            }
        }
    }
 }
--- a/Battleship/Battleship/Drawings/DirectionType.cs
+++ b/Battleship/Battleship/Drawings/DirectionType.cs
@ -1,32 +0,0 @@
 namespace Battleship.Drawings;
 /// <summary>
 /// класс, отвечающий за лево/право/верх/низ
 /// </summary>
 public enum DirectionType
 {
    /// <summary>
    /// Неизвестное направление
    /// </summary>
    Unknow = -1,
    /// <summary>
    /// Вверх
    /// </summary>
    Up = 1,
    /// <summary>
    /// Вниз
    /// </summary>
    Down = 2,
    /// <summary>
    /// Влево
    /// </summary>
    Left = 3,
    /// <summary>
    /// Вправо
    /// </summary>
    Right = 4
 }
--- a/Battleship/Battleship/Drawings/DrawingBattleship.cs
+++ b/Battleship/Battleship/Drawings/DrawingBattleship.cs
@ -1,105 +0,0 @@
 using Battleship.Entities;
 namespace Battleship.Drawings;
 /// <summary>
 /// Класс, отвечающий за отрисовку и перемещение объекта-сущности
 /// </summary>
 public class DrawingBattleship : DrawingWarship
 {
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="speed">Скорость</param>
    /// <param name="weight">Вес</param>
    /// <param name="bodyColor">Основной цвет</param>
    /// <param name="additionalColor">Дополнительный цвет</param>
    /// <param name="bodyDeck">Признак наличия палубы</param>
    /// <param name="compartment">Признак наличия отсека для ракет</param>
    /// <param name="tower">Признак наличия башни</param>
    public DrawingBattleship(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyDeck, bool compartment, bool tower) : base(129, 80)
    {
        EntityWarship = new EntityBattleship(speed, weight, bodyColor, compartment, tower, bodyDeck, additionalColor);
    }
    public override void DrawTransport(Graphics g)
    {
        if (EntityWarship == null || EntityWarship is not EntityBattleship battleship || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return;
        }
        Pen pen = new(Color.Black);
        Brush additionalBrush = new SolidBrush(battleship.AdditionalColor);
        //отсек для ракет
        if (battleship.BodyDeck)
        {
            //заливка линкора
            Brush br = new SolidBrush(EntityWarship.BodyColor);
            g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value, 80, 40);
            //границы линкора
            g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value, 80, 40); //ширина высота (сама палуба)
            //заливка двигателей (2 фигни сзади)
            Brush brBlack = new SolidBrush(Color.Black);
            g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 7, 5, 10); //верхний
            g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 22, 5, 10); //нижний
                                                                                          //границы двигателей
            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 7, 5, 10); //двигатель верхний
            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 22, 5, 10); //двигатель нижний
            //прямоугольник левый на палубе (горизонтальный)
            Brush brLightSteelBlue = new SolidBrush(Color.LightSteelBlue);
            g.FillRectangle(brLightSteelBlue, _startPosX.Value + 32, _startPosY.Value + 13, 21, 12);
            g.DrawRectangle(pen, _startPosX.Value + 32, _startPosY.Value + 13, 21, 12);
            //прямоугольник правый на палубе (вертикальный)
            Brush brGray = new SolidBrush(Color.Gray);
            g.FillRectangle(brGray, _startPosX.Value + 53, _startPosY.Value + 7, 16, 24);
            g.DrawRectangle(pen, _startPosX.Value + 53, _startPosY.Value + 7, 16, 24);
            //линии для треугольника
            Point[] pointsNOS =
            {
            new Point(_startPosX.Value + 90, _startPosY.Value),
            new Point(_startPosX.Value + 120, _startPosY.Value + 20),
            new Point(_startPosX.Value + 90, _startPosY.Value + 40),
        };
            g.DrawPolygon(pen, pointsNOS);
            g.FillPolygon(br, pointsNOS);
            //заливка круга
            Brush brLightSlateGray = new SolidBrush(Color.LightSlateGray);
            g.FillEllipse(brLightSlateGray, _startPosX.Value + 78, _startPosY.Value + 12, 15, 15);
            //круг на палубе
            g.DrawEllipse(pen, _startPosX.Value + 78, _startPosY.Value + 12, 15, 15);
        }
        base.DrawTransport(g);
        //башня
        if (battleship.Tower)
        {
            //заливка башни
            g.FillEllipse(additionalBrush, _startPosX.Value + 98, _startPosY.Value + 15, 10, 10);
            g.FillRectangle(additionalBrush, _startPosX.Value + 107, _startPosY.Value + 17, 30, 5);
            //границы башни
            g.DrawEllipse(pen, _startPosX.Value + 98, _startPosY.Value + 15, 10, 10);
            g.DrawRectangle(pen, _startPosX.Value + 107, _startPosY.Value + 17, 30, 5);
        }
        //отсек
        if (battleship.Compartment)
        {
            g.FillRectangle(additionalBrush, _startPosX.Value + 15, _startPosY.Value + 5, 27, 5); //верхний отсек для ракет
            g.FillRectangle(additionalBrush, _startPosX.Value + 15, _startPosY.Value + 28, 27, 5); //нижний отсек для ракет
            //границы отсеков
            g.DrawRectangle(pen, _startPosX.Value + 15, _startPosY.Value + 5, 27, 5); //верхний отсек
            g.DrawRectangle(pen, _startPosX.Value + 15, _startPosY.Value + 28, 27, 5); //нижний отсек
        }
    }
 }
--- a/Battleship/Battleship/Drawings/DrawingWarship.cs
+++ b/Battleship/Battleship/Drawings/DrawingWarship.cs
@ -1,272 +0,0 @@
 using Battleship.Entities;
 namespace Battleship.Drawings;
 public class DrawingWarship
 {
    /// <summary>
    /// Класс-сущность
    /// </summary>
    public EntityWarship? EntityWarship { get; protected set; }
    /// <summary>
    /// Ширина
    /// </summary>
    private int? _pictureWidth;
    /// <summary>
    /// Высота
    /// </summary>
    private int? _pictureHeight;
    /// <summary>
    /// Левая координата прорисовки военного корабля
    /// </summary>
    protected int? _startPosX;
    /// <summary>
    /// Верхняя координата прорисовки военного корабля
    /// </summary>
    protected int? _startPosY;
    /// <summary>
    /// Ширина прорисовки военного корабля
    /// </summary>
    private readonly int _drawingWarshipWidth = 129;
    /// <summary>
    /// Высота прорисовки военного корабля
    /// </summary>
    private readonly int _drawingWarshipHeight = 80;
    /// <summary>
    /// Координата Х объекта
    /// </summary>
    public int? GetPosX => _startPosX;
    /// <summary>
    /// Координата Y объекта
    /// </summary>
    public int? GetPosY => _startPosY;
    /// <summary>
    /// Ширина объекта
    /// </summary>
    public int GetWidth => _drawingWarshipWidth;
    /// <summary>
    /// Высота объекта
    /// </summary>
    public int GetHeight => _drawingWarshipHeight;
    /// <summary>
    /// Пустой конструктор
    /// </summary>
    private DrawingWarship()
    {
        _pictureWidth = null;
        _pictureHeight = null;
        _startPosX = null;
        _startPosY = null;
    }
    /// <summary>
    /// Конструктор 
    /// </summary>
    /// <param name="speed">Скорость</param>
    /// <param name="weight">Вес</param>
    /// <param name="bodyColor">Основной цвет</param>
    public DrawingWarship(int speed, double weight, Color bodyColor) : this()
    {
        EntityWarship = new EntityWarship(speed, weight, bodyColor);
    }
    /// <summary>
    /// Конструктор для наследников
    /// </summary>
    /// <param name="drawingWarshipWidth">Ширина прорисовки военного корабля</param>
    /// <param name="drawingWarshipHeight">Высота прорисовки военного корабля</param>
    protected DrawingWarship(int drawingWarshipWidth, int drawingWarshipHeight) : this() 
    {
        _drawingWarshipWidth = drawingWarshipWidth;
        _drawingWarshipHeight = drawingWarshipHeight;
    }
    /// <summary>
    /// Установка границ поля
    /// </summary>
    /// <param name="width">Ширина поля</param>
    /// <param name="height">Высота поля</param>
    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
    public bool SetPictureSize(int width, int height)
    {
        //TODO проверка, что объект "влезает" в размеры поля
        //если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена
        if (_drawingWarshipWidth > width || _drawingWarshipHeight > height)
        {
            return false;
        }
        _pictureWidth = width;
        _pictureHeight = height;
        if (_startPosX.HasValue || _startPosY.HasValue)
        {
            if (_startPosX + _drawingWarshipWidth > _pictureWidth)
            {
                _startPosX = _pictureWidth - _drawingWarshipWidth;
            }
            else if (_startPosX < 0) _startPosX = 0;
            if (_startPosY + _drawingWarshipHeight > _pictureHeight)
            {
                _startPosY = _pictureHeight - _drawingWarshipHeight;
            }
            else if (_startPosY < 0) _startPosY = 0;
        }
        return true;
    }
    /// <summary>
    /// Установка позиции
    /// </summary>
    /// <param name="x">Координата X</param>
    /// <param name="y">Координата Y</param>
    public void SetPosition(int x, int y)
    {
        if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
        {
            return;
        }
        // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы
        // то надо изменить координаты, чтобы он оставался в этих границах
        if (x + _drawingWarshipWidth > _pictureWidth)
        {
            _startPosX = _pictureWidth - _drawingWarshipWidth;
        }
        else if (x < 0) _startPosX = 0;
        else _startPosX = x;
        if (y + _drawingWarshipHeight > _pictureHeight)
        {
            _startPosY = _pictureHeight - _drawingWarshipHeight;
        }
        else if (y < 0) _startPosY = 0;
        else _startPosY = y;
    }
    /// <summary>
    /// Изменение направления перемещения
    /// </summary>
    /// <param name="direction">Направление</param>
    /// <returns>true - перемещение выполнено, false - перемещение невозможно</returns>
    public bool MoveTransport(DirectionType direction)
    {
        if (EntityWarship == null || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return false;
        }
        switch (direction)
        {
            //влево
            case DirectionType.Left:
                if (_startPosX.Value - EntityWarship.Step > 0)
                {
                    _startPosX -= (int)EntityWarship.Step;
                }
                return true;
            //вправо
            case DirectionType.Right:
                if (_startPosX.Value + EntityWarship.Step + _drawingWarshipWidth < _pictureWidth)
                {
                    _startPosX += (int)EntityWarship.Step;
                }
                return true;
            //вверх
            case DirectionType.Up:
                if (_startPosY.Value - EntityWarship.Step > 0)
                {
                    _startPosY -= (int)EntityWarship.Step;
                }
                return true;
            //вниз
            case DirectionType.Down:
                if (_startPosY.Value + EntityWarship.Step + _drawingWarshipHeight < _pictureHeight) //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                {
                    _startPosY += (int)EntityWarship.Step;
                }
                return true;
            default:
                return false;
        }
    }
    /// <summary>
    /// Прорисовка объекта
    /// </summary>
    /// <param name="g"></param>
    public virtual void DrawTransport(Graphics g)
    {
        if (EntityWarship == null || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return;
        }
        Pen pen = new(Color.Black);
        //заливка линкора
        Brush br = new SolidBrush(EntityWarship.BodyColor);
        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value, 80, 40);
        //границы линкора
        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value, 80, 40); //ширина высота (сама палуба)
        //заливка двигателей (2 фигни сзади)
        Brush brBlack = new SolidBrush(Color.Black);
        g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 7, 5, 10); //верхний
        g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 22, 5, 10); //нижний
                                                                                      //границы двигателей
        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 7, 5, 10); //двигатель верхний
        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 22, 5, 10); //двигатель нижний
        //прямоугольник левый на палубе (горизонтальный)
        Brush brLightSteelBlue = new SolidBrush(Color.LightSteelBlue);
        g.FillRectangle(brLightSteelBlue, _startPosX.Value + 32, _startPosY.Value + 13, 21, 12);
        g.DrawRectangle(pen, _startPosX.Value + 32, _startPosY.Value + 13, 21, 12);
        //прямоугольник правый на палубе (вертикальный)
        Brush brGray = new SolidBrush(Color.Gray);
        g.FillRectangle(brGray, _startPosX.Value + 53, _startPosY.Value + 7, 16, 24);
        g.DrawRectangle(pen, _startPosX.Value + 53, _startPosY.Value + 7, 16, 24);
        //линии для треугольника
        Point[] pointsNOS =
        {
            new Point(_startPosX.Value + 90, _startPosY.Value),
            new Point(_startPosX.Value + 120, _startPosY.Value + 20),
            new Point(_startPosX.Value + 90, _startPosY.Value + 40),
        };
        g.DrawPolygon(pen, pointsNOS);
        g.FillPolygon(br, pointsNOS);
        //заливка круга
        Brush brLightSlateGray = new SolidBrush(Color.LightSlateGray);
        g.FillEllipse(brLightSlateGray, _startPosX.Value + 78, _startPosY.Value + 12, 15, 15);
        //круг на палубе
        g.DrawEllipse(pen, _startPosX.Value + 78, _startPosY.Value + 12, 15, 15);
    }
 }
--- a/Battleship/Battleship/Entities/EntityBattleship.cs
+++ b/Battleship/Battleship/Entities/EntityBattleship.cs
@ -1,60 +0,0 @@
 namespace Battleship.Entities;
 /// <summary>
 /// Класс-сущность Линкор
 /// </summary>
 public class EntityBattleship : EntityWarship
 {
    /// <summary>
    /// Скорость
    /// </summary>
    public int Speed { get; private set; }
    /// <summary>
    /// Вес
    /// </summary>
    public double Weight { get; private set; }
    /// <summary>
    /// Основной цвет 
    /// </summary>
    public Color BodyColor { get; private set; }
    /// <summary>
    /// Перемещение военного корабля
    /// </summary>
    /// /// <summary>
    /// Признак (опция) отсека для ракет
    /// </summary>
    public bool Compartment { get; private set; }
    /// <summary>
    /// Признак (опция) наличия башни
    /// </summary>
    public bool Tower { get; private set; }
    /// <summary>
    /// Признак (опция) наличия палубы
    /// </summary>
    public bool BodyDeck { get; private set; }
    /// <summary>
    /// Дополнительный цвет (для опциональных элементов)
    /// </summary>
    public Color AdditionalColor { get; private set; }
    /// <summary>
    /// Перемещение линкора
    /// </summary>
    public double Step => Speed * 100 / Weight;
    /// <summary>
    /// Инициализация полей объекта-класса линкора
    /// </summary>
    /// <param name="speed"></param>
    /// <param name="weight"></param>
    /// <param name="bodyColor"></param>
    public EntityBattleship(int speed, double weight, Color bodyColor, bool compartment, bool tower, bool bodyDeck, Color additionalColor) : base(speed, weight, bodyColor)
    {
        Speed = speed;
        Weight = weight;
        BodyColor = bodyColor;
        Compartment = compartment;
        Tower = tower;
        BodyDeck = bodyDeck;
        AdditionalColor = additionalColor;
    }
 }
--- a/Battleship/Battleship/Entities/EntityWarship.cs
+++ b/Battleship/Battleship/Entities/EntityWarship.cs
@ -1,42 +0,0 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Battleship.Entities;
 /// <summary>
 /// Класс-сущность Военный корабль
 /// </summary>
 public class EntityWarship
 {
    /// <summary>
    /// Скорость
    /// </summary>
    public int Speed { get; private set; }
    /// <summary>
    /// Вес
    /// </summary>
    public double Weight { get; private set; }
    /// <summary>
    /// Основной цвет 
    /// </summary>
    public Color BodyColor { get; private set; }
    /// <summary>
    /// Перемещение военного корабля
    /// </summary>
    public double Step => Speed * 100 / Weight;
    /// <summary>
    /// Конструктор сущности
    /// </summary>
    /// <param name="speed"></param>
    /// <param name="weight"></param>
    /// <param name="bodyColor"></param>
    public EntityWarship(int speed, double weight, Color bodyColor)
    {
        Speed = speed;
        Weight = weight;
        BodyColor = bodyColor;
    }
 }
--- a/Battleship/Battleship/Form1.Designer.cs
+++ b/Battleship/Battleship/Form1.Designer.cs
@ -0,0 +1,39 @@
 namespace Battleship
 {
    partial class Form1
    {
        /// <summary>
        ///  Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        ///  Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        ///  Required method for Designer support - do not modify
        ///  the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(800, 450);
            this.Text = "Form1";
        }
        #endregion
    }
 }
--- a/Battleship/Battleship/Form1.cs
+++ b/Battleship/Battleship/Form1.cs
@ -0,0 +1,10 @@
 namespace Battleship
 {
    public partial class Form1 : Form
    {
        public Form1()
        {
            InitializeComponent();
        }
    }
 }
--- a/Battleship/Battleship/FormBattleship.resx
+++ b/Battleship/Battleship/FormBattleship.resx
--- a/Battleship/Battleship/FormBattleship.Designer.cs
+++ b/Battleship/Battleship/FormBattleship.Designer.cs
@ -1,146 +0,0 @@
 namespace Battleship;
 partial class FormBattleship
 {
    /// <summary>
    /// Required designer variable.
    /// </summary>
    private System.ComponentModel.IContainer components = null;
    /// <summary>
    /// Clean up any resources being used.
    /// </summary>
    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
    protected override void Dispose(bool disposing)
    {
        if (disposing && (components != null))
        {
            components.Dispose();
        }
        base.Dispose(disposing);
    }
    #region Windows Form Designer generated code
    /// <summary>
    /// Required method for Designer support - do not modify
    /// the contents of this method with the code editor.
    /// </summary>
    private void InitializeComponent()
    {
        pictureBoxBattleship = new PictureBox();
        buttonLeft = new Button();
        buttonDown = new Button();
        buttonRight = new Button();
        buttonUp = new Button();
        comboBoxStrategy = new ComboBox();
        buttonStrategyStep = new Button();
        ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).BeginInit();
        SuspendLayout();
        // 
        // pictureBoxBattleship
        // 
        pictureBoxBattleship.Location = new Point(0, 0);
        pictureBoxBattleship.Name = "pictureBoxBattleship";
        pictureBoxBattleship.Size = new Size(957, 559);
        pictureBoxBattleship.TabIndex = 0;
        pictureBoxBattleship.TabStop = false;
        // 
        // buttonLeft
        // 
        buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
        buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
        buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
        buttonLeft.Location = new Point(819, 512);
        buttonLeft.Name = "buttonLeft";
        buttonLeft.Size = new Size(35, 35);
        buttonLeft.TabIndex = 3;
        buttonLeft.UseVisualStyleBackColor = true;
        buttonLeft.Click += buttonMove_Click;
        // 
        // buttonDown
        // 
        buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
        buttonDown.BackgroundImage = Properties.Resources.arrowDown;
        buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
        buttonDown.Location = new Point(860, 512);
        buttonDown.Name = "buttonDown";
        buttonDown.Size = new Size(35, 35);
        buttonDown.TabIndex = 2;
        buttonDown.UseVisualStyleBackColor = true;
        buttonDown.Click += buttonMove_Click;
        // 
        // buttonRight
        // 
        buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
        buttonRight.BackgroundImage = Properties.Resources.arrowRight;
        buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
        buttonRight.Location = new Point(901, 512);
        buttonRight.Name = "buttonRight";
        buttonRight.Size = new Size(35, 35);
        buttonRight.TabIndex = 4;
        buttonRight.UseVisualStyleBackColor = true;
        buttonRight.Click += buttonMove_Click;
        // 
        // buttonUp
        // 
        buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
        buttonUp.BackgroundImage = Properties.Resources.arrowUp;
        buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
        buttonUp.Location = new Point(860, 471);
        buttonUp.Name = "buttonUp";
        buttonUp.Size = new Size(35, 35);
        buttonUp.TabIndex = 1;
        buttonUp.UseVisualStyleBackColor = true;
        buttonUp.Click += buttonMove_Click;
        // 
        // comboBoxStrategy
        // 
        comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
        comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
        comboBoxStrategy.FormattingEnabled = true;
        comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
        comboBoxStrategy.Location = new Point(795, 12);
        comboBoxStrategy.Name = "comboBoxStrategy";
        comboBoxStrategy.Size = new Size(151, 28);
        comboBoxStrategy.TabIndex = 6;
        // 
        // buttonStrategyStep
        // 
        buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
        buttonStrategyStep.Location = new Point(851, 56);
        buttonStrategyStep.Name = "buttonStrategyStep";
        buttonStrategyStep.Size = new Size(94, 29);
        buttonStrategyStep.TabIndex = 7;
        buttonStrategyStep.Text = "Шаг";
        buttonStrategyStep.UseVisualStyleBackColor = true;
        buttonStrategyStep.Click += buttonStrategyStep_Click;
        // 
        // FormBattleship
        // 
        AutoScaleDimensions = new SizeF(8F, 20F);
        AutoScaleMode = AutoScaleMode.Font;
        ClientSize = new Size(957, 559);
        Controls.Add(buttonStrategyStep);
        Controls.Add(comboBoxStrategy);
        Controls.Add(buttonUp);
        Controls.Add(buttonRight);
        Controls.Add(buttonDown);
        Controls.Add(buttonLeft);
        Controls.Add(pictureBoxBattleship);
        Name = "FormBattleship";
        Text = "Линкор";
        ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).EndInit();
        ResumeLayout(false);
    }
    #endregion
    private PictureBox pictureBoxBattleship;
    private Button buttonDown;
    private Button buttonRight;
    private Button buttonUp;
    private Button buttonLeft;
    private ComboBox comboBoxStrategy;
    private Button buttonStrategyStep;
 }
--- a/Battleship/Battleship/FormBattleship.cs
+++ b/Battleship/Battleship/FormBattleship.cs
@ -1,136 +0,0 @@
 using Battleship.Drawings;
 using Battleship.MovementStrategy;
 namespace Battleship;
 /// <summary>
 /// Форма работы с объектом Линкор
 /// </summary>
 public partial class FormBattleship : Form
 {
    /// <summary>
    /// Поле/объект для прорисовки объекта
    /// </summary>
    private DrawingWarship? _drawingWarship; //поля с нижнего подчеркивания
    /// <summary>
    /// Стратегия перемещения
    /// </summary>
    private AbstractStrategy? _strategy;
    /// <summary>
    /// Получение объекта
    /// </summary>
    public DrawingWarship SetWarship
    {
        set
        {
            _drawingWarship = value;
            _drawingWarship.SetPictureSize(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
            _strategy = null;
            Draw();
        }
    }
    /// <summary>
    /// Конструктор формы
    /// </summary>
    public FormBattleship()
    {
        InitializeComponent();
        _strategy = null;
    }
    /// <summary>
    /// Метод прорисовки машины
    /// </summary>
    //создаем отдельный метод
    private void Draw()
    {
        if (_drawingWarship == null)
        {
            return;
        }
        Bitmap bmp = new(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
        Graphics gr = Graphics.FromImage(bmp);
        _drawingWarship.DrawTransport(gr);
        pictureBoxBattleship.Image = bmp;
    }
    /// <summary>
    /// кнопки вверх/вниз/влево/вправо 
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void buttonMove_Click(object sender, EventArgs e)
    {
        if (_drawingWarship == null)
        {
            return;
        }
        string name = ((Button)sender)?.Name ?? string.Empty;
        bool result = false;
        switch (name)
        {
            case "buttonUp":
                result = _drawingWarship.MoveTransport(DirectionType.Up);
                break;
            case "buttonDown":
                result = _drawingWarship.MoveTransport(DirectionType.Down);
                break;
            case "buttonLeft":
                result = _drawingWarship.MoveTransport(DirectionType.Left);
                break;
            case "buttonRight":
                result = _drawingWarship.MoveTransport(DirectionType.Right);
                break;
        }
        if (result)
        {
            Draw();
        }
    }
    private void buttonStrategyStep_Click(object sender, EventArgs e)
    {
        if (_drawingWarship == null)
        {
            return;
        }
        if (comboBoxStrategy.Enabled)
        {
            _strategy = comboBoxStrategy.SelectedIndex
            switch
            {
                0 => new MoveToCenter(),
                1 => new MoveToBorder(),
                _ => null,
            };
            if (_strategy == null)
            {
                return;
            }
            _strategy.SetData(new MoveableWarship(_drawingWarship),
            pictureBoxBattleship.Width, pictureBoxBattleship.Height);
        }
        if (_strategy == null)
        {
            return;
        }
        comboBoxStrategy.Enabled = false;
        _strategy.MakeStep();
        Draw();
        if (_strategy.GetStatus() == StrategyStatus.Finish)
        {
            comboBoxStrategy.Enabled = true;
            _strategy = null;
        }
    }
 }
--- a/Battleship/Battleship/FormWarshipCollection.Designer.cs
+++ b/Battleship/Battleship/FormWarshipCollection.Designer.cs
@ -1,305 +0,0 @@
 namespace Battleship
 {
    partial class FormWarshipCollection
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            groupBoxTools = new GroupBox();
            panelCompanyTools = new Panel();
            buttonRefresh = new Button();
            maskedTextBox1 = new MaskedTextBox();
            buttonGoToCheck = new Button();
            buttonAddWarship = new Button();
            buttonRemoveWarship = new Button();
            buttonAddBattleship = new Button();
            panelStorage = new Panel();
            comboBoxSelectorCompany = new ComboBox();
            buttonCollectionDel = new Button();
            buttonCreateCompany = new Button();
            listBoxCollection = new ListBox();
            buttonCollectionAdd = new Button();
            radioButtonList = new RadioButton();
            radioButtonMassive = new RadioButton();
            textBoxCollectionName = new TextBox();
            labelCollectionName = new Label();
            pictureBox = new PictureBox();
            groupBoxTools.SuspendLayout();
            panelCompanyTools.SuspendLayout();
            panelStorage.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
            SuspendLayout();
            // 
            // groupBoxTools
            // 
            groupBoxTools.Controls.Add(panelCompanyTools);
            groupBoxTools.Controls.Add(panelStorage);
            groupBoxTools.Dock = DockStyle.Right;
            groupBoxTools.Location = new Point(876, 0);
            groupBoxTools.Name = "groupBoxTools";
            groupBoxTools.Size = new Size(292, 656);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "Инструменты";
            // 
            // panelCompanyTools
            // 
            panelCompanyTools.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
            panelCompanyTools.Controls.Add(buttonRefresh);
            panelCompanyTools.Controls.Add(maskedTextBox1);
            panelCompanyTools.Controls.Add(buttonGoToCheck);
            panelCompanyTools.Controls.Add(buttonAddWarship);
            panelCompanyTools.Controls.Add(buttonRemoveWarship);
            panelCompanyTools.Controls.Add(buttonAddBattleship);
            panelCompanyTools.Location = new Point(6, 374);
            panelCompanyTools.Name = "panelCompanyTools";
            panelCompanyTools.Size = new Size(283, 276);
            panelCompanyTools.TabIndex = 10;
            // 
            // buttonRefresh
            // 
            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonRefresh.Location = new Point(3, 228);
            buttonRefresh.Name = "buttonRefresh";
            buttonRefresh.Size = new Size(277, 42);
            buttonRefresh.TabIndex = 6;
            buttonRefresh.Text = "Обновить";
            buttonRefresh.UseVisualStyleBackColor = true;
            buttonRefresh.Click += ButtonRefresh_Click;
            // 
            // maskedTextBox1
            // 
            maskedTextBox1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            maskedTextBox1.Location = new Point(3, 99);
            maskedTextBox1.Mask = "00";
            maskedTextBox1.Name = "maskedTextBox1";
            maskedTextBox1.Size = new Size(277, 27);
            maskedTextBox1.TabIndex = 7;
            // 
            // buttonGoToCheck
            // 
            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonGoToCheck.Location = new Point(3, 180);
            buttonGoToCheck.Name = "buttonGoToCheck";
            buttonGoToCheck.Size = new Size(277, 42);
            buttonGoToCheck.TabIndex = 5;
            buttonGoToCheck.Text = "Передать на тесты";
            buttonGoToCheck.UseVisualStyleBackColor = true;
            buttonGoToCheck.Click += buttonGoToCheck_Click;
            // 
            // buttonAddWarship
            // 
            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonAddWarship.Location = new Point(3, 3);
            buttonAddWarship.Name = "buttonAddWarship";
            buttonAddWarship.Size = new Size(277, 42);
            buttonAddWarship.TabIndex = 1;
            buttonAddWarship.Text = "Добавление корабля";
            buttonAddWarship.UseVisualStyleBackColor = true;
            buttonAddWarship.Click += ButtonAddWarship_Click;
            // 
            // buttonRemoveWarship
            // 
            buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonRemoveWarship.Location = new Point(0, 132);
            buttonRemoveWarship.Name = "buttonRemoveWarship";
            buttonRemoveWarship.Size = new Size(280, 42);
            buttonRemoveWarship.TabIndex = 4;
            buttonRemoveWarship.Text = "Удалить корабль";
            buttonRemoveWarship.UseVisualStyleBackColor = true;
            buttonRemoveWarship.Click += ButtonRemoveWarship_Click_1;
            // 
            // buttonAddBattleship
            // 
            buttonAddBattleship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonAddBattleship.Location = new Point(3, 51);
            buttonAddBattleship.Name = "buttonAddBattleship";
            buttonAddBattleship.Size = new Size(277, 42);
            buttonAddBattleship.TabIndex = 2;
            buttonAddBattleship.Text = "Добавление линкора";
            buttonAddBattleship.UseVisualStyleBackColor = true;
            buttonAddBattleship.Click += ButtonAddBattleship_Click;
            // 
            // panelStorage
            // 
            panelStorage.Controls.Add(comboBoxSelectorCompany);
            panelStorage.Controls.Add(buttonCollectionDel);
            panelStorage.Controls.Add(buttonCreateCompany);
            panelStorage.Controls.Add(listBoxCollection);
            panelStorage.Controls.Add(buttonCollectionAdd);
            panelStorage.Controls.Add(radioButtonList);
            panelStorage.Controls.Add(radioButtonMassive);
            panelStorage.Controls.Add(textBoxCollectionName);
            panelStorage.Controls.Add(labelCollectionName);
            panelStorage.Dock = DockStyle.Top;
            panelStorage.Location = new Point(3, 23);
            panelStorage.Name = "panelStorage";
            panelStorage.Size = new Size(286, 345);
            panelStorage.TabIndex = 8;
            // 
            // comboBoxSelectorCompany
            // 
            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxSelectorCompany.FormattingEnabled = true;
            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
            comboBoxSelectorCompany.Location = new Point(9, 310);
            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
            comboBoxSelectorCompany.Size = new Size(271, 28);
            comboBoxSelectorCompany.TabIndex = 0;
            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
            // 
            // buttonCollectionDel
            // 
            buttonCollectionDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonCollectionDel.Location = new Point(9, 240);
            buttonCollectionDel.Name = "buttonCollectionDel";
            buttonCollectionDel.Size = new Size(274, 29);
            buttonCollectionDel.TabIndex = 6;
            buttonCollectionDel.Text = "Удаление из коллекции";
            buttonCollectionDel.UseVisualStyleBackColor = true;
            buttonCollectionDel.Click += ButtonCollectionDel_Click;
            // 
            // buttonCreateCompany
            // 
            buttonCreateCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonCreateCompany.Location = new Point(35, 275);
            buttonCreateCompany.Name = "buttonCreateCompany";
            buttonCreateCompany.Size = new Size(218, 29);
            buttonCreateCompany.TabIndex = 9;
            buttonCreateCompany.Text = "Создать компанию";
            buttonCreateCompany.UseVisualStyleBackColor = true;
            buttonCreateCompany.Click += ButtonCreateCompany_Click;
            // 
            // listBoxCollection
            // 
            listBoxCollection.FormattingEnabled = true;
            listBoxCollection.Location = new Point(9, 130);
            listBoxCollection.Name = "listBoxCollection";
            listBoxCollection.Size = new Size(274, 104);
            listBoxCollection.TabIndex = 5;
            // 
            // buttonCollectionAdd
            // 
            buttonCollectionAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonCollectionAdd.Location = new Point(9, 95);
            buttonCollectionAdd.Name = "buttonCollectionAdd";
            buttonCollectionAdd.Size = new Size(274, 29);
            buttonCollectionAdd.TabIndex = 4;
            buttonCollectionAdd.Text = "Добавить коллекцию";
            buttonCollectionAdd.UseVisualStyleBackColor = true;
            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
            // 
            // radioButtonList
            // 
            radioButtonList.Anchor = AnchorStyles.Top | AnchorStyles.Right;
            radioButtonList.AutoSize = true;
            radioButtonList.Location = new Point(203, 65);
            radioButtonList.Name = "radioButtonList";
            radioButtonList.Size = new Size(80, 24);
            radioButtonList.TabIndex = 3;
            radioButtonList.TabStop = true;
            radioButtonList.Text = "Список";
            radioButtonList.UseVisualStyleBackColor = true;
            // 
            // radioButtonMassive
            // 
            radioButtonMassive.AutoSize = true;
            radioButtonMassive.Location = new Point(9, 65);
            radioButtonMassive.Name = "radioButtonMassive";
            radioButtonMassive.Size = new Size(82, 24);
            radioButtonMassive.TabIndex = 2;
            radioButtonMassive.TabStop = true;
            radioButtonMassive.Text = "Массив";
            radioButtonMassive.UseVisualStyleBackColor = true;
            // 
            // textBoxCollectionName
            // 
            textBoxCollectionName.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            textBoxCollectionName.Location = new Point(9, 32);
            textBoxCollectionName.Name = "textBoxCollectionName";
            textBoxCollectionName.Size = new Size(274, 27);
            textBoxCollectionName.TabIndex = 1;
            // 
            // labelCollectionName
            // 
            labelCollectionName.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            labelCollectionName.AutoSize = true;
            labelCollectionName.Location = new Point(67, 9);
            labelCollectionName.Name = "labelCollectionName";
            labelCollectionName.Size = new Size(155, 20);
            labelCollectionName.TabIndex = 0;
            labelCollectionName.Text = "Название коллекции";
            // 
            // pictureBox
            // 
            pictureBox.Dock = DockStyle.Fill;
            pictureBox.Location = new Point(0, 0);
            pictureBox.Name = "pictureBox";
            pictureBox.Size = new Size(876, 656);
            pictureBox.TabIndex = 1;
            pictureBox.TabStop = false;
            // 
            // FormWarshipCollection
            // 
            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(1168, 656);
            Controls.Add(pictureBox);
            Controls.Add(groupBoxTools);
            Name = "FormWarshipCollection";
            Text = "Коллекция кораблей";
            groupBoxTools.ResumeLayout(false);
            panelCompanyTools.ResumeLayout(false);
            panelCompanyTools.PerformLayout();
            panelStorage.ResumeLayout(false);
            panelStorage.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
            ResumeLayout(false);
        }
        #endregion
        private GroupBox groupBoxTools;
        private ComboBox comboBoxSelectorCompany;
        private Button buttonAddBattleship;
        private Button buttonAddWarship;
        private Button buttonRemoveWarship;
        private PictureBox pictureBox;
        private Button buttonRefresh;
        private Button buttonGoToCheck;
        private MaskedTextBox maskedTextBox1;
        private Panel panelStorage;
        private Label labelCollectionName;
        private RadioButton radioButtonList;
        private RadioButton radioButtonMassive;
        private TextBox textBoxCollectionName;
        private Button buttonCollectionAdd;
        private ListBox listBoxCollection;
        private Button buttonCreateCompany;
        private Button buttonCollectionDel;
        private Panel panelCompanyTools;
    }
 }
--- a/Battleship/Battleship/FormWarshipCollection.cs
+++ b/Battleship/Battleship/FormWarshipCollection.cs
@ -1,287 +0,0 @@
 using Battleship.CollectionGenericObjects;
 using Battleship.Drawings;
 namespace Battleship;
 /// <summary>
 /// Форма работы с компанией и ее коллекцией
 /// </summary>
 public partial class FormWarshipCollection : Form
 {
    /// <summary>
    /// Хранилище коллекций
    /// </summary>
    private readonly StorageCollection<DrawingWarship> _storageCollection;
    /// <summary>
    /// Компания
    /// </summary>
    private AbstractCompany? _company = null;
    /// <summary>
    /// Конструктор 
    /// </summary>
    public FormWarshipCollection()
    {
        InitializeComponent();
        _storageCollection = new();
    }
    /// <summary>
    /// Выбор компании
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
    {
        panelCompanyTools.Enabled = false; 
    }
    /// <summary>
    /// Добавление линкора
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonAddBattleship_Click(object sender, EventArgs e)
    {
        CreateObject(nameof(DrawingBattleship));
    }
    /// <summary>
    /// Добавление военного корабля
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonAddWarship_Click(object sender, EventArgs e)
    {
        CreateObject(nameof(DrawingWarship));
    }
    /// <summary>
    /// Создание объекта
    /// </summary>
    /// <param name="type"></param>
    private void CreateObject(string type)
    {
        if (_company == null)
        {
            return;
        }
        Random random = new();
        DrawingWarship drawingWarship;
        switch (type)
        {
            case nameof(DrawingWarship):
                drawingWarship = new DrawingWarship(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
                break;
            case nameof(DrawingBattleship):
                drawingWarship = new DrawingBattleship(random.Next(100, 300), random.Next(1000, 3000),
                    GetColor(random),
                    GetColor(random),
                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(1, 2)), Convert.ToBoolean(random.Next(1, 2)));
                break;
            default:
                return;
        }
        if (_company + drawingWarship != -1)
        {
            MessageBox.Show("Объект добавлен");
            pictureBox.Image = _company.Show();
        }
        else
        {
            MessageBox.Show("Не удалось добавить объект");
        }
    }
    /// <summary>
    /// Получение цвета
    /// </summary>
    /// <param name="random">Генератор случайных чисел</param>
    /// <returns></returns>
    private static Color GetColor(Random random)
    {
        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
        ColorDialog dialog = new();
        if (dialog.ShowDialog() == DialogResult.OK)
        {
            color = dialog.Color;
        }
        return color;
    }
    /// <summary>
    /// Удаление объекта
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonRemoveWarship_Click_1(object sender, EventArgs e)
    {
        if (string.IsNullOrEmpty(maskedTextBox1.Text) || _company == null)
        {
            return;
        }
        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
        {
            return;
        }
        int pos = Convert.ToInt32(maskedTextBox1.Text);
        if (_company - pos != null)
        {
            MessageBox.Show("Объект удален");
            pictureBox.Image = _company.Show();
        }
        else
        {
            MessageBox.Show("Не удалось удалить объект");
        }
    }
    /// <summary>
    /// Передача на тесты
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void buttonGoToCheck_Click(object sender, EventArgs e)
    {
        if (_company == null)
        {
            return;
        }
        DrawingWarship? warship = null;
        int counter = 120;
        while (warship == null)
        {
            warship = _company.GetRandomObject();
            counter--;
            if (counter <= 0)
            {
                break;
            }
        }
        FormBattleship form = new()
        {
            SetWarship = warship
        };
        form.ShowDialog();
    }
    /// <summary>
    /// Обновление
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonRefresh_Click(object sender, EventArgs e)
    {
        if (_company == null)
        {
            return;
        }
        pictureBox.Image = _company.Show();
    }
    /// <summary>
    /// Обновление списка в listBoxCollection
    /// </summary>
    private void RerfreshListBoxItems()
    {
        listBoxCollection.Items.Clear();
        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
        {
            string? colName = _storageCollection.Keys?[i];
            if (!string.IsNullOrEmpty(colName))
            {
                listBoxCollection.Items.Add(colName);
            }
        }
    }
    /// <summary>
    /// Добавление коллекции
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonCollectionAdd_Click(object sender, EventArgs e)
    {
        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
        {
            MessageBox.Show("Не все данные заполнены", "Ошибка",
            MessageBoxButtons.OK, MessageBoxIcon.Error);
            return;
        }
        CollectionType collectionType = CollectionType.None;
        if (radioButtonMassive.Checked)
        {
            collectionType = CollectionType.Massive;
        }
        else if (radioButtonList.Checked)
        {
            collectionType = CollectionType.List;
        }
        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
        RerfreshListBoxItems();
    }
    /// <summary>
    /// Удаление коллекции
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonCollectionDel_Click(object sender, EventArgs e)
    {
        // TODO прописать логику удаления элемента из коллекции
        // нужно убедиться, что есть выбранная коллекция
        // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
        // удалить и обновить ListBox
        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
        {
            MessageBox.Show("Коллекция не выбрана");
            return;
        }
        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
        {
            return;
        }
        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
        RerfreshListBoxItems();
    }
    /// <summary>
    /// Создание компании
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonCreateCompany_Click(object sender, EventArgs e)
    {
        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
        {
            MessageBox.Show("Коллекция не выбрана");
            return;
        }
        ICollectionGenericObjects<DrawingWarship>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
        if (collection == null)
        {
            MessageBox.Show("Коллекция не проинициализирована");
            return;
        }
        switch (comboBoxSelectorCompany.Text)
        {
            case "Хранилище":
                _company = new WarshipSharingService(pictureBox.Width, pictureBox.Height, collection);
                break;
        }
        panelCompanyTools.Enabled = true;
        RerfreshListBoxItems();
    }   
 }
--- a/Battleship/Battleship/FormWarshipCollection.resx
+++ b/Battleship/Battleship/FormWarshipCollection.resx
@ -1,120 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
  <!--
    Microsoft ResX Schema 
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
 </root>
--- a/Battleship/Battleship/MovementStrategy/AbstractStrategy.cs
+++ b/Battleship/Battleship/MovementStrategy/AbstractStrategy.cs
@ -1,137 +0,0 @@
 namespace Battleship.MovementStrategy;
 public abstract class AbstractStrategy
 {
    /// <summary>
    /// Перемещаемый объект
    /// </summary>
    private IMoveableObjectcs? _moveableObjects;
    /// <summary>
    /// Статус перемещения
    /// </summary>
    private StrategyStatus _state = StrategyStatus.NotIInit;
    /// <summary>
    /// Ширина поля
    /// </summary>
    protected int FieldWidth {  get; private set; }
    /// <summary>
    /// Высота поля
    /// </summary>
    protected int FieldHeight { get; private set;}
    /// <summary>
    /// Статус перемещения
    /// </summary>
    /// <returns></returns>
    public StrategyStatus GetStatus() { return _state; }
    /// <summary>
    /// Установка данных
    /// </summary>
    /// <param name="moveableObject">Перемещаемый объект</param>
    /// <param name="width">Ширина поля</param>
    /// <param name="height">Высота поля</param>
    public void SetData(IMoveableObjectcs moveableObjectcs, int width, int height)
    {
        if (moveableObjectcs == null)
        {
            _state = StrategyStatus.NotIInit;
            return;
        }
        _state = StrategyStatus.InProgress;
        _moveableObjects = moveableObjectcs;
        FieldWidth = width;
        FieldHeight = height;
    }
    /// <summary>
    /// Шаг перемещения
    /// </summary>
    public void MakeStep()
    {
        if (_state != StrategyStatus.InProgress)
        {
            return;
        }
        if (IsTargetDestination())
        {
            _state = StrategyStatus.Finish;
            return;
        }
        MoveToTarget();
    }
    /// <summary>
    /// Перемещение влево
    /// </summary>
    /// <returns></returns>
    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
    /// <summary>
    /// Перемещение вправо
    /// </summary>
    /// <returns></returns>
    protected bool MoveRight() => MoveTo(MovementDirection.Right);
    /// <summary>
    /// Перемещение вверх
    /// </summary>
    /// <returns></returns>
    protected bool MoveUp() => MoveTo(MovementDirection.Up);
    /// <summary>
    /// Перемещение вниз
    /// </summary>
    /// <returns></returns>
    protected bool MoveDown() => MoveTo(MovementDirection.Down);
    /// <summary>
    /// Параметры объекта
    /// </summary>
    protected ObjectParameters? GetObjectParameters => _moveableObjects?.GetObjectPosition;
    /// <summary>
    /// Шаг объекта
    /// </summary>
    /// <returns></returns>
    protected int? GetStep()
    {
        if (_state != StrategyStatus.InProgress)
        {
            return null;
        }
        return _moveableObjects?.GetStep;
    }
    /// <summary>
    /// Перемещение к цели
    /// </summary>
    protected abstract void MoveToTarget();
    /// <summary>
    /// Достигнута ли цель
    /// </summary>
    /// <returns></returns>
    protected abstract bool IsTargetDestination();
    /// <summary>
    /// Попытка перемещения в требуемом направлении 
    /// </summary>
    /// <param name="movementDirection"></param>
    /// <returns></returns>
    private bool MoveTo(MovementDirection movementDirection)
    {
        if (_state != StrategyStatus.InProgress)
        {
            return false;
        }
        return _moveableObjects?.TryMoveObject(movementDirection) ?? false;
    }
 }
--- a/Battleship/Battleship/MovementStrategy/IMoveableObjectcs.cs
+++ b/Battleship/Battleship/MovementStrategy/IMoveableObjectcs.cs
@ -1,15 +0,0 @@
 namespace Battleship.MovementStrategy;
 public interface IMoveableObjectcs
 {
    ObjectParameters? GetObjectPosition {  get; }
    int GetStep {  get; }
    /// <summary>
    /// Шаг объекта
    /// </summary>
    /// <param name="direction">Направление</param>
    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
    bool TryMoveObject(MovementDirection direction);
 }
--- a/Battleship/Battleship/MovementStrategy/MoveToBorder.cs
+++ b/Battleship/Battleship/MovementStrategy/MoveToBorder.cs
@ -1,40 +0,0 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Battleship.MovementStrategy;
 public class MoveToBorder : AbstractStrategy
 {
    protected override bool IsTargetDestination()
    {
        var objParams = GetObjectParameters;
        if (objParams == null)
        {
            return false;
        }
        return objParams.RightBorder + GetStep() >= FieldWidth &&
        objParams.DownBorder + GetStep() >= FieldHeight;
    }
    protected override void MoveToTarget()
    {
        var objParams = GetObjectParameters;
        if (objParams == null)
        {
            return;
        }
        var diffX = objParams.RightBorder - FieldWidth;
        if (Math.Abs(diffX) > GetStep())
        {
            MoveRight();
        }
        var diffY = objParams.DownBorder - FieldHeight;
        if (Math.Abs(diffY) > GetStep())
        {
            MoveDown();
        }
    }
 }
--- a/Battleship/Battleship/MovementStrategy/MoveToCenter.cs
+++ b/Battleship/Battleship/MovementStrategy/MoveToCenter.cs
@ -1,61 +0,0 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Battleship.MovementStrategy;
 /// <summary>
 /// Стратегия перемещения объекта в центр экрана
 /// </summary>
 public class MoveToCenter : AbstractStrategy
 {
    protected override bool IsTargetDestination()
    {
        ObjectParameters? objParams = GetObjectParameters;
        if (objParams != null )
        {
            return false;
        }
        return objParams.ObjectMiddleHorizontall - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontall + GetStep() >= FieldWidth / 2 &&
            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2
            && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
    }
    protected override void MoveToTarget()
    {
        ObjectParameters? objParams = GetObjectParameters;
        if (objParams == null )
        {
            return;
        }
        int diffX = objParams.ObjectMiddleHorizontall - FieldWidth / 2;
        if (Math.Abs(diffX) > GetStep())
        {
            if (diffX > 0)
            {
                MoveLeft();
            }
            else
            {
                MoveRight();
            }
        }
        int diffy = objParams.ObjectMiddleVertical - FieldHeight / 2;
        if (Math.Abs(diffy) > GetStep())
        {
            if (diffy > 0)
            {
                MoveUp();
            }
            else
            {
                MoveDown();
            }
        }
    }
 }
--- a/Battleship/Battleship/MovementStrategy/MoveableWarship.cs
+++ b/Battleship/Battleship/MovementStrategy/MoveableWarship.cs
@ -1,64 +0,0 @@
 using Battleship.Drawings;
 namespace Battleship.MovementStrategy;
 /// <summary>
 /// Класс-реализация IMoveableObjectcs с использованием DrawingWarship
 /// </summary>
 public class MoveableWarship : IMoveableObjectcs
 {
    /// <summary>
    /// Gле-объект класса DrawingWarship или его наследника
    /// </summary>
    private DrawingWarship? _warship = null; 
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="warship"></param>
    public MoveableWarship(DrawingWarship warship)
    {
        _warship = warship;
    }
    public ObjectParameters? GetObjectPosition
    {
        get
        {
            if (_warship == null || _warship.EntityWarship == null || !_warship.GetPosX.HasValue || !_warship.GetPosY.HasValue)
            {
                return null;
            }
            return new ObjectParameters(_warship.GetPosX.Value, _warship.GetPosY.Value, _warship.GetWidth, _warship.GetHeight);
        }
    }
    public int GetStep => (int)(_warship?.EntityWarship?.Step ?? 0);
    public bool TryMoveObject(MovementDirection direction)
    {
        if (_warship == null || _warship.EntityWarship == null)
        {
            return false;
        }
        return _warship.MoveTransport(GetDirectionType(direction));
    }
    /// <summary>
    /// Конвертация из MovementDirection в DirectionType
    /// </summary>
    /// <param name="direction">MovementDirection</param>
    /// <returns>DirectionType</returns>
    private static DirectionType GetDirectionType(MovementDirection direction)
    {
        return direction switch
        {
            MovementDirection.Left => DirectionType.Left,
            MovementDirection.Right => DirectionType.Right,
            MovementDirection.Up => DirectionType.Up,
            MovementDirection.Down => DirectionType.Down,
            _ => DirectionType.Unknow,
        };
    }
 }
--- a/Battleship/Battleship/MovementStrategy/MovementDirection.cs
+++ b/Battleship/Battleship/MovementStrategy/MovementDirection.cs
@ -1,27 +0,0 @@
 namespace Battleship.MovementStrategy;
 /// <summary>
 /// Направление перемещения
 /// </summary>
 public enum MovementDirection
 {
    /// <summary>
    /// Вверх
    /// </summary>
    Up = 1, 
    /// <summary>
    /// Вниз
    /// </summary>
    Down = 2, 
    /// <summary>
    /// Влево
    /// </summary>
    Left = 3, 
    /// <summary>
    /// Вправо
    /// </summary>
    Right = 4
 }
--- a/Battleship/Battleship/MovementStrategy/ObjectParameters.cs
+++ b/Battleship/Battleship/MovementStrategy/ObjectParameters.cs
@ -1,72 +0,0 @@
 namespace Battleship.MovementStrategy;
 /// <summary>
 /// Параметры-координаты объекта
 /// </summary>
 public class ObjectParameters
 {
    /// <summary>
    /// Координата Х
    /// </summary>
    private readonly int _x;
    /// <summary>
    /// Координата Y
    /// </summary>
    private readonly int _y;
    /// <summary>
    /// Ширина объекта
    /// </summary>
    private readonly int _width;
    /// <summary>
    /// Высота объекта
    /// </summary>
    private readonly int _height;
    /// <summary>
    /// Левая граница
    /// </summary>
    public int LeftBorder => _x;
    /// <summary>
    /// Верхняя граница
    /// </summary>
    public int TopBorder => _y;
    /// <summary>
    /// Правая граница
    /// </summary>
    public int RightBorder => _x + _width;
    /// <summary>
    /// Нижняя граница
    /// </summary>
    public int DownBorder => _y + _height;
    /// <summary>
    /// Середина объекта
    /// </summary>
    public int ObjectMiddleHorizontall => _x + _width / 2;
    /// <summary>
    /// Середина объекта 
    /// </summary>
    public int ObjectMiddleVertical => _y + _height / 2;
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="x">Координата Х</param>
    /// <param name="y">Координата Y</param>
    /// <param name="width">Ширина объекта</param>
    /// <param name="height">Высота объекта</param>
    public ObjectParameters(int x, int y, int width, int height)
    {
        _x = x;
        _y = y;
        _width = width;
        _height = height;
    }
 }
--- a/Battleship/Battleship/MovementStrategy/StrategyStatus.cs
+++ b/Battleship/Battleship/MovementStrategy/StrategyStatus.cs
@ -1,22 +0,0 @@
 namespace Battleship.MovementStrategy;
 /// <summary>
 /// Статус выполнения операции перемещения
 /// </summary>
 public enum StrategyStatus
 {
    /// <summary>
    /// Все готово к началу
    /// </summary>
    NotIInit,
    /// <summary>
    /// Выполняется
    /// </summary>
    InProgress,
    /// <summary>
    /// Завершено
    /// </summary>
    Finish
 }
--- a/Battleship/Battleship/Program.cs
+++ b/Battleship/Battleship/Program.cs
@ -11,7 +11,7 @@ namespace Battleship
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            Application.Run(new FormWarshipCollection());
+            Application.Run(new Form1());
        }
    }
 }
--- a/Battleship/Battleship/Properties/Resources.Designer.cs
+++ b/Battleship/Battleship/Properties/Resources.Designer.cs
@ -1,103 +0,0 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
 //     Исполняемая версия:4.0.30319.42000
 //
 //     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
 //     повторной генерации кода.
 // </auto-generated>
 //------------------------------------------------------------------------------
 namespace Battleship.Properties {
    using System;
    /// <summary>
    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
    /// </summary>
    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
    // с помощью такого средства, как ResGen или Visual Studio.
    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
    // с параметром /str или перестройте свой проект VS.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
        private static global::System.Resources.ResourceManager resourceMan;
        private static global::System.Globalization.CultureInfo resourceCulture;
        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
        internal Resources() {
        }
        /// <summary>
        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Battleship.Properties.Resources", typeof(Resources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
            }
        }
        /// <summary>
        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
            get {
                return resourceCulture;
            }
            set {
                resourceCulture = value;
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap arrowDown {
            get {
                object obj = ResourceManager.GetObject("arrowDown", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap arrowLeft {
            get {
                object obj = ResourceManager.GetObject("arrowLeft", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap arrowRight {
            get {
                object obj = ResourceManager.GetObject("arrowRight", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap arrowUp {
            get {
                object obj = ResourceManager.GetObject("arrowUp", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
    }
 }
--- a/Battleship/Battleship/Properties/Resources.resx
+++ b/Battleship/Battleship/Properties/Resources.resx
@ -1,133 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
    Version 2.0
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="arrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\arrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="arrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\arrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="arrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\arrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="arrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\arrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Battleship/Battleship/Resources/arrowDown.png
+++ b/Battleship/Battleship/Resources/arrowDown.png
--- a/Battleship/Battleship/Resources/arrowLeft.png
+++ b/Battleship/Battleship/Resources/arrowLeft.png
--- a/Battleship/Battleship/Resources/arrowRight.png
+++ b/Battleship/Battleship/Resources/arrowRight.png
--- a/Battleship/Battleship/Resources/arrowUp.png
+++ b/Battleship/Battleship/Resources/arrowUp.png