Merge pull request 'Vaksman V.D. Lab work 5' (#8) from Lab5 into Lab4

Reviewed-on: http://student.git.athene.tech/just_valery__/ISE-21_Vaksman_V_D_WarmlyShip_Base/pulls/8

WarmlyShip/WarmlyShip/DrawningShip.cs

@@ -181,11 +181,25 @@
                 _startPosY = _pictureHeight.Value - _shipHeight;
             }
         }
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+
+        public void SetBaseColor(Color color)
+        {
+            if (Ship is EntityWarmlyShip)
+            {
+                Ship = (EntityWarmlyShip)Ship;
+                if (Ship is not null)
+                {
+                    Ship = new EntityWarmlyShip(Ship.Speed, Ship.Weight, color, (Ship as EntityWarmlyShip).DopColor, (Ship as EntityWarmlyShip).Pipes, (Ship as EntityWarmlyShip).FuelCompartment);
+                    return;
+                }
+            }
+            Ship = new EntityShip(Ship.Speed, Ship.Weight, color);
+        }
+            /// <summary>
+            /// Получение текущей позиции объекта
+            /// </summary>
+            /// <returns></returns>
+            public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
         {
             return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight);
         }

WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs

@@ -53,5 +53,13 @@ namespace WarmlyShip
                 g.DrawRectangle(pen, _startPosX + 135, _startPosY + 70, 10, 5);
             }
         }
+        public void SetDopColor(Color color)
+        {
+            Ship = Ship as EntityWarmlyShip;
+            if (Ship is not null)
+            {
+                Ship = new EntityWarmlyShip(Ship.Speed, Ship.Weight, Ship.BodyColor, color, (Ship as EntityWarmlyShip).Pipes, (Ship as EntityWarmlyShip).FuelCompartment);
+            }
+        }
     }
 }

WarmlyShip/WarmlyShip/FormMapWithSetShips.Designer.cs

@@ -29,6 +29,12 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
@@ -38,14 +44,15 @@
             this.buttonRemoveShip = new System.Windows.Forms.Button();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonAddShip = 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.buttonLeft);
             this.groupBoxTools.Controls.Add(this.buttonRight);
             this.groupBoxTools.Controls.Add(this.buttonUp);
@@ -55,21 +62,82 @@
             this.groupBoxTools.Controls.Add(this.buttonRemoveShip);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonAddShip);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(550, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(616, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(250, 450);
+            this.groupBoxTools.Size = new System.Drawing.Size(250, 594);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(6, 26);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(241, 283);
+            this.groupBoxMaps.TabIndex = 12;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(0, 235);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(238, 29);
+            this.buttonDeleteMap.TabIndex = 3;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 20;
+            this.listBoxMaps.Location = new System.Drawing.Point(6, 125);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(229, 104);
+            this.listBoxMaps.TabIndex = 2;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(0, 90);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(238, 29);
+            this.buttonAddMap.TabIndex = 2;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(3, 23);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(235, 27);
+            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(3, 56);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(232, 28);
+            this.comboBoxSelectorMap.TabIndex = 1;
+            // 
             // buttonLeft
             // 
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(73, 400);
+            this.buttonLeft.Location = new System.Drawing.Point(73, 544);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 10;
@@ -82,7 +150,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(145, 399);
+            this.buttonRight.Location = new System.Drawing.Point(145, 543);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 9;
@@ -95,7 +163,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(109, 363);
+            this.buttonUp.Location = new System.Drawing.Point(109, 507);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 8;
@@ -108,7 +176,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(109, 399);
+            this.buttonDown.Location = new System.Drawing.Point(109, 543);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 7;
@@ -118,7 +186,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(6, 316);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(6, 478);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(238, 29);
             this.buttonShowOnMap.TabIndex = 5;
@@ -128,7 +196,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(6, 250);
+            this.buttonShowStorage.Location = new System.Drawing.Point(6, 443);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(238, 29);
             this.buttonShowStorage.TabIndex = 4;
@@ -138,7 +206,7 @@
             // 
             // buttonRemoveShip
             // 
-            this.buttonRemoveShip.Location = new System.Drawing.Point(6, 180);
+            this.buttonRemoveShip.Location = new System.Drawing.Point(6, 399);
             this.buttonRemoveShip.Name = "buttonRemoveShip";
             this.buttonRemoveShip.Size = new System.Drawing.Size(238, 29);
             this.buttonRemoveShip.TabIndex = 3;
@@ -148,7 +216,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 147);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 366);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(238, 27);
@@ -156,7 +224,7 @@
             // 
             // buttonAddShip
             // 
-            this.buttonAddShip.Location = new System.Drawing.Point(6, 86);
+            this.buttonAddShip.Location = new System.Drawing.Point(6, 331);
             this.buttonAddShip.Name = "buttonAddShip";
             this.buttonAddShip.Size = new System.Drawing.Size(238, 29);
             this.buttonAddShip.TabIndex = 1;
@@ -164,24 +232,12 @@
             this.buttonAddShip.UseVisualStyleBackColor = true;
             this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
             // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Океан"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 26);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(238, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            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(550, 450);
+            this.pictureBox.Size = new System.Drawing.Size(616, 594);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -189,13 +245,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.ClientSize = new System.Drawing.Size(866, 594);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Name = "FormMapWithSetShips";
             this.Text = "Карта с набором объектов";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -210,10 +268,15 @@
         private Button buttonRemoveShip;
         private MaskedTextBox maskedTextBoxPosition;
         private Button buttonAddShip;
-        private ComboBox comboBoxSelectorMap;
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonDown;
+        private GroupBox groupBoxMaps;
+        private Button buttonDeleteMap;
+        private ListBox listBoxMaps;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
+        private ComboBox comboBoxSelectorMap;
     }
 }

WarmlyShip/WarmlyShip/FormMapWithSetShips.cs

@@ -13,37 +13,94 @@ namespace WarmlyShip
     public partial class FormMapWithSetShips : Form
     {
         /// <summary>
-        /// Объект от класса карты с набором объектов
+        /// Словарь для выпадающего списка
         /// </summary>
-        private MapWithSetShipsGeneric<DrawningObjectShip, AbstractMap> _mapShipsCollectionGeneric;
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap() },
+            { "Океан", new OceanMap() }
+        };
         /// <summary>
-        /// Конструктор
+        /// Объект от коллекции карт
         /// </summary>
+        private readonly MapsCollection _mapsCollection;
         public FormMapWithSetShips()
         {
             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)
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        private void ReloadMaps()
         {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
+            int index = listBoxMaps.SelectedIndex;
+
+            listBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
             {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Океан":
-                    map = new OceanMap();
-                    break;
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
             }
-            if (map != null)
+
+            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
             {
-                _mapShipsCollectionGeneric = new MapWithSetShipsGeneric<DrawningObjectShip, AbstractMap>(
-                    pictureBox.Width, pictureBox.Height, map);
+                listBoxMaps.SelectedIndex = 0;
             }
-            else
+            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
             {
-                _mapShipsCollectionGeneric = null;
+                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,23 +110,24 @@ namespace WarmlyShip
         /// <param name="e"></param>
         private void ButtonAddShip_Click(object sender, EventArgs e)
         {
-            if (_mapShipsCollectionGeneric == null)
+            FormShipConfig formShip = new();
+            formShip.AddEvent(new(AddShip));
+            formShip.Show();
+        }
+        private void AddShip(DrawningShip ship)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
             {
-                return;
+                MessageBox.Show("Перед добавлением объекта необходимо создать карту");
             }
-            FormShip form = new();
-            if (form.ShowDialog() == DialogResult.OK)
+            else if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) != -1)
             {
-                DrawningObjectShip ship = new(form.SelectedShip);
-                if (form.SelectedShip == null || !(_mapShipsCollectionGeneric + ship))
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-                else
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
-                }
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
             }
         }
         /// <summary>
@@ -79,19 +137,16 @@ namespace WarmlyShip
         /// <param name="e"></param>
         private void ButtonRemoveShip_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            if (listBoxMaps.SelectedIndex == -1 || string.IsNullOrEmpty(maskedTextBoxPosition.Text) ||
+                MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapShipsCollectionGeneric - pos)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
@@ -105,11 +160,11 @@ namespace WarmlyShip
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapShipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -118,11 +173,11 @@ namespace WarmlyShip
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (_mapShipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapShipsCollectionGeneric.ShowOnMap();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -131,7 +186,7 @@ namespace WarmlyShip
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapShipsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -161,7 +216,7 @@ namespace WarmlyShip
                     }
                     break;
             }
-            pictureBox.Image = _mapShipsCollectionGeneric.MoveObject(dir);
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
         }
     }
 }

WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs

@@ -0,0 +1,369 @@
+namespace WarmlyShip
+{
+    partial class FormShipConfig
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            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.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox();
+            this.checkBoxPipes = 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.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.buttonOk = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            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.checkBoxFuelCompartment);
+            this.groupBoxConfig.Controls.Add(this.checkBoxPipes);
+            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(660, 246);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(505, 195);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(120, 41);
+            this.labelModifiedObject.TabIndex = 7;
+            this.labelModifiedObject.Text = "Продвинутый";
+            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(363, 195);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(121, 41);
+            this.labelSimpleObject.TabIndex = 1;
+            this.labelSimpleObject.Text = "Простой";
+            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(345, 26);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(303, 166);
+            this.groupBoxColors.TabIndex = 6;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
+            this.panelPurple.Location = new System.Drawing.Point(230, 96);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(50, 50);
+            this.panelPurple.TabIndex = 6;
+            this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(230, 26);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(50, 50);
+            this.panelYellow.TabIndex = 2;
+            this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(160, 96);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(50, 50);
+            this.panelBlack.TabIndex = 5;
+            this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(160, 26);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(50, 50);
+            this.panelBlue.TabIndex = 1;
+            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGray
+            // 
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(89, 96);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(50, 50);
+            this.panelGray.TabIndex = 3;
+            this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+            this.panelGreen.Location = new System.Drawing.Point(89, 26);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(50, 50);
+            this.panelGreen.TabIndex = 0;
+            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(18, 96);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(50, 50);
+            this.panelWhite.TabIndex = 4;
+            this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(18, 26);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(50, 50);
+            this.panelRed.TabIndex = 0;
+            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // checkBoxFuelCompartment
+            // 
+            this.checkBoxFuelCompartment.AutoSize = true;
+            this.checkBoxFuelCompartment.Location = new System.Drawing.Point(28, 198);
+            this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment";
+            this.checkBoxFuelCompartment.Size = new System.Drawing.Size(289, 24);
+            this.checkBoxFuelCompartment.TabIndex = 5;
+            this.checkBoxFuelCompartment.Text = "Признак наличия топливного отсека";
+            this.checkBoxFuelCompartment.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxPipes
+            // 
+            this.checkBoxPipes.AutoSize = true;
+            this.checkBoxPipes.Location = new System.Drawing.Point(28, 148);
+            this.checkBoxPipes.Name = "checkBoxPipes";
+            this.checkBoxPipes.Size = new System.Drawing.Size(189, 24);
+            this.checkBoxPipes.TabIndex = 4;
+            this.checkBoxPipes.Text = "Призрак наличия труб";
+            this.checkBoxPipes.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(139, 89);
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(117, 27);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(28, 91);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(36, 20);
+            this.labelWeight.TabIndex = 2;
+            this.labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(139, 32);
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(117, 27);
+            this.numericUpDownSpeed.TabIndex = 1;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(28, 34);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(76, 20);
+            this.labelSpeed.TabIndex = 0;
+            this.labelSpeed.Text = "Скорость:";
+            // 
+            // 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(678, 25);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(313, 191);
+            this.panelObject.TabIndex = 8;
+            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(174, 13);
+            this.labelDopColor.Name = "labelDopColor";
+            this.labelDopColor.Size = new System.Drawing.Size(121, 41);
+            this.labelDopColor.TabIndex = 9;
+            this.labelDopColor.Text = "Доп. цвет";
+            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.LabelColor_DragEnter);
+            // 
+            // labelBaseColor
+            // 
+            this.labelBaseColor.AllowDrop = true;
+            this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelBaseColor.Location = new System.Drawing.Point(21, 13);
+            this.labelBaseColor.Name = "labelBaseColor";
+            this.labelBaseColor.Size = new System.Drawing.Size(121, 41);
+            this.labelBaseColor.TabIndex = 8;
+            this.labelBaseColor.Text = "Цвет";
+            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.LabelColor_DragEnter);
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(21, 57);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(274, 122);
+            this.pictureBoxObject.TabIndex = 0;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(683, 229);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(142, 42);
+            this.buttonOk.TabIndex = 10;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(831, 229);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(142, 42);
+            this.buttonCancel.TabIndex = 11;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormShipConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1004, 283);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormShipConfig";
+            this.Text = "Создание объекта";
+            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 CheckBox checkBoxPipes;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private CheckBox checkBoxFuelCompartment;
+        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 Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Panel panelObject;
+        private PictureBox pictureBoxObject;
+        private Label labelDopColor;
+        private Label labelBaseColor;
+        private Button buttonOk;
+        private Button buttonCancel;
+    }
+}

WarmlyShip/WarmlyShip/FormShipConfig.cs

@@ -0,0 +1,120 @@
+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 WarmlyShip
+{
+    public partial class FormShipConfig : Form
+    {
+        private event Action<DrawningShip> EventAddShip;
+
+        DrawningShip _ship = null;
+        public FormShipConfig()
+        {
+            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();
+        }
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void DrawShip()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _ship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+            _ship?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        public void AddEvent(Action<DrawningShip> ev)
+        {
+            if (EventAddShip == null)
+            {
+                EventAddShip = new(ev);
+            }
+            else
+            {
+                EventAddShip += ev;
+            }
+        }
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _ship = new DrawningShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _ship = new DrawningWarmlyShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                        checkBoxPipes.Checked, checkBoxFuelCompartment.Checked);
+                    break;
+            }
+            DrawShip();
+        }
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddShip?.Invoke(_ship);
+            Close();
+        }
+
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            _ship.SetBaseColor((Color)e.Data.GetData(typeof(Color)));
+            DrawShip();
+        }
+
+        private void LabelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_ship is DrawningWarmlyShip)
+            {
+                var ship = _ship as DrawningWarmlyShip;
+                ship.SetDopColor((Color)e.Data.GetData(typeof(Color)));
+            }
+            DrawShip();
+        }
+    }
+}

WarmlyShip/WarmlyShip/FormShipConfig.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>

WarmlyShip/WarmlyShip/MapWithSetShipsGeneric.cs

@@ -55,7 +55,7 @@ namespace WarmlyShip
         /// <param name="map"></param>
         /// <param name="ship"></param>
         /// <returns></returns>
-        public static bool operator +(MapWithSetShipsGeneric<T, U> map, T ship)
+        public static int operator +(MapWithSetShipsGeneric<T, U> map, T ship)
         {
             return map._setShips.Insert(ship);
         }
@@ -65,7 +65,7 @@ namespace WarmlyShip
         /// <param name="map"></param>
         /// <param name="position"></param>
         /// <returns></returns>
-        public static bool operator -(MapWithSetShipsGeneric<T, U> map, int position)
+        public static T operator -(MapWithSetShipsGeneric<T, U> map, int position)
         {
             return map._setShips.Remove(position);
         }
@@ -88,13 +88,9 @@ namespace WarmlyShip
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setShips.Count; i++)
+            foreach (var ship in _setShips.GetShips())
             {
-                var ship = _setShips.Get(i);
-                if (ship != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
-                }
+                return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
             }
             return new(_pictureWidth, _pictureHeight);
         }
@@ -119,11 +115,11 @@ namespace WarmlyShip
             int j = _setShips.Count - 1;
             for (int i = 0; i < _setShips.Count; i++)
             {
-                if (_setShips.Get(i) == null)
+                if (_setShips[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var ship = _setShips.Get(j);
+                        var ship = _setShips[j];
                         if (ship != null)
                         {
                             _setShips.Insert(ship, i);
@@ -172,7 +168,7 @@ namespace WarmlyShip
             int maxLeft = (countInLine - 1) * _placeSizeWidth;
             for (int i = 0; i < _setShips.Count; i++)
             {
-                var ship = _setShips.Get(i);
+                var ship = _setShips[i];
                 ship?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight + 3, _pictureWidth, _pictureHeight);
                 ship?.DrawningObject(g);
             }

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetShipsGeneric<DrawningObjectShip, 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, MapWithSetShipsGeneric<DrawningObjectShip, 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 MapWithSetShipsGeneric<DrawningObjectShip, AbstractMap> this[string ind]
+        {
+            get
+            {
+                _mapStorages.TryGetValue(ind, out var mapWithSetShipsGeneric);
+                return mapWithSetShipsGeneric;
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/SetShipsGeneric.cs

@@ -10,33 +10,37 @@ namespace WarmlyShip
         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 SetShipsGeneric(int count)
 		{
-			_places = new T[count];
+			_maxCount = count;
+			_places = new List<T>();
 		}
 		/// <summary>
 		/// Добавление объекта в набор
 		/// </summary>
 		/// <param name="ship">Добавляемый корабль</param>
 		/// <returns></returns>
-		public bool Insert(T ship)
+		public int Insert(T ship)
 		{
 			return Insert(ship, 0);
 		}
+
 		private bool isCorrectPosition(int position)
 		{
-			return 0 <= position && position < Count;
+			return 0 <= position && position < _maxCount;
 		}
 		/// <summary>
 		/// Добавление объекта в набор на конкретную позицию
@@ -44,46 +48,61 @@ namespace WarmlyShip
 		/// <param name="ship">Добавляемый корабль</param>
 		/// <param name="position">Позиция</param>
 		/// <returns></returns>
-		public bool Insert(T ship, int position)
+		public int Insert(T airplane, int position)
 		{
-			int positionNullElement = position;
-			while (Get(positionNullElement) != null)
+			if (!isCorrectPosition(position))
 			{
-				positionNullElement++;
+				return -1;
 			}
-			// Если изначальная позиция была некорректной или пустых элементов справа не оказалось возвращаем false
-			if (!isCorrectPosition(positionNullElement))
-			{
-				return false;
-			}
-			while (positionNullElement != position) // Смещение вправо
-			{
-				_places[positionNullElement] = _places[positionNullElement - 1];
-				positionNullElement--;
-			}
-			_places[position] = ship;
-			return true;
+			_places.Insert(position, airplane);
+			return position;
 		}
 		/// <summary>
 		/// Удаление объекта из набора с конкретной позиции
 		/// </summary>
 		/// <param name="position"></param>
 		/// <returns></returns>
-		public bool Remove(int position)
+		public T Remove(int position)
 		{
 			if (!isCorrectPosition(position))
-				return false;
-			_places[position-1] = null;
-			return true;
+				return null;
+			var result = _places[position];
+			_places.RemoveAt(position);
+			return result;
 		}
 		/// <summary>
 		/// Получение объекта из набора по позиции
 		/// </summary>
 		/// <param name="position"></param>
 		/// <returns></returns>
-		public T Get(int position)
+		public T this[int position]
 		{
-			return isCorrectPosition(position) ? _places[position] : null;
+			get
+			{
+				return isCorrectPosition(position) && position < Count ? _places[position] : null;
+			}
+			set
+			{
+				Insert(value, position);
+			}
+		}
+		/// <summary>
+		/// Проход по набору до первого пустого
+		/// </summary>
+		/// <returns></returns>
+		public IEnumerable<T> GetShips()
+		{
+			foreach (var ship in _places)
+			{
+				if (ship != null)
+				{
+					yield return ship;
+				}
+				else
+				{
+					yield break;
+				}
+			}
 		}
 	}
 }