Battleship/Battleship/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,111 @@
+using Battleship.Drawings;
+
+namespace Battleship.CollectionGenericObjects;
+
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 210;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 80;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected int _pictureHeight;
+
+    protected ICollectionGenericObjects<DrawingWarship>? _collection = null;
+
+    /// <summary>
+    /// Вычисление максимального количества элементов, который можно разместить в окне
+    /// </summary>
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _pictureHeight);
+
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина окна</param>
+    /// <param name="picHeight">Высота окна</param>
+    /// <param name="collection">Коллеккция кораблей</param>
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawingWarship> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перезагрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="car">Добавляемый объект</param>
+    /// <returns></returns>
+    public static bool operator +(AbstractCompany company, DrawingWarship car)
+    {
+        return company._collection?.Insert(car) ?? false;
+    }
+
+    /// <summary>
+    /// Перезагрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static bool operator -(AbstractCompany company, int position) 
+    { 
+        return company._collection?.Remove(position) ?? false;
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawingWarship? GetRandomObject()
+    {
+        Random rnd = new();
+        return _collection?.Get(rnd.Next(GetMaxCount));
+    }
+
+    /// <summary>
+    /// Вывод всей коллекции
+    /// </summary>
+    /// <returns></returns>
+    public Bitmap? Show()
+    {
+        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+        Graphics graphics = Graphics.FromImage(bitmap);
+        DrawBackground(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            DrawingWarship? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackground(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}
+

Battleship/Battleship/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,13 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Battleship.CollectionGenericObjects;
+namespace Battleship.CollectionGenericObjects;
 
+/// <summary>
+/// Интерфейс описания действий для набора хранимых объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public interface ICollectionGenericObjects<T>
     where T : class
+
 {
     /// <summary>
     /// Количество объектов в коллекции

Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Battleship.CollectionGenericObjects;
+namespace Battleship.CollectionGenericObjects;
 
 /// <summary>
 /// Параметрированный набор объектов
@@ -33,12 +27,26 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     public T? Get(int position)
     {
         //TODO проверка позиции
+        if(position >= _collection.Length || position < 0)
+        {
+            return null;
+        }
         return _collection[position];
     }
 
     public bool Insert(T obj)
     {
         //TODO вставка в свободное место набора
+        int index = 0;
+        while (index < _collection.Length)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return true;
+            }
+            index++;
+        }
         return false;
     }
 
@@ -48,6 +56,28 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
         //     ищется свободное место после этой позиции и идет вставка туда
         // TODO вставка
+        if (position >= _collection.Length || position < 0)
+            return false;
+
+        while (position + 1 < _collection.Length)
+        {
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return true;
+            }
+            position++;
+        }
+
+        while (position - 1 >= 0)
+        {
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return true;
+            }
+            position--;
+        }
         return false;
 
     }
@@ -56,6 +86,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     {
         // TODO проверка позиции
         // TODO удаление объекта из массива, присвоив элементу массива значение null
+        if (position >= _collection.Length || position < 0)
+        {
+            return false;
+        }
+        _collection[position] = null;
         return true;
     }
-}
+}

Battleship/Battleship/CollectionGenericObjects/WarshipSharingService.cs

@@ -0,0 +1,54 @@
+using Battleship.Drawings;
+
+namespace Battleship.CollectionGenericObjects;
+
+public class WarshipSharingService : AbstractCompany
+{
+
+    public WarshipSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingWarship> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackground(Graphics g)
+    {
+        Pen pen = new(Color.Black, 3);
+        for (int i = 0; i <= _pictureWidth / _placeSizeWidth; i++)
+        {
+            for (int j = 0; j <= _pictureHeight / _placeSizeHeight; j++)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+            }
+            g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int posWidth = 0;
+        int posHeight = height;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            if (_collection?.Get(i) != null)
+            {
+                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(i)?.SetPosition(_placeSizeWidth * posWidth + 4, posHeight * _placeSizeHeight + 4, width, height);
+            }
+
+            if (posWidth < width)
+                posWidth++;
+            else
+            {
+                posWidth = 0;
+                posHeight--;
+            }
+            if (posHeight < 0)
+            {
+                return;
+            }
+        }
+    }
+}

Battleship/Battleship/FormBattleship.Designer.cs

@@ -29,12 +29,10 @@ partial class FormBattleship
     private void InitializeComponent()
     {
         pictureBoxBattleship = new PictureBox();
-        buttonCreate = new Button();
         buttonLeft = new Button();
         buttonDown = new Button();
         buttonRight = new Button();
         buttonUp = new Button();
-        buttonCreateWarshit = new Button();
         comboBoxStrategy = new ComboBox();
         buttonStrategyStep = new Button();
         ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).BeginInit();
@@ -48,17 +46,6 @@ partial class FormBattleship
         pictureBoxBattleship.TabIndex = 0;
         pictureBoxBattleship.TabStop = false;
         // 
-        // buttonCreate
-        // 
-        buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-        buttonCreate.Location = new Point(12, 518);
-        buttonCreate.Name = "buttonCreate";
-        buttonCreate.Size = new Size(267, 29);
-        buttonCreate.TabIndex = 0;
-        buttonCreate.Text = "Создать линкор";
-        buttonCreate.UseVisualStyleBackColor = true;
-        buttonCreate.Click += buttonCreate_Click;
-        // 
         // buttonLeft
         // 
         buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -107,17 +94,6 @@ partial class FormBattleship
         buttonUp.UseVisualStyleBackColor = true;
         buttonUp.Click += buttonMove_Click;
         // 
-        // buttonCreateWarshit
-        // 
-        buttonCreateWarshit.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-        buttonCreateWarshit.Location = new Point(316, 518);
-        buttonCreateWarshit.Name = "buttonCreateWarshit";
-        buttonCreateWarshit.Size = new Size(267, 29);
-        buttonCreateWarshit.TabIndex = 5;
-        buttonCreateWarshit.Text = "Создать военный корабль";
-        buttonCreateWarshit.UseVisualStyleBackColor = true;
-        buttonCreateWarshit.Click += buttonCreateWarshit_Click;
-        // 
         // comboBoxStrategy
         // 
         comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -147,12 +123,10 @@ partial class FormBattleship
         ClientSize = new Size(957, 559);
         Controls.Add(buttonStrategyStep);
         Controls.Add(comboBoxStrategy);
-        Controls.Add(buttonCreateWarshit);
         Controls.Add(buttonUp);
         Controls.Add(buttonRight);
         Controls.Add(buttonDown);
         Controls.Add(buttonLeft);
-        Controls.Add(buttonCreate);
         Controls.Add(pictureBoxBattleship);
         Name = "FormBattleship";
         Text = "Линкор";
@@ -163,12 +137,10 @@ partial class FormBattleship
     #endregion
 
     private PictureBox pictureBoxBattleship;
-    private Button buttonCreate;
     private Button buttonDown;
     private Button buttonRight;
     private Button buttonUp;
     private Button buttonLeft;
-    private Button buttonCreateWarshit;
     private ComboBox comboBoxStrategy;
     private Button buttonStrategyStep;
 }

Battleship/Battleship/FormBattleship.cs

@@ -17,6 +17,21 @@ public partial class FormBattleship : Form
     /// </summary>
     private AbstractStrategy? _strategy;
 
+
+    /// <summary>
+    /// Получение объекта
+    /// </summary>
+    public DrawingWarship SetWarship
+    {
+        set
+        {
+            _drawingWarship = value;
+            _drawingWarship.SetPictureSize(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
+            _strategy = null;
+            Draw();
+        }
+    }
+
     /// <summary>
     /// Конструктор формы
     /// </summary>
@@ -43,54 +58,6 @@ public partial class FormBattleship : Form
 
     }
 
-    private void CreateObject(string type)
-    {
-        Random random = new();
-        switch (type)
-        {
-            case nameof(DrawingWarship):
-                _drawingWarship = new DrawingWarship(random.Next(100, 300), random.Next(1000, 3000),
-                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-                break;
-            case nameof(DrawingBattleship):
-                _drawingWarship = new DrawingBattleship(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)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-
-        _drawingWarship.SetPictureSize(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
-        _drawingWarship.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBoxBattleship.Width, pictureBoxBattleship.Height);
-        _strategy = null;
-        comboBoxStrategy.Enabled = true;
-        Draw();
-    }
-
-    /// <summary>
-    /// обработка нажатия кнопки "создать линкор"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void buttonCreate_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawingBattleship));
-
-    }
-
-    /// <summary>
-    /// обработка нажатия кнопки "создать военный корабль"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void buttonCreateWarshit_Click(object sender, EventArgs e)
-    {
-        CreateObject(nameof(DrawingWarship));
-
-    }
-
     /// <summary>
     /// кнопки вверх/вниз/влево/вправо 
     /// </summary>
@@ -157,13 +124,13 @@ public partial class FormBattleship : Form
             return;
         }
         comboBoxStrategy.Enabled = false;
-         _strategy.MakeStep();
-         Draw();
+        _strategy.MakeStep();
+        Draw();
 
-         if (_strategy.GetStatus() == StrategyStatus.Finish)
-         {
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
             comboBoxStrategy.Enabled = true;
             _strategy = null;
-         }
+        }
     }
 }

Battleship/Battleship/FormWarshipCollection.Designer.cs

@@ -0,0 +1,173 @@
+namespace Battleship
+{
+    partial class FormWarshipCollection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            groupBoxTools = new GroupBox();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveWarship = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddBattleship = new Button();
+            buttonAddWarship = new Button();
+            comboBoxSelectionCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveWarship);
+            groupBoxTools.Controls.Add(maskedTextBox);
+            groupBoxTools.Controls.Add(buttonAddBattleship);
+            groupBoxTools.Controls.Add(buttonAddWarship);
+            groupBoxTools.Controls.Add(comboBoxSelectionCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(706, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(273, 594);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(12, 477);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(255, 42);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(12, 381);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(255, 42);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
+            // 
+            // buttonRemoveWarship
+            // 
+            buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveWarship.Location = new Point(12, 283);
+            buttonRemoveWarship.Name = "buttonRemoveWarship";
+            buttonRemoveWarship.Size = new Size(255, 42);
+            buttonRemoveWarship.TabIndex = 4;
+            buttonRemoveWarship.Text = "Удалить корабль";
+            buttonRemoveWarship.UseVisualStyleBackColor = true;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox.Location = new Point(12, 238);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(255, 27);
+            maskedTextBox.TabIndex = 3;
+            // 
+            // buttonAddBattleship
+            // 
+            buttonAddBattleship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddBattleship.Location = new Point(12, 143);
+            buttonAddBattleship.Name = "buttonAddBattleship";
+            buttonAddBattleship.Size = new Size(255, 42);
+            buttonAddBattleship.TabIndex = 2;
+            buttonAddBattleship.Text = "Добавление линкора";
+            buttonAddBattleship.UseVisualStyleBackColor = true;
+            buttonAddBattleship.Click += buttonAddBattleship_Click;
+            // 
+            // buttonAddWarship
+            // 
+            buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddWarship.Location = new Point(12, 95);
+            buttonAddWarship.Name = "buttonAddWarship";
+            buttonAddWarship.Size = new Size(255, 42);
+            buttonAddWarship.TabIndex = 1;
+            buttonAddWarship.Text = "Добавление корабля";
+            buttonAddWarship.UseVisualStyleBackColor = true;
+            buttonAddWarship.Click += buttonAddWarship_Click;
+            // 
+            // comboBoxSelectionCompany
+            // 
+            comboBoxSelectionCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectionCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectionCompany.FormattingEnabled = true;
+            comboBoxSelectionCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectionCompany.Location = new Point(12, 26);
+            comboBoxSelectionCompany.Name = "comboBoxSelectionCompany";
+            comboBoxSelectionCompany.Size = new Size(255, 28);
+            comboBoxSelectionCompany.TabIndex = 0;
+            comboBoxSelectionCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(706, 594);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormWarshipCollection
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(979, 594);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormWarshipCollection";
+            Text = "Коллекция кораблей";
+            //Load += this.FormWarshipCollection_Load;
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectionCompany;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddBattleship;
+        private Button buttonAddWarship;
+        private Button buttonRemoveWarship;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonGoToCheck;
+    }
+}

Battleship/Battleship/FormWarshipCollection.cs

@@ -0,0 +1,185 @@
+using Battleship.CollectionGenericObjects;
+using Battleship.Drawings;
+
+namespace Battleship;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormWarshipCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор 
+    /// </summary>
+    public FormWarshipCollection()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectionCompany.Text)
+        {
+            case "Хранилище":
+                _company = new WarshipSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawingWarship>());
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Создание объекта
+    /// </summary>
+    /// <param name="type"></param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        Random random = new();
+        DrawingWarship drawingWarship;
+        switch (type)
+        {
+            case nameof(DrawingWarship):
+                drawingWarship = new DrawingWarship(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawingBattleship):
+                drawingWarship = new DrawingBattleship(random.Next(100, 300), random.Next(1000, 3000),
+                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)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawingWarship)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+    /// Получение цвета
+    /// </summary>
+    /// <param name="random">Генератор случайных чисел</param>
+    /// <returns></returns>
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+        return color;
+    }
+
+    /// <summary>
+    /// Добавление линкора
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddBattleship_Click(object sender, EventArgs e)
+    {
+        CreateObject(nameof(DrawingBattleship));
+    }
+
+    /// <summary>
+    /// Добавление военного корабля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddWarship_Click(object sender, EventArgs e)
+    {
+        CreateObject(nameof(DrawingWarship));
+    }
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveCar_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+        if (_company - pos)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+
+    /// <summary>
+    /// Передача на тесты
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawingWarship? warship = null;
+        int counter = 100;
+        while (warship == null) 
+        {
+            warship = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        FormBattleship form = new FormBattleship();
+        form.SetWarship = warship;
+        form.ShowDialog();
+
+    }
+
+    /// <summary>
+    /// Обновление
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        pictureBox.Image = _company.Show();
+    }
+}

Battleship/Battleship/FormWarshipCollection.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 FormWarshipCollection());
         }
     }
 }