Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,119 @@
+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/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/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/Drawnings/DrawningBattleship.cs

@@ -10,12 +10,18 @@ namespace Battleship.Drawnings;
 public class DrawningBattleship : DrawningShip
 {
     /// <summary>
-    /// Конструктор 
+    /// Конструктор
     /// </summary>
-    /// <param name="entityBattleship">объект класса-сущности</param>
-    public DrawningBattleship(EntityBattleship entityBattleship) : base(143, 75)
+    /// <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 = entityBattleship;
+        EntityShip = new EntityBattleship(speed, weight, bodycolor, additionalcolor, weapon, rockets);
     }
     public override void DrawTransport(Graphics g)
     {

Battleship/Battleship/Drawnings/DrawningShip.cs

@@ -45,12 +45,14 @@ public class DrawningShip
         _startY = null;
     }
     /// <summary>
-    /// Конструктор прорисовки
-    /// </summary>
-    /// <param name="entityShip">Объект класса-сущности</param>
-    public DrawningShip(EntityShip entityShip) : this()
+	/// Конструктор
+	/// </summary>
+	/// <param name="speed">Скорость</param>
+	/// <param name="weight">Вес</param>
+	/// <param name="bodyColor">Основной цвет</param>
+	public DrawningShip(int speed, double weight, Color bodyColor) : this()
     {
-        EntityShip = entityShip;
+        EntityShip = new EntityShip(speed, weight, bodyColor);
     }
     /// <summary>
     /// Конструктор для наследников

Battleship/Battleship/FormBattleship.Designer.cs

@@ -27,12 +27,10 @@
         private void InitializeComponent()
         {
             pictureBoxBattleship = new PictureBox();
-            buttonCreate = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
-            buttonCreateSimple = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).BeginInit();
@@ -47,17 +45,6 @@
             pictureBoxBattleship.TabIndex = 0;
             pictureBoxBattleship.TabStop = false;
             // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 844);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(316, 46);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать боевой корабль";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += buttonCreate_Click;
-            // 
             // buttonUp
             // 
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -106,17 +93,6 @@
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreateSimple
-            // 
-            buttonCreateSimple.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateSimple.Location = new Point(334, 844);
-            buttonCreateSimple.Name = "buttonCreateSimple";
-            buttonCreateSimple.Size = new Size(316, 46);
-            buttonCreateSimple.TabIndex = 6;
-            buttonCreateSimple.Text = "Создать корабль";
-            buttonCreateSimple.UseVisualStyleBackColor = true;
-            buttonCreateSimple.Click += buttonCreateSimple_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -146,12 +122,10 @@
             ClientSize = new Size(1496, 902);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateSimple);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
-            Controls.Add(buttonCreate);
             Controls.Add(pictureBoxBattleship);
             Name = "FormBattleship";
             Text = "Линкор";
@@ -161,12 +135,10 @@
 
         #endregion
         private PictureBox pictureBoxBattleship;
-        private Button buttonCreate;
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonLeft;
         private Button buttonRight;
-        private Button buttonCreateSimple;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

Battleship/Battleship/FormBattleship.cs

@@ -15,9 +15,22 @@ namespace Battleship
     public partial class FormBattleship : Form
     {
         private DrawningShip? _drawningShip;
-        private EntityShip? _entityShip;
-        private EntityBattleship? _entityBattleship;
         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();
@@ -32,41 +45,6 @@ namespace Battleship
             _drawningShip.DrawTransport(gr);
             pictureBoxBattleship.Image = bmp;
         }
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningShip):
-                    _entityShip = new EntityShip(random.Next(100, 300), random.Next(1000, 3000),
-                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-                    _drawningShip = new DrawningShip(_entityShip);
-                    break;
-                case nameof(DrawningBattleship):
-                    _entityBattleship = new EntityBattleship(random.Next(100, 300), random.Next(1000, 3000),
-                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                        Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    _drawningShip = new DrawningBattleship(_entityBattleship);
-                    break;
-                default:
-                    return;
-            }
-            _drawningShip.SetPictureSize(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
-            _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true; 
-            Draw();
-        }
-        private void buttonCreate_Click(object sender, EventArgs e) // обработка кнопки "создать боевой корабль"
-        {
-            CreateObject(nameof(DrawningBattleship));
-        }
-        private void buttonCreateSimple_Click(object sender, EventArgs e) // обработка кнопки "создать корабль"
-        {
-            CreateObject(nameof(DrawningShip));
-
-        }
         private void ButtonMove_Click(object sender, EventArgs e) // обработка кнопок движения
         {
             if (_drawningShip == null)

Battleship/Battleship/FormShipCollection.Designer.cs

@@ -0,0 +1,174 @@
+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();
+            buttonRefresh = new Button();
+            buttonGoToTest = new Button();
+            buttonDelShip = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddBettleship = new Button();
+            buttonAddShip = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            Tools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // Tools
+            // 
+            Tools.Controls.Add(buttonRefresh);
+            Tools.Controls.Add(buttonGoToTest);
+            Tools.Controls.Add(buttonDelShip);
+            Tools.Controls.Add(maskedTextBox);
+            Tools.Controls.Add(buttonAddBettleship);
+            Tools.Controls.Add(buttonAddShip);
+            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 = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(14, 1134);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(468, 90);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonGoToTest
+            // 
+            buttonGoToTest.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToTest.Location = new Point(6, 768);
+            buttonGoToTest.Name = "buttonGoToTest";
+            buttonGoToTest.Size = new Size(476, 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(6, 573);
+            buttonDelShip.Name = "buttonDelShip";
+            buttonDelShip.Size = new Size(476, 90);
+            buttonDelShip.TabIndex = 4;
+            buttonDelShip.Text = "Удалить корабль";
+            buttonDelShip.UseVisualStyleBackColor = true;
+            buttonDelShip.Click += ButtonDelShip_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox.Location = new Point(6, 520);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(476, 39);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // buttonAddBettleship
+            // 
+            buttonAddBettleship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddBettleship.Location = new Point(6, 283);
+            buttonAddBettleship.Name = "buttonAddBettleship";
+            buttonAddBettleship.Size = new Size(476, 90);
+            buttonAddBettleship.TabIndex = 2;
+            buttonAddBettleship.Text = "Добавить боевой корабль";
+            buttonAddBettleship.UseVisualStyleBackColor = true;
+            buttonAddBettleship.Click += ButtonAddBattleship_Click;
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(6, 172);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(476, 90);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавить корабль";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += buttonAddShip_Click_1;
+            // 
+            // 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(6, 38);
+            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);
+            Tools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox Tools;
+        private Button buttonAddBettleship;
+        private Button buttonAddShip;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonDelShip;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonGoToTest;
+    }
+}

Battleship/Battleship/FormShipCollection.cs

@@ -0,0 +1,166 @@
+using Battleship.CollectionGenericObjects;
+using Battleship.Drawnings;
+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
+{
+    /// <summary>
+	/// Компания
+	/// </summary>
+	private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormShipCollection()
+    {
+        InitializeComponent();
+    }
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Доки":
+                _company = new ShipDocks(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
+                break;
+        }
+
+    }
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawningShip drawningShip;
+        switch (type)
+        {
+            case nameof(DrawningShip):
+                drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningBattleship):
+                drawningShip = new DrawningBattleship(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random), GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawningShip != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+    /// Получение цвета
+    /// </summary>
+    /// <param name="random">Генератор случайных чисел</param>
+    /// <returns></returns>
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+        return color;
+    }
+
+    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("Не удалось удалить объект");
+        }
+    }
+
+    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();
+
+    }
+
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+    private void ButtonAddBattleship_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBattleship));
+
+    private void buttonAddShip_Click_1(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
+}

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