использование встроенного делегата

AircraftCarrier/AircraftCarrier/DrawingAircraftCarrier.cs

@@ -23,6 +23,10 @@ namespace AircraftCarrier
         {
             Warship = new EntityAircraftCarrier(speed, weight, bodyColor, dopColor, bodyKit, сabin, superEngine);
         }
+        public void SetDopColor(Color color)
+        {
+            ((EntityAircraftCarrier)Warship).DopColor = color;
+        }
 
         public override void DrawTransport(Graphics g)
         {
@@ -33,8 +37,6 @@ namespace AircraftCarrier
 
             Pen pen = new(Color.Black);
             Brush dopBrush = new SolidBrush(aircraftCarrier.DopColor);
-            Brush brGray = new SolidBrush(Color.Gray);
-            Brush brRed = new SolidBrush(Color.Red);
             Brush br = new SolidBrush(Warship?.BodyColor ?? Color.White);
 
             if (aircraftCarrier.BodyKit)
@@ -62,22 +64,22 @@ namespace AircraftCarrier
                 {
                     pontStartLine1, pontStartLine2, pontStartLine3, pontStartLine4
                 };
-                g.FillPolygon(brGray, PointsStartLine);
+                g.FillPolygon(dopBrush, PointsStartLine);
                 g.DrawPolygon(pen, PointsStartLine);
             }
 
             if (aircraftCarrier.SuperEngine)
             {
-                g.FillEllipse(brRed, _startPosX, _startPosY, 10, 10);
+                g.FillEllipse(dopBrush, _startPosX, _startPosY, 10, 10);
                 g.DrawEllipse(pen, _startPosX, _startPosY, 10, 10);
 
-                g.FillEllipse(brRed, _startPosX, _startPosY + 10, 10, 10);
+                g.FillEllipse(dopBrush, _startPosX, _startPosY + 10, 10, 10);
                 g.DrawEllipse(pen, _startPosX, _startPosY + 10, 10, 10);
 
-                g.FillEllipse(brRed, _startPosX, _startPosY + 18, 10, 10);
+                g.FillEllipse(dopBrush, _startPosX, _startPosY + 18, 10, 10);
                 g.DrawEllipse(pen, _startPosX, _startPosY + 18, 10, 10);
 
-                g.FillEllipse(brRed, _startPosX, _startPosY + 30, 10, 10);
+                g.FillEllipse(dopBrush, _startPosX, _startPosY + 30, 10, 10);
                 g.DrawEllipse(pen, _startPosX, _startPosY + 30, 10, 10);
             }
 
@@ -85,13 +87,13 @@ namespace AircraftCarrier
 
             if (aircraftCarrier.Сabin)
             {
-                g.FillEllipse(brGray, _startPosX + 10, _startPosY + 15, 10, 10);
+                g.FillEllipse(dopBrush, _startPosX + 10, _startPosY + 15, 10, 10);
                 g.DrawEllipse(pen, _startPosX + 10, _startPosY + 15, 10, 10);                
 
-                g.FillEllipse(brGray, _startPosX + 20, _startPosY + 15, 10, 10);
+                g.FillEllipse(dopBrush, _startPosX + 20, _startPosY + 15, 10, 10);
                 g.DrawEllipse(pen, _startPosX + 20, _startPosY + 15, 10, 10);
 
-                g.FillRectangle(brGray, _startPosX + 15, _startPosY + 15, 10, 10);
+                g.FillRectangle(dopBrush, _startPosX + 15, _startPosY + 15, 10, 10);
                 g.DrawRectangle(pen, _startPosX + 15, _startPosY + 15, 10, 10);
             }
         }

AircraftCarrier/AircraftCarrier/DrawingWarship.cs

@@ -64,6 +64,8 @@ namespace AircraftCarrier
             _warshipWidth = warshipWidth;
             _warshipHeight = warshipHeight;
         }
+        public void SetColor(Color color) => Warship.BodyColor = color;
+
         /// <summary>
         /// Установка позиции военного корабля
         /// </summary>

AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs

@@ -11,7 +11,7 @@ namespace AircraftCarrier
         /// <summary>
         /// Дополнительный цвет
         /// </summary>
-        public Color DopColor { get; private set; }
+        public Color DopColor { get; set; }
         /// <summary>
         /// Признак наличия боковой площадки
         /// </summary>

AircraftCarrier/AircraftCarrier/EntityWarship.cs

@@ -22,7 +22,7 @@ namespace AircraftCarrier
         /// <summary>
         /// Цвет
         /// </summary>
-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get; set; }
         /// <summary>
         /// Шаг перемещения
         /// </summary>

AircraftCarrier/AircraftCarrier/FormMapWithSetWarships.Designer.cs

@@ -29,6 +29,12 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonShowOnMap = new System.Windows.Forms.Button();
             this.buttonShowStorage = new System.Windows.Forms.Button();
             this.buttonRemoveWarship = new System.Windows.Forms.Button();
@@ -38,14 +44,15 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
             this.groupBoxTools.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
             this.groupBoxTools.Controls.Add(this.buttonShowStorage);
             this.groupBoxTools.Controls.Add(this.buttonRemoveWarship);
@@ -55,20 +62,82 @@
             this.groupBoxTools.Controls.Add(this.buttonLeft);
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(787, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(754, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(200, 593);
+            this.groupBoxTools.Size = new System.Drawing.Size(217, 649);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Tools";
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(6, 22);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(205, 257);
+            this.groupBoxMaps.TabIndex = 19;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Maps";
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(14, 80);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(180, 35);
+            this.buttonAddMap.TabIndex = 2;
+            this.buttonAddMap.Text = "Add map";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(14, 206);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(180, 35);
+            this.buttonDeleteMap.TabIndex = 4;
+            this.buttonDeleteMap.Text = "Delete map";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 15;
+            this.listBoxMaps.Location = new System.Drawing.Point(14, 121);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(180, 79);
+            this.listBoxMaps.TabIndex = 3;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(14, 22);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(180, 23);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Преграды-линии"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(14, 51);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(180, 23);
+            this.comboBoxSelectorMap.TabIndex = 9;
+            // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(13, 431);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 516);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
+            this.buttonShowOnMap.Size = new System.Drawing.Size(180, 35);
             this.buttonShowOnMap.TabIndex = 18;
             this.buttonShowOnMap.Text = "Show map";
             this.buttonShowOnMap.UseVisualStyleBackColor = true;
@@ -76,9 +145,9 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(13, 323);
+            this.buttonShowStorage.Location = new System.Drawing.Point(20, 475);
             this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
+            this.buttonShowStorage.Size = new System.Drawing.Size(180, 35);
             this.buttonShowStorage.TabIndex = 17;
             this.buttonShowStorage.Text = "Show storage";
             this.buttonShowStorage.UseVisualStyleBackColor = true;
@@ -86,9 +155,9 @@
             // 
             // buttonRemoveWarship
             // 
-            this.buttonRemoveWarship.Location = new System.Drawing.Point(13, 208);
+            this.buttonRemoveWarship.Location = new System.Drawing.Point(20, 434);
             this.buttonRemoveWarship.Name = "buttonRemoveWarship";
-            this.buttonRemoveWarship.Size = new System.Drawing.Size(175, 35);
+            this.buttonRemoveWarship.Size = new System.Drawing.Size(180, 35);
             this.buttonRemoveWarship.TabIndex = 16;
             this.buttonRemoveWarship.Text = "Remove warship";
             this.buttonRemoveWarship.UseVisualStyleBackColor = true;
@@ -96,18 +165,18 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(13, 177);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(20, 405);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(180, 23);
             this.maskedTextBoxPosition.TabIndex = 15;
             this.maskedTextBoxPosition.ValidatingType = typeof(int);
             // 
             // buttonAddWarship
             // 
-            this.buttonAddWarship.Location = new System.Drawing.Point(13, 114);
+            this.buttonAddWarship.Location = new System.Drawing.Point(20, 364);
             this.buttonAddWarship.Name = "buttonAddWarship";
-            this.buttonAddWarship.Size = new System.Drawing.Size(175, 35);
+            this.buttonAddWarship.Size = new System.Drawing.Size(180, 35);
             this.buttonAddWarship.TabIndex = 14;
             this.buttonAddWarship.Text = "Add warship";
             this.buttonAddWarship.UseVisualStyleBackColor = true;
@@ -118,7 +187,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(121, 553);
+            this.buttonRight.Location = new System.Drawing.Point(126, 609);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 13;
@@ -131,7 +200,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(49, 553);
+            this.buttonLeft.Location = new System.Drawing.Point(54, 609);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 12;
@@ -144,7 +213,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(85, 517);
+            this.buttonUp.Location = new System.Drawing.Point(90, 573);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 11;
@@ -157,7 +226,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::AircraftCarrier.Properties.Resources.ArrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(85, 553);
+            this.buttonDown.Location = new System.Drawing.Point(90, 609);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 10;
@@ -165,25 +234,12 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Преграды-линии"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(13, 22);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(787, 593);
+            this.pictureBox.Size = new System.Drawing.Size(754, 649);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -191,13 +247,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(987, 593);
+            this.ClientSize = new System.Drawing.Size(971, 649);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Name = "FormMapWithSetWarships";
             this.Text = "FormMapWithSetWarships";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -217,5 +275,10 @@
         private Button buttonRemoveWarship;
         private MaskedTextBox maskedTextBoxPosition;
         private Button buttonAddWarship;
+        private GroupBox groupBoxMaps;
+        private Button buttonAddMap;
+        private Button buttonDeleteMap;
+        private ListBox listBoxMaps;
+        private TextBox textBoxNewMapName;
     }
 }

AircraftCarrier/AircraftCarrier/FormMapWithSetWarships.cs

@@ -14,36 +14,97 @@ namespace AircraftCarrier
     public partial class FormMapWithSetWarships : Form
     {
         /// <summary>
-        /// Объект от класса карты с набором объектов
+        /// Словарь для выпадающего списка
         /// </summary>
-        private MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap> _mapWarshipsCollectionGeneric;
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap() },
+            { "Преграды-линии", new LineMap() }
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormMapWithSetWarships()
         {
             InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
             }
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Преграды-линии":
-                    map = new LineMap();
-                    break;
         }
-            if (map != null)
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        private void ReloadMaps()
         {
-                _mapWarshipsCollectionGeneric = new MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>(
+            int index = listBoxMaps.SelectedIndex;
-                    pictureBox.Width, pictureBox.Height, map);
+
+            listBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
             }
-            else
+
+            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
             {
-                _mapWarshipsCollectionGeneric = null;
+                listBoxMaps.SelectedIndex = 0;
+            }
+            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
+            {
+                listBoxMaps.SelectedIndex = index;
+            }
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
             }
         }
         /// <summary>
@@ -53,24 +114,33 @@ namespace AircraftCarrier
         /// <param name="e"></param>
         private void ButtonAddWarship_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            var formWarshipConfig = new FormWarshipConfig();
+            formWarshipConfig.AddEvent(AddWarshipOnForm);
+            formWarshipConfig.Show();
+        }
+        /// <summary>
+        /// добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AddWarshipOnForm(DrawingWarship drawningWarship)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            FormWarship form = new();
+
-            if (form.ShowDialog() == DialogResult.OK)
+            DrawingObjectWarship warship = new(drawningWarship);
-            {
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + warship >= 0)
-                DrawingObjectWarship warship = new(form.SelectedWarship);
-                if (_mapWarshipsCollectionGeneric + warship >= 0)
             {
                 MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
                 MessageBox.Show("Не удалось добавить объект");
             }
-            }
+
         }
         /// <summary>
         /// Удаление объекта
@@ -79,6 +149,10 @@ namespace AircraftCarrier
         /// <param name="e"></param>
         private void ButtonRemoveWarship_Click(object sender, EventArgs e)
         {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
@@ -88,10 +162,10 @@ namespace AircraftCarrier
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapWarshipsCollectionGeneric - pos != null)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
@@ -105,11 +179,11 @@ namespace AircraftCarrier
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -118,11 +192,11 @@ namespace AircraftCarrier
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if(_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.ShowOnMap();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -131,7 +205,7 @@ namespace AircraftCarrier
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapWarshipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -153,7 +227,7 @@ namespace AircraftCarrier
                     dir = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapWarshipsCollectionGeneric.MoveObject(dir);
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
         }
     }
 }

AircraftCarrier/AircraftCarrier/FormWarshipConfig.Designer.cs

@@ -0,0 +1,394 @@
+namespace AircraftCarrier
+{
+    partial class FormWarshipConfig
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBoxConfig = new System.Windows.Forms.GroupBox();
+            this.labelModifiedObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxSportLine = new System.Windows.Forms.CheckBox();
+            this.checkBoxWing = new System.Windows.Forms.CheckBox();
+            this.checkBoxBodyKit = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.labelWeight = new System.Windows.Forms.Label();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.labelSpeed = new System.Windows.Forms.Label();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.panelObject = new System.Windows.Forms.Panel();
+            this.labelDopColor = new System.Windows.Forms.Label();
+            this.labelBaseColor = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.groupBoxConfig.SuspendLayout();
+            this.groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            this.panelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Controls.Add(this.checkBoxSportLine);
+            this.groupBoxConfig.Controls.Add(this.checkBoxWing);
+            this.groupBoxConfig.Controls.Add(this.checkBoxBodyKit);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+            this.groupBoxConfig.Controls.Add(this.labelWeight);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+            this.groupBoxConfig.Controls.Add(this.labelSpeed);
+            this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Size = new System.Drawing.Size(520, 220);
+            this.groupBoxConfig.TabIndex = 1;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Parameters";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(394, 162);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(97, 38);
+            this.labelModifiedObject.TabIndex = 16;
+            this.labelModifiedObject.Text = "Advanced";
+            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(282, 162);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(97, 38);
+            this.labelSimpleObject.TabIndex = 15;
+            this.labelSimpleObject.Text = "Simple";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // groupBoxColors
+            // 
+            this.groupBoxColors.Controls.Add(this.panelPurple);
+            this.groupBoxColors.Controls.Add(this.panelYellow);
+            this.groupBoxColors.Controls.Add(this.panelBlack);
+            this.groupBoxColors.Controls.Add(this.panelBlue);
+            this.groupBoxColors.Controls.Add(this.panelGray);
+            this.groupBoxColors.Controls.Add(this.panelGreen);
+            this.groupBoxColors.Controls.Add(this.panelWhite);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Location = new System.Drawing.Point(267, 22);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(241, 127);
+            this.groupBoxColors.TabIndex = 14;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Colors";
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(184, 73);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(40, 40);
+            this.panelPurple.TabIndex = 3;
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(184, 22);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(40, 40);
+            this.panelYellow.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(127, 73);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(40, 40);
+            this.panelBlack.TabIndex = 4;
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(127, 22);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(40, 40);
+            this.panelBlue.TabIndex = 1;
+            // 
+            // panelGray
+            // 
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(72, 73);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(40, 40);
+            this.panelGray.TabIndex = 5;
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(72, 22);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(40, 40);
+            this.panelGreen.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(15, 73);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(40, 40);
+            this.panelWhite.TabIndex = 2;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(15, 22);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(40, 40);
+            this.panelRed.TabIndex = 0;
+            // 
+            // checkBoxSportLine
+            // 
+            this.checkBoxSportLine.AutoSize = true;
+            this.checkBoxSportLine.Location = new System.Drawing.Point(22, 185);
+            this.checkBoxSportLine.Name = "checkBoxSportLine";
+            this.checkBoxSportLine.Size = new System.Drawing.Size(134, 19);
+            this.checkBoxSportLine.TabIndex = 13;
+            this.checkBoxSportLine.Text = "Sign of super engine";
+            this.checkBoxSportLine.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxWing
+            // 
+            this.checkBoxWing.AutoSize = true;
+            this.checkBoxWing.Location = new System.Drawing.Point(22, 149);
+            this.checkBoxWing.Name = "checkBoxWing";
+            this.checkBoxWing.Size = new System.Drawing.Size(95, 19);
+            this.checkBoxWing.TabIndex = 12;
+            this.checkBoxWing.Text = "Sign of cabin";
+            this.checkBoxWing.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxBodyKit
+            // 
+            this.checkBoxBodyKit.AutoSize = true;
+            this.checkBoxBodyKit.Location = new System.Drawing.Point(22, 115);
+            this.checkBoxBodyKit.Name = "checkBoxBodyKit";
+            this.checkBoxBodyKit.Size = new System.Drawing.Size(145, 19);
+            this.checkBoxBodyKit.TabIndex = 11;
+            this.checkBoxBodyKit.Text = "Sign of a side platform";
+            this.checkBoxBodyKit.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(90, 72);
+            this.numericUpDownWeight.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(79, 23);
+            this.numericUpDownWeight.TabIndex = 10;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(22, 74);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(48, 15);
+            this.labelWeight.TabIndex = 9;
+            this.labelWeight.Text = "Weight:";
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(90, 30);
+            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(79, 23);
+            this.numericUpDownSpeed.TabIndex = 8;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(22, 32);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(42, 15);
+            this.labelSpeed.TabIndex = 7;
+            this.labelSpeed.Text = "Speed:";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(679, 202);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(104, 30);
+            this.buttonCancel.TabIndex = 8;
+            this.buttonCancel.Text = "Cancel";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(558, 202);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(104, 30);
+            this.buttonOk.TabIndex = 7;
+            this.buttonOk.Text = "Add";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+            // 
+            // panelObject
+            // 
+            this.panelObject.AllowDrop = true;
+            this.panelObject.Controls.Add(this.labelDopColor);
+            this.panelObject.Controls.Add(this.labelBaseColor);
+            this.panelObject.Controls.Add(this.pictureBoxObject);
+            this.panelObject.Location = new System.Drawing.Point(538, 12);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(262, 184);
+            this.panelObject.TabIndex = 6;
+            this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
+            this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
+            // 
+            // labelDopColor
+            // 
+            this.labelDopColor.AllowDrop = true;
+            this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelDopColor.Location = new System.Drawing.Point(141, 9);
+            this.labelDopColor.Name = "labelDopColor";
+            this.labelDopColor.Size = new System.Drawing.Size(104, 32);
+            this.labelDopColor.TabIndex = 2;
+            this.labelDopColor.Text = "DopColor";
+            this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+            this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // labelBaseColor
+            // 
+            this.labelBaseColor.AllowDrop = true;
+            this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelBaseColor.Location = new System.Drawing.Point(20, 9);
+            this.labelBaseColor.Name = "labelBaseColor";
+            this.labelBaseColor.Size = new System.Drawing.Size(104, 32);
+            this.labelBaseColor.TabIndex = 1;
+            this.labelBaseColor.Text = "Color";
+            this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+            this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(20, 44);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(225, 125);
+            this.pictureBoxObject.TabIndex = 0;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // FormWarshipConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(815, 244);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormWarshipConfig";
+            this.Text = "Creating object";
+            this.groupBoxConfig.ResumeLayout(false);
+            this.groupBoxConfig.PerformLayout();
+            this.groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            this.panelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelYellow;
+        private Panel panelBlack;
+        private Panel panelBlue;
+        private Panel panelGray;
+        private Panel panelGreen;
+        private Panel panelWhite;
+        private Panel panelRed;
+        private CheckBox checkBoxSportLine;
+        private CheckBox checkBoxWing;
+        private CheckBox checkBoxBodyKit;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private Button buttonCancel;
+        private Button buttonOk;
+        private Panel panelObject;
+        private Label labelDopColor;
+        private Label labelBaseColor;
+        private PictureBox pictureBoxObject;
+    }
+}

AircraftCarrier/AircraftCarrier/FormWarshipConfig.cs

@@ -0,0 +1,171 @@
+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 AircraftCarrier
+{
+    public partial class FormWarshipConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранный корабль
+        /// </summary>
+        DrawingWarship _warship = null;
+        /// <summary>
+        /// Событие
+        /// </summary>
+        private event Action<DrawingWarship> EventAddWarshp;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormWarshipConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.MouseDown += PanelColor_MouseDown;
+            panelGray.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
+
+            buttonCancel.Click += (sender, e) => Close();
+        }
+        /// <summary>
+        /// Отрисовать корабль
+        /// </summary>
+        private void DrawingWarship()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _warship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+            _warship?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev"></param>
+        public void AddEvent(Action<DrawingWarship> ev)
+        {
+            if (EventAddWarshp == null)
+            {
+                EventAddWarshp = ev;
+            }
+            else
+            {
+                EventAddWarshp += ev;
+            }
+        }
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _warship = new DrawingWarship((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _warship = new DrawingAircraftCarrier((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                        checkBoxBodyKit.Checked, checkBoxWing.Checked, checkBoxSportLine.Checked);
+                    break;
+            }
+            DrawingWarship();
+        }
+        /// <summary>
+        /// Отправляем цвет с панели
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Принимаем основной цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            Color color = (Color)e.Data.GetData(typeof(Color));
+            _warship.SetColor(color);
+            DrawingWarship();
+        }
+        /// <summary>
+        /// Принимаем дополнительный цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            Color dopColor = (Color)e.Data.GetData(typeof(Color));
+            if (_warship is DrawingAircraftCarrier aircraftCarrier)
+            {
+                aircraftCarrier.SetDopColor(dopColor);
+                DrawingWarship();
+            }
+        }
+        /// <summary>
+        /// Добавление корабля
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddWarshp?.Invoke(_warship);
+            Close();
+        }
+    }
+}

AircraftCarrier/AircraftCarrier/FormWarshipConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

AircraftCarrier/AircraftCarrier/MapWithSetWarshipsGeneric.cs

@@ -93,14 +93,10 @@ namespace AircraftCarrier
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setWarships.Count; i++)
+            foreach(var warship in _setWarships.GetWarships())
-            {
-                var warship = _setWarships.Get(i);
-                if (warship != null)
             {
                 return _map.CreateMap(_pictureWidth, _pictureHeight, warship);
             }
-            }
             return new(_pictureWidth, _pictureHeight);
         }
         /// <summary>
@@ -124,11 +120,11 @@ namespace AircraftCarrier
             int j = _setWarships.Count - 1;
             for (int i = 0; i < _setWarships.Count; i++)
             {
-                if (_setWarships.Get(i) == null)
+                if (_setWarships[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var car = _setWarships.Get(j);
+                        var car = _setWarships[j];
                         if (car != null)
                         {
                             _setWarships.Insert(car, i);
@@ -153,11 +149,13 @@ namespace AircraftCarrier
             g.FillRectangle(Brushes.Aqua, 0, 0, _pictureWidth, _pictureHeight);
             for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
             {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                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 + 20, j * _placeSizeHeight + 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + 2);
+                    g.DrawLine(pen, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + 2, i * _placeSizeWidth  + _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight / 2);
+                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight / 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + _placeSizeHeight);
                 }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth + 20, _pictureHeight / _placeSizeHeight * _placeSizeHeight + 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), _pictureHeight / _placeSizeHeight * _placeSizeHeight + 2);
             }
         }
         /// <summary>
@@ -166,13 +164,13 @@ namespace AircraftCarrier
         /// <param name="g"></param>
         private void DrawWarships(Graphics g)
         {
-            int countInLine = _pictureWidth / _placeSizeWidth;
+            int width = _pictureWidth / _placeSizeWidth;
-            int maxLeft = (countInLine - 1) * _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
-            //for (int i = 0; i < _setWarships.Count; i++)
             for (int i = 0; i < _setWarships.Count; i++)
             {
-                _setWarships.Get(i)?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight + 3, _pictureWidth, _pictureHeight);
+                var warship = _setWarships[i];
-                _setWarships.Get(i)?.DrawningObject(g);
+                warship?.SetObject(i % _pictureWidth * _placeSizeWidth, (height - 1 - i / width) * _placeSizeHeight + 4, _pictureWidth, _pictureHeight);
+                warship?.DrawningObject(g);
             }
         }
     }

AircraftCarrier/AircraftCarrier/MapsCollection.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AircraftCarrier
+{
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>> _mapStorages;
+        /// <summary>
+        /// Возвращение списка названий карт
+        /// </summary>
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        /// <param name="map">Карта</param>
+        public void AddMap(string name, AbstractMap map)
+        {
+            _mapStorages.Add(name, new(_pictureWidth, _pictureHeight, map));
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            _mapStorages.Remove(name);
+        }
+        /// <summary>
+        /// Доступ к докам
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetWarshipsGeneric<DrawingObjectWarship, AbstractMap> this[string ind]
+        {
+            get
+            {
+                _mapStorages.TryGetValue(ind, out var MapWithSetWarshipsGeneric);
+                return MapWithSetWarshipsGeneric;
+            }
+        }
+    }
+}

AircraftCarrier/AircraftCarrier/SetWarshipsGeneric.cs

@@ -14,20 +14,23 @@ namespace AircraftCarrier
         where T : class
     {
         /// <summary>
-		/// Массив объектов, которые храним
+		/// Список объектов, которые храним
 		/// </summary>
-		private readonly T[] _places;
+		private readonly List<T> _places;
         /// <summary>
-        /// Количество объектов в массиве
+        /// Количество объектов в списке
         /// </summary>
-        public int Count => _places.Length;
+        public int Count => _places.Count;
+
+        private readonly int _maxCount;
         /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
         public SetWarshipsGeneric(int count)
         {
-            _places = new T[count];
+            _maxCount = count;
+            _places = new List<T>();
         }
         /// <summary>
         /// Добавление объекта в набор
@@ -46,32 +49,8 @@ namespace AircraftCarrier
         /// <returns></returns>
         public int Insert(T warship, int position)
         {
-            int EmptyElement = -1;
+            if (position >= _maxCount || position < 0) return -1;
-            if (position >= Count || position < 0) return -1;
+            _places.Insert(position, warship);
-
-            if (_places[position] == null)
-            {
-                _places[position] = warship;
-                return 1;
-            }
-
-            else if (_places[position] != null)
-            {
-                for (int i = position + 1; i < Count; i++)
-                    if (_places[i] == null)
-                    {
-                        EmptyElement = i;
-                        break;
-                    }
-
-                if (EmptyElement == -1)
-                    return -1;
-
-                for (int i = EmptyElement; i > position; i--)
-                    _places[i] = _places[i - 1];
-            }
-
-            _places[position] = warship;
             return 1;
         }
         /// <summary>
@@ -81,22 +60,47 @@ namespace AircraftCarrier
         /// <returns></returns>
         public T Remove(int position)
         {
-            if (position >= Count || position < 0 || _places[position] == null)
+            if (position >= _maxCount || position < 0)
                 return null;
 
-            T deleted = _places[position];
+            var result = _places[position];
-            _places[position] = null;
+            _places.RemoveAt(position);
-            return deleted;
+            return result;
         }
         /// <summary>
         /// Получение объекта из набора по позиции
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public T Get(int position)
+        public T this[int position]
         {
-            if (position >= _places.Length) return null;
+            get
+            {
+                if (position >= _maxCount || position < 0) return null;
                 return _places[position];
             }
+            set
+            {
+                Insert(value, position);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetWarships()
+        {
+            foreach(var warship in _places)
+            {
+                if(warship != null)
+                {
+                    yield return warship;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
     }
 }