Багфикс

This reverts commit 313b9ea2cf9c9796f361a9443a893e61d03f7f60.

Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,118 @@
+using Battleship.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship.CollectionGenericObjects;
+/// <summary>
+/// Абстракция компании, хранящий коллекцию кораблей
+/// </summary>
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 210;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 100;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция кораблей
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningShip>? _collection = null; 
+    /// <summary>
+    /// Вычисление максимального количества элементов, который можно разместить в окне
+    /// </summary>
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина окна</param>
+    /// <param name="picHeight">Высота окна</param>
+    /// <param name="collection">Коллекция кораблей</param>
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningShip> 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, DrawningShip ship)
+    {
+        return company._collection.Insert(ship);
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningShip? operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position);
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningShip? 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)
+        {
+            DrawningShip? 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();
+}

Battleship/Battleship/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,22 @@
+namespace ProjectSportCar.CollectionGenericObjects;
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+	/// <summary>
+	/// Неопределено
+	/// </summary>
+	None = 0,
+
+	/// <summary>
+	/// Массив
+	/// </summary>
+	Massive = 1,
+
+	/// <summary>
+	/// Список
+	/// </summary>
+	List = 2
+}

Battleship/Battleship/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+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>
+    bool 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);
+}

Battleship/Battleship/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,60 @@
+using System;
+using System.CodeDom.Compiler;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship.CollectionGenericObjects;
+
+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)
+    {
+        if (position < 0 || position >= _collection.Count)
+            return null;
+        return _collection[position];
+    }
+    public int Insert(T obj)
+    {
+        if (_collection.Count + 1 <= _maxCount)
+        {
+            _collection.Add(obj);
+            return _collection.Count - 1;
+        }
+        return -1;
+    }
+    public bool Insert(T obj, int position)
+    {
+        if (_collection.Count + 1 > _maxCount || position < 0 || position >= _collection.Count)
+            return false;
+        _collection.Insert(position, obj);
+        return true;
+    }
+    public T? Remove(int position)
+    {
+        if (position < 0 || position >= _collection.Count)
+            return null;
+        T? temp = _collection[position];
+        _collection.RemoveAt(position);
+        return temp;
+    }
+}

Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,110 @@
+using Battleship.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+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;
+    /// <summary>
+    /// Установка максимального кол-ва объектов
+    /// </summary>
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public MassiveGenericObjects()
+    {
+        _collection = Array.Empty<T?>();
+    }
+    /// <summary>
+    /// Получение объекта по позиции
+    /// </summary>
+    /// <param name="position">Позиция (индекс)</param>
+    /// <returns></returns>
+    public T? Get(int position)
+    {
+        if (position < 0 || position >= _collection.Length)
+            return null;
+        return _collection[position];
+    }
+    public int Insert(T obj)
+    {
+        for (int i = 0; i < _collection.Length; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public bool Insert(T obj, int position)
+    {
+        if (position < 0 || position >= _collection.Length) // проверка позиции
+            return false;
+        if (_collection[position] == null) // Попытка вставить на указанную позицию
+        {
+            _collection[position] = obj;
+            return true;
+        }
+        for (int i = position; i < _collection.Length; i++) // попытка вставить объект на позицию после указанной 
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return true;
+            }
+        }
+        for (int i = 0; i < position; i++) // попытка вставить объект на позицию до указанной
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public T? Remove(int position)
+    {
+        if (position < 0 || position >= _collection.Length || _collection[position] == null) // проверка позиции и наличия объекта
+            return null;
+        T? temp = _collection[position];
+        _collection[position] = null;
+
+        return temp;
+    }
+}

Battleship/Battleship/CollectionGenericObjects/ShipDocks.cs

@@ -0,0 +1,57 @@
+using Battleship.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship.CollectionGenericObjects;
+
+/// <summary>
+/// Реализация абстрактной компании - доки с кораблями 
+/// </summary>
+public class ShipDocks : AbstractCompany
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    /// <param name="collection"></param>
+    public ShipDocks(int picWidth, int picHeight, ICollectionGenericObjects<DrawningShip> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackground(Graphics g)
+    {
+        Pen pen = new Pen(Color.Brown, 4);
+        int x = 0, y = 0;
+        while (y + _placeSizeHeight < _pictureHeight)
+        {
+            while (x  + _placeSizeWidth < _pictureWidth)
+            {
+                g.DrawLine(pen, x, y, x + _placeSizeWidth, y);
+                g.DrawLine(pen, x, y, x, y + _placeSizeHeight);
+                g.DrawLine(pen, x, y + _placeSizeHeight, x+_placeSizeWidth, y + _placeSizeHeight);
+                x += _placeSizeWidth + 50;
+            }
+            y += _placeSizeHeight;
+            x = 0;
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        int count = 0;
+        for (int iy = _placeSizeHeight * 11 + 5; iy >= 0; iy -= _placeSizeHeight)
+        {
+            for(int ix = 5; ix + _placeSizeWidth+50 < _pictureWidth; ix += _placeSizeWidth + 50)
+            {
+                _collection?.Get(count)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(count)?.SetPosition(ix, iy);
+                count++;
+            }
+        }
+    }
+}

Battleship/Battleship/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,70 @@
+using Battleship.CollectionGenericObjects;
+namespace ProjectSportCar.CollectionGenericObjects;
+
+/// <summary>
+/// Класс-хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class StorageCollection<T>
+    where T : class
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly 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)
+    {
+        if (string.IsNullOrEmpty(name) || _storages.ContainsKey(name))
+            return;
+        switch (collectionType)
+        {
+            case CollectionType.List:
+                _storages.Add(name, new ListGenericObjects<T>());
+                break;
+            case CollectionType.Massive:
+                _storages.Add(name, new MassiveGenericObjects<T>());
+                break;
+            default:
+                break;
+        }
+    }
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        if (_storages.ContainsKey(name))
+            _storages.Remove(name);
+    }
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            if (_storages.TryGetValue(name, out ICollectionGenericObjects<T>? value))
+                return value;
+            return null;
+        }
+    }
+}

Battleship/Battleship/Drawnings/DirectionType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.Drawnings;
+public enum DirectionType
+{
+    Unknown = -1, //Неизвестное направление
+    Up = 1, //Вверх
+    Down = 2,//Вниз
+    Right = 3,//Вправо 
+    Left = 4 //Влево 
+}

Battleship/Battleship/Drawnings/DrawningBattleship.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Battleship.Entities;
+namespace Battleship.Drawnings;
+// класс прорисовки и пермещения
+public class DrawningBattleship : DrawningShip
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="bodyKit">Признак наличия обвеса</param>
+    /// <param name="wing">Признак наличия антикрыла</param>
+    /// <param name="sportLine">Признак наличия гоночной полосы</param>
+    public DrawningBattleship(int speed, double weight, Color bodycolor, Color additionalcolor, bool weapon, bool rockets) : base(143, 75)
+    {
+        EntityShip = new EntityBattleship(speed, weight, bodycolor, additionalcolor, weapon, rockets);
+    }
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityShip == null || EntityShip is not EntityBattleship entityBattleship || !_startX.HasValue || !_startY.HasValue) //проверка наличия корабля и инициализации начальной позиции
+            return;
+        _startY += 15;
+        base.DrawTransport(g);
+        _startY -= 15;
+        #region Прорисовка доп. элеменетов
+        Pen pen = new(Color.Black, 3); //!!! ЗАДАТЬ ВОПРОС ПРО PEN
+        Brush addBr = new SolidBrush(entityBattleship.AdditionalColor);
+        // Орудийная башня 
+        if (entityBattleship.Weapon)
+        {
+            g.FillPie(addBr, _startX.Value + 8, _startY.Value + 15, 30, 25, 180, 180);
+            g.FillRectangle(addBr, _startX.Value + 18, _startY.Value, 10, 20);
+        }
+        //Ракеты 
+        if (entityBattleship.Rockets)
+        {
+            g.FillRectangle(addBr, _startX.Value + 8, _startY.Value + 15 + 20, 30, 35);
+            g.DrawRectangle(pen, _startX.Value + 8, _startY.Value + 15 + 20, 30, 35);
+            g.DrawEllipse(pen, _startX.Value + 13, _startY.Value + 15 + 25, 10, 10);
+            g.DrawEllipse(pen, _startX.Value + 23, _startY.Value + 15 + 25, 10, 10);
+            g.DrawEllipse(pen, _startX.Value + 23, _startY.Value + 15 + 40, 10, 10);
+            g.DrawEllipse(pen, _startX.Value + 13, _startY.Value + 15 + 40, 10, 10);
+        }
+        #endregion
+    }
+}

Battleship/Battleship/Drawnings/DrawningShip.cs

@@ -0,0 +1,149 @@
+using Battleship.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.Drawnings;
+public class DrawningShip
+{
+    #region [Инициализация переменных]
+    public EntityShip? EntityShip { get; protected set; } //класс сущность
+    private int? _pictureWidth; //ширина окна 
+    private int? _pictureHeight; //высота окна
+    protected int? _startX; // Х начальной позиции 
+    protected int? _startY; // Y начальной позиции
+    private readonly int _drawningShipWidth = 143; // длина корабля
+    private readonly int _drawningShipHeight = 60; // высота корабля 
+    #endregion
+    #region [Инициализация геттеров переменных]
+    /// <summary>
+    /// Getter координаты Х
+    /// </summary>
+    public int? GetPosX => _startX;
+    /// <summary>
+    /// Getter координаты Y
+    /// </summary>
+    public int? GetPosY => _startY;
+    /// <summary>
+    /// Getter ширины объекта
+    /// </summary>
+    public int GetWidth => _drawningShipWidth;
+    /// <summary>
+    /// Getter высоты объекта
+    /// </summary>
+    public int GetHeight => _drawningShipHeight;
+    #endregion
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    public DrawningShip()
+    {
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startX = null;
+        _startY = null;
+    }
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="speed">Скорость</param>
+	/// <param name="weight">Вес</param>
+	/// <param name="bodyColor">Основной цвет</param>
+	public DrawningShip(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityShip = new EntityShip(speed, weight, bodyColor);
+    }
+    /// <summary>
+    /// Конструктор для наследников
+    /// </summary>
+    /// <param name="drawningShipWidth"></param>
+    /// <param name="drawningShipHeight"></param>
+    protected DrawningShip(int drawningShipWidth, int drawningShipHeight) : this()
+    {
+        _drawningShipHeight = drawningShipHeight;
+        _drawningShipWidth = drawningShipWidth;
+    }
+    public bool SetPictureSize(int width, int height) // установка размеров окна
+    {
+        if (width > _drawningShipWidth && height > _drawningShipHeight) //если размеры окна позволяют вместить корабль, то присваиваем 
+        {
+            if (_startX.HasValue && _startY.HasValue)
+            {
+                if (_drawningShipHeight + _startY.Value > height)
+                {
+                    _startY = height - _drawningShipHeight;
+                }
+                if (_drawningShipWidth + _startX.Value > width)
+                {
+                    _startX = width - _drawningShipWidth;
+                }
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            return true;
+        }
+        return false;
+    }
+    public void SetPosition(int x, int y) // установка позиции корабля 
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) // проверка инициализации размеров окна 
+            return;
+        if (x < 0 || x + _drawningShipWidth > _pictureWidth) // если корабль не вмещается по Х - присваиваем 0 
+            x = 0;
+        if (y < 0 || y + _drawningShipHeight > _pictureHeight) // если корабль не вмещается по Y - присваиваем 0
+            y = 0;
+        _startX = x;
+        _startY = y;
+    }
+    public bool MoveTransport(DirectionType direction) //метод движения корабля 
+    {
+        if (EntityShip == null || !_startX.HasValue || !_startY.HasValue) //проверка наличия корабля и инициализации начальной позиции
+            return false;
+        switch (direction)
+        {
+            case DirectionType.Left: // Влево
+                if (_startX.Value - EntityShip.Step > 0) // Проверяем, есть ли место для шага (аналогично далее)
+                    _startX -= (int)EntityShip.Step;
+                return true;
+            case DirectionType.Right: // Вправо
+                if (_startX.Value + EntityShip.Step + _drawningShipWidth < _pictureWidth)
+                    _startX += (int)EntityShip.Step;
+                return true;
+            case DirectionType.Up: // Вверх
+                if (_startY.Value - EntityShip.Step > 0)
+                    _startY -= (int)EntityShip.Step;
+                return true;
+            case DirectionType.Down: // Вниз
+                if (_startY.Value + _drawningShipHeight + EntityShip.Step < _pictureHeight)
+                    _startY += (int)EntityShip.Step;
+                return true;
+            default: return false;
+        }
+    }
+    public virtual void DrawTransport(Graphics g)  //метод рисования корабля 
+    {
+        if (EntityShip == null || !_startX.HasValue || !_startY.HasValue) //проверка наличия корабля и инициализации начальной позиции
+            return;
+        Pen pen = new(Color.Black, 3);
+        Brush br = new SolidBrush(EntityShip.BodyColor);
+        #region [Drawing]
+        // Гриницы Линкора
+        g.DrawLine(pen, _startX.Value + 3, _startY.Value, _startX.Value + 93, _startY.Value);
+        g.DrawLine(pen, _startX.Value + 93, _startY.Value, _startX.Value + 143, _startY.Value + 30);
+        g.DrawLine(pen, _startX.Value + 143, _startY.Value + 30, _startX.Value + 93, _startY.Value + 60);
+        g.DrawLine(pen, _startX.Value + 93, _startY.Value + 60, _startX.Value + 3, _startY.Value + 60);
+        g.DrawLine(pen, _startX.Value + 3, _startY.Value + 60, _startX.Value + 3, _startY.Value);
+        //Заливка 
+        g.FillRectangle(br, _startX.Value + 3, _startY.Value, 90, 60);
+        g.FillPolygon(br, new PointF[] { new PointF(_startX.Value + 93, _startY.Value), new PointF(_startX.Value + 143, _startY.Value + 30), new PointF(_startX.Value + 93, _startY.Value + 60) });
+        //Элементы палубы 
+        g.DrawEllipse(pen, _startX.Value + 83, _startY.Value + 20, 20, 20);
+        g.DrawRectangle(pen, _startX.Value + 63, _startY.Value + 15, 15, 30);
+        g.DrawRectangle(pen, _startX.Value + 43, _startY.Value + 25, 20, 10);
+        Brush brBlack = new SolidBrush(Color.Black);
+        g.FillRectangle(brBlack, _startX.Value, _startY.Value + 10, 3, 15);
+        g.FillRectangle(brBlack, _startX.Value, _startY.Value + 35, 3, 15);
+        #endregion
+    }
+}

Battleship/Battleship/Entities/EntityBattleship.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.Entities;
+// класс-сущность "Боевой корабль"
+public class EntityBattleship : EntityShip
+{
+    public Color AdditionalColor { get; private set; } // дополнительный цвет 
+    public bool Weapon { get; private set; } // оружие
+    public bool Rockets { get; set; } // рокеты
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodycolor">Основной цвет</param>
+    /// <param name="additionalcolor">Дополнительный цвет</param>
+    /// <param name="weapon">Наличие оружейной башни</param>
+    /// <param name="rockets">Наличие рокет</param>
+    public EntityBattleship(int speed, double weight, Color bodycolor, Color additionalcolor, bool weapon, bool rockets) : base(speed, weight, bodycolor) // инициализация полей объекта-класса военного корабля
+    {
+        AdditionalColor = additionalcolor;
+        Weapon = weapon;
+        Rockets = rockets;
+    }
+    /// <summary>
+    /// Метод смены цвета
+    /// </summary>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="addColor">Дополнительный цвет</param>
+    public void ChangeAddColor(Color? addColor)
+    {
+        AdditionalColor = addColor ?? AdditionalColor;
+    }
+}

Battleship/Battleship/Entities/EntityShip.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.Entities;
+/// <summary>
+/// Класс-сущность "Корабль"
+/// </summary>
+public class EntityShip
+{
+    public int Speed { get; private set; } // скорость
+    public double Weight { get; private set; } //вес 
+    public Color BodyColor { get; private set; } /*основной цвет*/
+    public double Step => Speed * 100 / Weight; // шаг перемещения корабля
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodycolor">Цвет</param>
+    public EntityShip(int speed, double weight, Color bodycolor) {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodycolor;
+    }
+    /// <summary>
+    /// Метод для смены цвета
+    /// </summary>
+    /// <param name="color">Цвет типа Color</param>
+    public void ChangeColor(Color? color)
+    {
+        BodyColor = color ?? BodyColor;
+    }
+}

Battleship/Battleship/Form1.Designer.cs

@@ -1,39 +0,0 @@
-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
-    }
-}

Battleship/Battleship/Form1.cs

@@ -1,10 +0,0 @@
-namespace Battleship
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

Battleship/Battleship/FormBattleship.Designer.cs

@@ -0,0 +1,145 @@
+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();
+            buttonUp = new Button();
+            buttonDown = new Button();
+            buttonLeft = new Button();
+            buttonRight = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxBattleship
+            // 
+            pictureBoxBattleship.Dock = DockStyle.Fill;
+            pictureBoxBattleship.Location = new Point(0, 0);
+            pictureBoxBattleship.Name = "pictureBoxBattleship";
+            pictureBoxBattleship.Size = new Size(1496, 902);
+            pictureBoxBattleship.TabIndex = 0;
+            pictureBoxBattleship.TabStop = false;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.right_arrow;
+            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonUp.Location = new Point(1389, 798);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(40, 40);
+            buttonUp.TabIndex = 2;
+            buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += ButtonMove_Click;
+            // 
+            // buttonDown
+            // 
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackgroundImage = Properties.Resources.right_arrow_2;
+            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonDown.Location = new Point(1389, 844);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(40, 40);
+            buttonDown.TabIndex = 3;
+            buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += ButtonMove_Click;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.right_arrow_4;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonLeft.Location = new Point(1343, 844);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(40, 40);
+            buttonLeft.TabIndex = 4;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.right_arrow_3;
+            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonRight.Location = new Point(1435, 844);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(40, 40);
+            buttonRight.TabIndex = 5;
+            buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.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(1232, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(243, 40);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStrategyStep.Location = new Point(1325, 70);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(150, 46);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
+            // FormBattleship
+            // 
+            AutoScaleDimensions = new SizeF(13F, 32F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1496, 902);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonRight);
+            Controls.Add(buttonLeft);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonUp);
+            Controls.Add(pictureBoxBattleship);
+            Name = "FormBattleship";
+            Text = "Линкор";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private PictureBox pictureBoxBattleship;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
+    }
+}

Battleship/Battleship/FormBattleship.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Battleship.Drawnings;
+using Battleship.Entities;
+using Battleship.MovementStrategy;
+namespace Battleship
+{
+    public partial class FormBattleship : Form
+    {
+        private DrawningShip? _drawningShip;
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// Получение объекта 
+        /// </summary>
+        public DrawningShip SetShip
+        {
+            set
+            {
+                _drawningShip = value; //??? value в сеттерах - стандартная переменная? 
+                _drawningShip.SetPictureSize(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
+        public FormBattleship()
+        {
+            InitializeComponent();
+            _strategy = null;
+        }
+        private void Draw() // метод рисования корабля 
+        {
+            if (_drawningShip == null)
+                return;
+            Bitmap bmp = new(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningShip.DrawTransport(gr);
+            pictureBoxBattleship.Image = bmp;
+        }
+        private void ButtonMove_Click(object sender, EventArgs e) // обработка кнопок движения
+        {
+            if (_drawningShip == null)
+                return;
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch (name)
+            {
+                case "buttonUp":
+                    result = _drawningShip.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    result = _drawningShip.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonRight":
+                    result = _drawningShip.MoveTransport(DirectionType.Right);
+                    break;
+                case "buttonLeft":
+                    result = _drawningShip.MoveTransport(DirectionType.Left);
+                    break;
+            }
+            if (result)
+                Draw();
+        }
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningShip == null)
+                return;
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                    return;
+                _strategy.SetData(new MoveableShip(_drawningShip), pictureBoxBattleship.Width, pictureBoxBattleship.Height);
+            }
+            if (_strategy == null)
+                return;
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
+    }
+}

Battleship/Battleship/FormShipCollection.Designer.cs

@@ -0,0 +1,288 @@
+namespace Battleship
+{
+    partial class FormShipCollection
+    {
+        /// <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()
+        {
+            Tools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddShip = new Button();
+            buttonRefresh = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonGoToTest = new Button();
+            buttonDelShip = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            Tools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // Tools
+            // 
+            Tools.Controls.Add(panelCompanyTools);
+            Tools.Controls.Add(buttonCreateCompany);
+            Tools.Controls.Add(panelStorage);
+            Tools.Controls.Add(comboBoxSelectorCompany);
+            Tools.Dock = DockStyle.Right;
+            Tools.Location = new Point(1605, 0);
+            Tools.Name = "Tools";
+            Tools.Size = new Size(488, 1236);
+            Tools.TabIndex = 0;
+            Tools.TabStop = false;
+            Tools.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddShip);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonGoToTest);
+            panelCompanyTools.Controls.Add(buttonDelShip);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(0, 686);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(488, 569);
+            panelCompanyTools.TabIndex = 8;
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(9, 3);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(473, 90);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавить корабль";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += ButtonAddShip_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(16, 432);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(466, 90);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox.Location = new Point(12, 195);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(470, 39);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // buttonGoToTest
+            // 
+            buttonGoToTest.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToTest.Location = new Point(16, 336);
+            buttonGoToTest.Name = "buttonGoToTest";
+            buttonGoToTest.Size = new Size(466, 90);
+            buttonGoToTest.TabIndex = 5;
+            buttonGoToTest.Text = "Передать на тест";
+            buttonGoToTest.UseVisualStyleBackColor = true;
+            buttonGoToTest.Click += ButtonGoToTest_Click;
+            // 
+            // buttonDelShip
+            // 
+            buttonDelShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonDelShip.Location = new Point(12, 240);
+            buttonDelShip.Name = "buttonDelShip";
+            buttonDelShip.Size = new Size(473, 90);
+            buttonDelShip.TabIndex = 4;
+            buttonDelShip.Text = "Удалить корабль";
+            buttonDelShip.UseVisualStyleBackColor = true;
+            buttonDelShip.Click += ButtonDelShip_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(9, 612);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(473, 68);
+            buttonCreateCompany.TabIndex = 7;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            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, 35);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(482, 512);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(6, 443);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(473, 46);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 32;
+            listBoxCollection.Location = new Point(9, 209);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(473, 228);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(6, 157);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(473, 46);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(306, 102);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(125, 36);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(43, 102);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(128, 36);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(6, 48);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(476, 39);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(128, 13);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(251, 32);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
+            // 
+            // 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, 566);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(476, 40);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(1605, 1236);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormShipCollection
+            // 
+            AutoScaleDimensions = new SizeF(13F, 32F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(2093, 1236);
+            Controls.Add(pictureBox);
+            Controls.Add(Tools);
+            Name = "FormShipCollection";
+            Text = "Коллекция кораблей";
+            Tools.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox Tools;
+        private Button buttonAddShip;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonDelShip;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonGoToTest;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
+    }
+}

Battleship/Battleship/FormShipCollection.cs

@@ -0,0 +1,240 @@
+using Battleship.CollectionGenericObjects;
+using Battleship.Drawnings;
+using ProjectSportCar.CollectionGenericObjects;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Battleship;
+
+public partial class FormShipCollection : Form
+{
+    private readonly StorageCollection<DrawningShip> _storageCollection;
+    /// <summary>
+	/// Компания
+	/// </summary>
+	private AbstractCompany? _company = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormShipCollection()
+    {
+        InitializeComponent();
+        _storageCollection = new();
+    }
+    #region Работа с компанией
+    /// <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 ButtonDelShip_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBox.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 ButtonGoToTest_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningShip? ship = null;
+        int counter = 100;
+        while (ship == null)
+        {
+            ship = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (ship == null)
+        {
+            return;
+        }
+
+        FormBattleship form = new()
+        {
+            SetShip = ship
+        };
+        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>
+    /// Кнопка добавления корабля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddShip_Click(object sender, EventArgs e)
+    {
+        FormShipConfig form = new();
+        form.AddEvent(SetShip);
+        form.Show();
+    }
+    /// <summary>
+    /// Метод установки корабля в компанию
+    /// </summary>
+    private void SetShip(DrawningShip? ship)
+    {
+        if (_company == null)
+            return;
+        if (_company + ship != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+    #endregion
+    #region Работа с коллекцией
+    /// <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)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            return;
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
+    }
+    /// <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 ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningShip>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Доки":
+                _company = new ShipDocks(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+    #endregion
+
+
+}

Battleship/Battleship/FormShipCollection.resx

@@ -0,0 +1,120 @@
+<?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>

Battleship/Battleship/FormShipConfig.Designer.cs

@@ -0,0 +1,357 @@
+namespace Battleship
+{
+    partial class FormShipConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelGray = new Panel();
+            panelOrange = new Panel();
+            panelPink = new Panel();
+            panelPurple = new Panel();
+            panelBlue = new Panel();
+            panelWhite = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxRockets = new CheckBox();
+            checkBoxWeapon = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxRockets);
+            groupBoxConfig.Controls.Add(checkBoxWeapon);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(996, 436);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelOrange);
+            groupBoxColors.Controls.Add(panelPink);
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(499, 52);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(471, 249);
+            groupBoxColors.TabIndex = 8;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(359, 135);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(76, 71);
+            panelGray.TabIndex = 3;
+            // 
+            // panelOrange
+            // 
+            panelOrange.BackColor = Color.Orange;
+            panelOrange.Location = new Point(359, 38);
+            panelOrange.Name = "panelOrange";
+            panelOrange.Size = new Size(76, 71);
+            panelOrange.TabIndex = 1;
+            // 
+            // panelPink
+            // 
+            panelPink.BackColor = Color.HotPink;
+            panelPink.Location = new Point(254, 135);
+            panelPink.Name = "panelPink";
+            panelPink.Size = new Size(76, 71);
+            panelPink.TabIndex = 4;
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(148, 135);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(76, 71);
+            panelPurple.TabIndex = 5;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(254, 38);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(76, 71);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(44, 135);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(76, 71);
+            panelWhite.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(148, 38);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(76, 71);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(44, 38);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(76, 71);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxRockets
+            // 
+            checkBoxRockets.AutoSize = true;
+            checkBoxRockets.Location = new Point(12, 265);
+            checkBoxRockets.Name = "checkBoxRockets";
+            checkBoxRockets.Size = new Size(374, 36);
+            checkBoxRockets.TabIndex = 7;
+            checkBoxRockets.Text = "Наличие рокетных установок";
+            checkBoxRockets.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxWeapon
+            // 
+            checkBoxWeapon.AutoSize = true;
+            checkBoxWeapon.Location = new Point(12, 207);
+            checkBoxWeapon.Name = "checkBoxWeapon";
+            checkBoxWeapon.Size = new Size(343, 36);
+            checkBoxWeapon.TabIndex = 6;
+            checkBoxWeapon.Text = "Наличие оруженой башни";
+            checkBoxWeapon.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(150, 124);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(240, 39);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 124);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(57, 32);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(150, 52);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(240, 39);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 52);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(121, 32);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(757, 326);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(169, 65);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(499, 326);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(169, 65);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(41, 97);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(379, 249);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(1028, 378);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(150, 46);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(1327, 378);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(150, 46);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(1028, 12);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(449, 360);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(251, 26);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(169, 65);
+            labelAdditionalColor.TabIndex = 10;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(41, 26);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(169, 65);
+            labelBodyColor.TabIndex = 9;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += LabelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += LabelBodyColor_DragEnter;
+            // 
+            // FormShipConfig
+            // 
+            AutoScaleDimensions = new SizeF(13F, 32F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1501, 436);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormShipConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSimpleObject;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private CheckBox checkBoxRockets;
+        private CheckBox checkBoxWeapon;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private GroupBox groupBoxColors;
+        private Panel panelGray;
+        private Panel panelOrange;
+        private Panel panelPink;
+        private Panel panelPurple;
+        private Panel panelBlue;
+        private Panel panelWhite;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

Battleship/Battleship/FormShipConfig.cs

@@ -0,0 +1,156 @@
+using Battleship.Drawnings;
+using Battleship.Entities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Battleship;
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormShipConfig : Form
+{
+    /// <summary>
+    /// Объект-прорисовка
+    /// </summary>
+    private DrawningShip? _ship;
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    private event Action<DrawningShip?> EventAddShip;
+    /// <summary>
+    /// Конструктор
+    /// </summary>labelModifiedObject
+    public FormShipConfig()
+    {
+        InitializeComponent();
+        panelRed.MouseDown += Panel_MouseDown;
+        panelGreen.MouseDown += Panel_MouseDown;
+        panelBlue.MouseDown += Panel_MouseDown;
+        panelPink.MouseDown += Panel_MouseDown;
+        panelWhite.MouseDown += Panel_MouseDown;
+        panelGray.MouseDown += Panel_MouseDown;
+        panelOrange.MouseDown += Panel_MouseDown;
+        panelPurple.MouseDown += Panel_MouseDown;
+
+        buttonCancel.Click += (s, e) => Close();
+    }
+    /// <summary>
+    /// Привязка внешнего метода к событию 
+    /// </summary>
+    public void AddEvent(Action<DrawningShip> action)
+    {
+        EventAddShip += action;
+    }
+    // <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _ship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _ship?.SetPosition(15, 15);
+        _ship?.DrawTransport(gr);
+        pictureBoxObject.Image = bmp;
+    }
+    /// <summary>
+    /// Передача данных по нажатию Label
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+    {
+        (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+    /// <summary>
+	/// Проверка получаемой информации (ее типа на соответствие требуемому)
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void PanelObject_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
+            e.Effect = DragDropEffects.Copy;
+        else
+            e.Effect = DragDropEffects.None;
+    }
+    /// <summary>
+    /// Действия при приеме перетаскиваемой информации
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void PanelObject_DragDrop(object sender, DragEventArgs e)
+    {
+        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+        {
+            case "labelSimpleObject":
+                _ship = new DrawningShip((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelModifiedObject":
+                _ship = new DrawningBattleship((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                    Color.Black, checkBoxWeapon.Checked, checkBoxRockets.Checked);
+                break;
+        }
+        DrawObject();
+    }
+    /// <summary>
+    /// Передаем информацию при нажатии на Panel
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void Panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+    /// <summary>
+    /// Проверка полчаемой в LabelBodyColor информации 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelBodyColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data.GetDataPresent(typeof(Color)) && _ship != null)
+            e.Effect = DragDropEffects.Copy;
+        else
+            e.Effect = DragDropEffects.None;
+    }
+    /// <summary>
+    /// Проверка полчаемой в LabelAdditionalColor информации 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data.GetDataPresent(typeof(Color)) && _ship != null && _ship is DrawningBattleship)
+            e.Effect = DragDropEffects.Copy;
+        else
+            e.Effect = DragDropEffects.None;
+    }
+    private void LabelBodyColor_DragDrop(object sender, DragEventArgs e)
+    {
+        var color = (Color)e?.Data?.GetData(typeof(Color));
+        _ship?.EntityShip?.ChangeColor(color);
+        DrawObject();
+    }
+    private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+    {
+        var color = (Color)e?.Data?.GetData(typeof(Color));
+        if (_ship is DrawningBattleship)
+        {
+            ((EntityBattleship?)_ship.EntityShip)?.ChangeAddColor(color);
+            DrawObject();
+        }
+    }
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        EventAddShip?.Invoke(_ship);
+        Close();
+    }
+}

Battleship/Battleship/FormShipConfig.resx

@@ -0,0 +1,120 @@
+<?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>

Battleship/Battleship/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Класс-стратегия перемещения объекта
+/// </summary>
+public abstract class AbstractStrategy
+{
+    private IMoveableObject? _moveableObject;
+    private StrategyStatus _state = StrategyStatus.NotInit;
+    protected int FieldWidth { get; private set;}
+    protected int FieldHeight { get; private set;}
+    public StrategyStatus GetStatus() => _state;
+    // ????? Почему не конструктор
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObject">Объект перемещения</param>
+    /// <param name="width">Ширина Поля</param>
+    /// <param name="height">Высота Поля</param>
+    public void SetData(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress) { return; }
+        if (IsTargetDestination())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+        MoveToTarget();
+    }
+    /// <summary>
+    /// Премещение влево
+    /// </summary>
+    /// <returns>true - успех, false - неудача</returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns>true - успех, false - неудача</returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns>true - успех, false - неудача</returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns>true - успех, false - неудача</returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+    /// <summary>
+    /// Параметры объекта
+    /// </summary>
+    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    /// <returns></returns>
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+            return null;
+        return _moveableObject?.GetStep;
+    }
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns>true - достигнута, false - не достигнута</returns>
+    protected abstract bool IsTargetDestination();
+    /// <summary>
+    /// Перемещение в нужном направлении
+    /// </summary>
+    /// <param name="movementDirection"></param>
+    /// <returns>true - успех, false - неудача</returns>
+    private bool MoveTo(MovementDirection movementDirection)
+    {
+        if (_state != StrategyStatus.InProgress)
+            return false;
+        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+    }
+}

Battleship/Battleship/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Интерфейс для работы с перемещаемым объектом
+/// </summary>
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - успех перемещения, false - неудача перемещения</returns>
+    bool TryMoveObject(MovementDirection direction);
+}

Battleship/Battleship/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,37 @@
+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()
+    {
+        ObjectParameters? objParameters = GetObjectParameters;
+        if (objParameters == null)
+        {
+            return false;
+        }
+        return (objParameters.RightBorder - GetStep() <= FieldWidth && objParameters.RightBorder + GetStep() >= FieldWidth &&
+            objParameters.BottomBorder - GetStep() <= FieldHeight && objParameters.BottomBorder + GetStep() >= FieldHeight);
+    }
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParameters = GetObjectParameters;
+        if (objParameters == null)
+        {
+            return;
+        }
+        int diffx = FieldWidth - objParameters.RightBorder;
+        if (diffx > GetStep())
+        {
+            MoveRight();
+        }
+        int diffy = FieldHeight - objParameters.BottomBorder;
+        if (diffy > GetStep())
+        {
+            MoveDown();
+        }
+    }
+}

Battleship/Battleship/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestination()
+    {
+        ObjectParameters? objParameters = GetObjectParameters;
+        if (objParameters == null){
+            return false;
+        }
+        return (objParameters.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParameters.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParameters.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParameters.ObjectMiddleVertical + GetStep() >= FieldHeight / 2);
+    }
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParameters = GetObjectParameters;
+        if (objParameters == null) {
+            return;
+        }
+        int diffx = objParameters.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffx) > GetStep()){
+            if (diffx > 0)
+                MoveLeft();
+            else
+                MoveRight();
+        }
+        int diffy = objParameters.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffy) > GetStep())
+        {
+            if (diffy > 0)
+                MoveUp();
+            else
+                MoveDown();
+        }
+    }
+}

Battleship/Battleship/MovementStrategy/MoveableShip.cs

@@ -0,0 +1,54 @@
+using Battleship.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Класс-реализация IMoveableObject с помощью DrawningShip
+/// </summary>
+public class MoveableShip : IMoveableObject
+{
+    private readonly DrawningShip? _ship = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="drawningShip">Объект класса DrawningShip</param>
+    public MoveableShip(DrawningShip drawningShip)
+    {
+        _ship = drawningShip;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get 
+        {
+            if (_ship == null || !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
+                return null;
+            return new ObjectParameters(_ship.GetPosX.Value, _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_ship == null || _ship.EntityShip == null)
+            return false;
+        return _ship.MoveTransport(GetDirectionType(direction));
+    }
+    /// <summary>
+    /// Преобразование из DrawningShip
+    /// </summary>
+    /// <param name="direction"></param>
+    /// <returns></returns>
+    public 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.Unknown,
+        };
+    }
+}

Battleship/Battleship/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 3, 
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 4
+}

Battleship/Battleship/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Параметры-координаты объекта
+/// </summary>
+public class ObjectParameters
+{
+    private readonly int _x;
+    private readonly int _y;
+    private readonly int _width;
+    private readonly int _height;
+    public int LeftBorder => _x;
+    public int TopBorder => _y; 
+    public int RightBorder => _x + _width;
+    public int BottomBorder => _y + _height;
+    public int ObjectMiddleHorizontal => _x + _width / 2;
+    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;
+    }
+}

Battleship/Battleship/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Статус выполнения операции пермещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Готов к началу
+    /// </summary>
+    NotInit,
+    /// <summary>
+    /// В процессе
+    /// </summary>
+    InProgress,
+    /// <summary>
+    /// Выполнено
+    /// </summary>
+    Finish
+}

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 Form1());
+            Application.Run(new FormShipCollection());
         }
     }
 }

Battleship/Battleship/Properties/Resources.Designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <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 right_arrow {
+            get {
+                object obj = ResourceManager.GetObject("right-arrow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap right_arrow_2 {
+            get {
+                object obj = ResourceManager.GetObject("right-arrow-2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap right_arrow_3 {
+            get {
+                object obj = ResourceManager.GetObject("right-arrow-3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap right_arrow_4 {
+            get {
+                object obj = ResourceManager.GetObject("right-arrow-4", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

Battleship/Battleship/Properties/Resources.resx

@@ -0,0 +1,133 @@
+<?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="right-arrow-4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right-arrow-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="right-arrow-2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right-arrow-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="right-arrow-3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right-arrow-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="right-arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>