ProjectWarmlyShip/ProjectWarmlyShip/DrawingWarmlyShip.cs

@@ -37,20 +37,16 @@ namespace ProjectWarmlyShip.DrawningObjects
                 return;
             }
             Brush additionalBrush = new SolidBrush(warmlyShip.AdditionalColor);
-
             //трубы 
             if (warmlyShip.ShipPipes)
             {
-                Brush brBl = new SolidBrush(Color.Black);
-                g.FillRectangle(brBl, _startPosX + 180, _startPosY + 2, 3, 12);
-                g.FillRectangle(brBl, _startPosX + 185, _startPosY + 4, 5, 10);
+                g.FillRectangle(additionalBrush, _startPosX + 180, _startPosY + 2, 3, 12);
+                g.FillRectangle(additionalBrush, _startPosX + 185, _startPosY + 4, 5, 10);
             }
-
             //топливо
             if (warmlyShip.ShipFuel)
             {
-                Brush bryell = new SolidBrush(Color.Yellow);
-                g.FillRectangle(bryell, _startPosX + 12, _startPosY + 5, 27, 7);
+                g.FillRectangle(additionalBrush, _startPosX + 12, _startPosY + 5, 27, 7);
             }
             base.DrawTransport(g);
         }

ProjectWarmlyShip/ProjectWarmlyShip/DrawningShip.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using static ProjectWarmlyShip.DirectionType;
 using ProjectWarmlyShip.Entities;
+using ProjectWarmlyShip.MovementStrategy;
 
 namespace ProjectWarmlyShip.DrawningObjects
 {
@@ -192,5 +193,9 @@ namespace ProjectWarmlyShip.DrawningObjects
             Brush brBl = new SolidBrush(Color.LightBlue);
             g.FillRectangle(brBl, _startPosX + 50, _startPosY + 0, 125, 12);
         }
+        /// <summary>
+        /// Получение объекта IMoveableObject из объекта DrawningCar
+        /// </summary>
+        public IMoveableObject GetMoveableObject => new DrawningObjectShip(this);
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.Designer.cs

@@ -0,0 +1,126 @@
+namespace ProjectWarmlyShip
+{
+    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()
+        {
+            pictureBoxCollection = new PictureBox();
+            groupBox1 = new GroupBox();
+            maskedTextBoxNumber = new MaskedTextBox();
+            buttonRefreshCollection = new Button();
+            buttonRemoveShip = new Button();
+            ButtonAddShip = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+            groupBox1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // pictureBoxCollection
+            // 
+            pictureBoxCollection.Dock = DockStyle.Fill;
+            pictureBoxCollection.Location = new Point(0, 0);
+            pictureBoxCollection.Name = "pictureBoxCollection";
+            pictureBoxCollection.Size = new Size(800, 450);
+            pictureBoxCollection.SizeMode = PictureBoxSizeMode.AutoSize;
+            pictureBoxCollection.TabIndex = 0;
+            pictureBoxCollection.TabStop = false;
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(maskedTextBoxNumber);
+            groupBox1.Controls.Add(buttonRefreshCollection);
+            groupBox1.Controls.Add(buttonRemoveShip);
+            groupBox1.Controls.Add(ButtonAddShip);
+            groupBox1.Location = new Point(625, 0);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(175, 450);
+            groupBox1.TabIndex = 1;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Инструменты";
+            // 
+            // maskedTextBoxNumber
+            // 
+            maskedTextBoxNumber.Location = new Point(16, 175);
+            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            maskedTextBoxNumber.Size = new Size(136, 23);
+            maskedTextBoxNumber.TabIndex = 3;
+            // 
+            // buttonRefreshCollection
+            // 
+            buttonRefreshCollection.Location = new Point(16, 305);
+            buttonRefreshCollection.Name = "buttonRefreshCollection";
+            buttonRefreshCollection.Size = new Size(136, 23);
+            buttonRefreshCollection.TabIndex = 2;
+            buttonRefreshCollection.Text = "Обновить коллекцию";
+            buttonRefreshCollection.UseVisualStyleBackColor = true;
+            buttonRefreshCollection.Click += ButtonRefreshCollection_Click;
+            // 
+            // buttonRemoveShip
+            // 
+            buttonRemoveShip.Location = new Point(16, 214);
+            buttonRemoveShip.Name = "buttonRemoveShip";
+            buttonRemoveShip.Size = new Size(136, 23);
+            buttonRemoveShip.TabIndex = 1;
+            buttonRemoveShip.Text = "Удалить корабль";
+            buttonRemoveShip.UseVisualStyleBackColor = true;
+            buttonRemoveShip.Click += ButtonRemoveShip_Click;
+            // 
+            // ButtonAddShip
+            // 
+            ButtonAddShip.Location = new Point(16, 39);
+            ButtonAddShip.Name = "ButtonAddShip";
+            ButtonAddShip.Size = new Size(136, 23);
+            ButtonAddShip.TabIndex = 0;
+            ButtonAddShip.Text = "Добавить корабль";
+            ButtonAddShip.UseVisualStyleBackColor = true;
+            ButtonAddShip.Click += ButtonAddShip_Click;
+            // 
+            // FormShipCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 450);
+            Controls.Add(groupBox1);
+            Controls.Add(pictureBoxCollection);
+            Name = "FormShipCollection";
+            Text = "FormShipCollection";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxCollection;
+        private GroupBox groupBox1;
+        private Button buttonRefreshCollection;
+        private Button buttonRemoveShip;
+        private Button ButtonAddShip;
+        private MaskedTextBox maskedTextBoxNumber;
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs

@@ -0,0 +1,94 @@
+using ProjectWarmlyShip.DrawningObjects;
+using ProjectWarmlyShip.Generics;
+using ProjectWarmlyShip.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectWarmlyShip
+{
+    /// <summary>
+    /// Форма для работы с набором объектов класса DrawningCar
+    /// </summary>
+    public partial class FormShipCollection : Form
+    {
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly ShipsGenericCollection<DrawningShip, DrawningObjectShip> _ships;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormShipCollection()
+        {
+            InitializeComponent();
+            _ships = new ShipsGenericCollection<DrawningShip, DrawningObjectShip>(pictureBoxCollection.Width, pictureBoxCollection.Height);
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddShip_Click(object sender, EventArgs e)
+        {
+            FormWarmlyShip form = new FormWarmlyShip();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                if (_ships + form.SelectedShip != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollection.Image = _ships.ShowShips();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта из набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveShip_Click(object sender, EventArgs e)
+        {
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+          MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = -1;
+            try
+            {
+                pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            }
+            catch (Exception ex) { }
+            if (_ships - pos)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = _ships.ShowShips();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Обновление рисунка по набору
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image = _ships.ShowShips();
+        }
+    }
+
+}

ProjectWarmlyShip/ProjectWarmlyShip/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>

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.Designer.cs

@@ -38,6 +38,7 @@
             buttonCreateDeckShip = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStep = new Button();
+            buttonSelectShip = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxWarmlyShip).BeginInit();
             SuspendLayout();
             // 
@@ -134,11 +135,22 @@
             buttonStep.UseVisualStyleBackColor = true;
             buttonStep.Click += ButtonStep_Click;
             // 
+            // buttonSelectShip
+            // 
+            buttonSelectShip.Location = new Point(276, 415);
+            buttonSelectShip.Name = "buttonSelectShip";
+            buttonSelectShip.Size = new Size(75, 23);
+            buttonSelectShip.TabIndex = 9;
+            buttonSelectShip.Text = "выбрать";
+            buttonSelectShip.UseVisualStyleBackColor = true;
+            buttonSelectShip.Click += ButtonSelectShip_Click;
+            // 
             // FormWarmlyShip
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 450);
+            Controls.Add(buttonSelectShip);
             Controls.Add(buttonStep);
             Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateDeckShip);
@@ -166,5 +178,6 @@
         private Button buttonCreateDeckShip;
         private ComboBox comboBoxStrategy;
         private Button buttonStep;
+        private Button buttonSelectShip;
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.cs

@@ -20,6 +20,10 @@ namespace ProjectWarmlyShip
         /// <summary>
         /// Èíèöèàëèçàöèÿ ôîðìû
         /// </summary>
+        /// <summary>
+        /// Âűáđŕííűé ęîđŕáëü
+        /// </summary>
+        public DrawningShip? SelectedShip { get; private set; }
         public FormWarmlyShip()
         {
             InitializeComponent();
@@ -48,8 +52,15 @@ namespace ProjectWarmlyShip
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
+            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;
+            }
             _drawingWarmlyShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
+            color, pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
 
             _drawingWarmlyShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
@@ -62,10 +73,25 @@ namespace ProjectWarmlyShip
         private void buttonCreateDeckShip_Click(object sender, EventArgs e)
         {
             Random random = new();
+
+            //TODO âűáîđ îńíîâíîăî öâĺňŕ
+            Color coloros = Color.FromArgb(random.Next(0, 256),
+           random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                coloros = dialog.Color;
+            }
+            //TODO âűáîđ äîďîëíčňĺëüíîăî öâĺňŕ
+            Color colorad = Color.FromArgb(random.Next(0, 256),
+        random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialog2 = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                colorad = dialog2.Color;
+            }
             _drawingWarmlyShip = new DrawningWarmlyShip(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)),
+            coloros, colorad, Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
             pictureBoxWarmlyShip.Width, pictureBoxWarmlyShip.Height);
             _drawingWarmlyShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
@@ -138,5 +164,15 @@ namespace ProjectWarmlyShip
                 _abstractStrategy = null;
             }
         }
+        /// <summary>
+        /// Âűáîđ ęîđŕáë˙
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSelectShip_Click(object sender, EventArgs e)
+        {
+            SelectedShip = _drawingWarmlyShip;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/FormWarmlyShip.resx

@@ -123,7 +123,7 @@
         iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAABGdBTUEAALGPC/xhBQAAAG9QTFRF////
         AAAAWVlZ8fHx9PT0REREtLS0Ojo6+Pj4a2trp6enj4+P3t7eXl5efX1919fXh4eHw8PD6+vrdXV10dHR
         5ubmDAwMy8vLTU1NlZWVvLy8iIiINjY2nJycFhYWYWFhJycnUVFRHR0dr6+vKioqoesKnwAAAAlwSFlz
-        AAAOvQAADr0BR/uQrQAAAkFJREFUeF7t3GtT2zAQhWErF5JAnIQQSrmFW///b+wCR6LY/Vg3nqP3+cJE
+        AAAOvAAADrwBlbxySQAAAkFJREFUeF7t3GtT2zAQhWErF5JAnIQQSrmFW///b+wCR6LY/Vg3nqP3+cJE
         O5Nhh1kjrSQ3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMyVQ/Tc02P1J6WuuToUP6dKfPds6VYErXGjFz
         pfTCRkNWpgtl926uQSeHeMR8WWjUyFcJfpho2MdGmWVuD9PpTyWWPSngYvuqxLKVAi7OlFfxqICLnfIq
         bhQwseyW4MJsOrP+pcSy1VIRE3fKq7hVwMW98iouFTCxbJVX9mC2Llw/KLFsYlaCl8qruFfAxa3yKsxm
@@ -141,7 +141,7 @@
         iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAABGdBTUEAALGPC/xhBQAAAG9QTFRF////
         AAAAWVlZ8fHx9PT0REREtLS0Ojo6+Pj4a2trp6enj4+P3t7eXl5efX1919fXh4eHw8PD6+vrdXV10dHR
         5ubmDAwMy8vLTU1NlZWVvLy8iIiINjY2nJycFhYWYWFhJycnUVFRHR0dr6+vKioqoesKnwAAAAlwSFlz
-        AAAOvQAADr0BR/uQrQAAA01JREFUeF7t3dluo0AURVHwEGdO7DjznPT/f2PHcAgULsD90FKd0l5P7jKR
+        AAAOvAAADrwBlbxySQAAA01JREFUeF7t3dluo0AURVHwEGdO7DjznPT/f2PHcAgULsD90FKd0l5P7jKR
         2FF0jYuWXQAAAAAAAAAAAAAAAADA/7JZP643epyls3LnTP/K0GUVWJaX+nd2vhVYlt9aycyV8nautJaV
         xZvqdt4WWs3JUnG1pVYz0kyZRnbTpp0yjcymzVZZXVs9l4W5okJzPZuDcMo0Mpo2/SnTyGbanCpo36mO
         MHevnJh7HWMtPmUaOUyblVriVjrK2I1ShtzoOFuvChn2qiNNjU2ZhvW02ShinPHGzfGLGirXF3pQlhfX
@@ -163,7 +163,7 @@
         iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAABGdBTUEAALGPC/xhBQAAAG9QTFRF////
         AAAAWVlZ8fHx9PT0REREtLS0Ojo6+Pj4a2trp6enj4+P3t7eXl5efX1919fXh4eHw8PD6+vrdXV10dHR
         5ubmDAwMy8vLTU1NlZWVvLy8iIiINjY2nJycFhYWYWFhJycnUVFRHR0dr6+vKioqoesKnwAAAAlwSFlz
-        AAAOvQAADr0BR/uQrQAAAipJREFUeF7t3NlS20AQRmEJGzAgL+ybIQTy/s8YOfyawtJtZIWT891QVleB
+        AAAOvAAADrwBlbxySQAAAipJREFUeF7t3NlS20AQRmEJGzAgL+ybIQTy/s8YOfyawtJtZIWT891QVleB
         u6iWZnpmVEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS9F3N8hOqWdb13WqeT0BP9aebfMa5TYJ1fZ4rNKvk
         17rOJZjjpLdzirzjnCa7P+6IxXiU5AJYjN2ttLPKdZAfSa3zwCvGs6TWeV8nwPGS1IqTBDjuk1mxSYDj
         du+Z0XrADVMX/WJ8axLheExqxVMCHJfJrHhOgKPZJrXOcpEIxqKdCu/Z8orxOakVlwlw9Eep9WMCHM1b
@@ -180,7 +180,7 @@
         iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAABGdBTUEAALGPC/xhBQAAAG9QTFRF////
         AAAAWVlZ8fHx9PT0REREtLS0Ojo6+Pj4a2trp6enj4+P3t7eXl5efX1919fXh4eHw8PD6+vrdXV10dHR
         5ubmDAwMy8vLTU1NlZWVvLy8iIiINjY2nJycFhYWYWFhJycnUVFRHR0dr6+vKioqoesKnwAAAAlwSFlz
-        AAAOvQAADr0BR/uQrQAAA2JJREFUeF7t3dtyolAQheHgIZqTicacMznO+z/jBFgoLRtwLqame9f/XUnj
+        AAAOvAAADrwBlbxySQAAA2JJREFUeF7t3dtyolAQheHgIZqTicacMznO+z/jBFgoLRtwLqame9f/XUnj
         xV6W1UBTBScAAAAAAAAAAAAAAAAA8K/MtqfbqT5n6fytKIq3c21l6OInX+lC29m5VMCiuFYlNzfKVxQr
         VXIzUb6imKiSGxLGR8L4SBgfCeMjYXwkjI+E8ZEwPhLGR8L4SBgfCeMjYXwkjI+E8ZEwPhLGR8L4SBgf
         CeMjYXwkjI+E8ZEwPhLGR8L4SBgfCeMjYXwkjI+E8ZEwPhLGR8L4SBgfCeMjYXwkjI+E8ZEwPhK6d7ea

ProjectWarmlyShip/ProjectWarmlyShip/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectWarmlyShip
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormWarmlyShip());
+            Application.Run(new FormShipCollection());
         }
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/SetGeneric.cs

@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectWarmlyShip.Generics
+{/// <summary>
+ /// Параметризованный набор объектов
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
+    internal class SetGeneric<T>
+    where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private readonly T?[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetGeneric(int count)
+        {
+            _places = new T?[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="ship">Добавляемый корабль</param>
+        /// <returns></returns>
+        public int Insert(T ship)
+        {
+            int index = -1;
+            for (int i = 0; i < _places.Length; i++)
+            {
+                if (_places[i] == null)
+                {
+                    index = i; break;
+                }
+            }
+            if (index < 0)
+            {
+                return -1;
+            }
+            for (int i = index; i > 0; i--)
+            {
+                _places[i] = _places[i - 1];
+            }
+            _places[0] = ship;
+            return 0;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="ship">Добавляемый корабль</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T plane, int position)
+        {
+            if (position < 0 || position >= Count)
+                return -1;
+            if (_places[position] == null)
+            {
+                _places[position] = plane;
+                return position;
+            }
+            int index = -1;
+            for (int i = position; i < Count; i++)
+            {
+                if (_places[i] == null)
+                {
+                    index = i; break;
+                }
+            }
+            if (index < 0)
+                return -1;
+            for (int i = index; index > position; i--)
+            {
+                _places[i] = _places[i - 1];
+            }
+            _places[position] = plane;
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool Remove(int position)
+        {
+            if (position < 0 || position >= _places.Length)
+                return false;
+            _places[position] = null;
+            return true;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? Get(int position)
+        {
+            if (position < 0 || position >= _places.Length)
+                return null;
+
+            return _places[position];
+        }
+    }
+
+}

ProjectWarmlyShip/ProjectWarmlyShip/ShipsGenericCollection.cs

@@ -0,0 +1,147 @@
+using ProjectWarmlyShip.DrawningObjects;
+using ProjectWarmlyShip.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectWarmlyShip.Generics
+{
+    /// <summary>
+    /// Параметризованный класс для набора объектов DrawningCar
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class ShipsGenericCollection<T, U>
+    where T : DrawningShip
+    where U : IMoveableObject
+    {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 210;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public ShipsGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static int? operator +(ShipsGenericCollection<T, U> collect, T? obj)
+        {
+            if (obj == null)
+            {
+                return -1;
+            }
+            return collect?._collection.Insert(obj);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static bool operator -(ShipsGenericCollection<T, U> collect, int
+        pos)
+        {
+            T? obj = collect._collection.Get(pos);
+            if (obj == null)
+            {
+                return false;
+            }
+            return collect._collection.Remove(pos);
+        }
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U? GetU(int pos)
+        {
+            return (U?)_collection.Get(pos)?.GetMoveableObject;
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowShips()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private 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 +
+                1; ++j)
+                {//линия рамзетки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j *
+                    _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth, j *
+                    _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i *
+                _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+            for (int i = 0; i < _collection.Count; i++)
+            {
+                // TODO получение объекта
+                DrawningShip? Ship = _collection.Get(i);
+                if (Ship == null)
+                    continue;
+                int r = i / width;
+                int s = width - 1 - (i % width);
+                // TODO установка позиции
+                Ship.SetPosition(s * _placeSizeWidth, r * _placeSizeHeight + 50);
+                // TODO прорисовка объекта
+                Ship.DrawTransport(g);
+            }
+        }
+    }
+}