Merge pull request 'Bondarenko M.S. Lab Work 3' (#8 ) from LabWork_03 into LabWork_02

Reviewed-on: http://student.git.athene.tech/maxnes3/PIbd-22_Bondarenko_M.S._WarmlyShip_Base/pulls/8
2022-11-07 12:10:37 +04:00
16 changed files with 119 additions and 1083 deletions
--- a/WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs
+++ b/WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs
@@ -119,10 +119,5 @@ namespace WarmlyShip
 		{
 			return (_startPosX, _startPosX + _warmlyShipWidth, _startPosY, _startPosY + _warmlyShipHeight);
 		}
-
-		public DrawingWarmlyShip ModifShip(int? speed = null, float? weight = null, Color? bodyColor = null)
-		{
-			return new DrawingWarmlyShip(speed ?? warmlyShip.Speed, weight ?? warmlyShip.Weight, bodyColor ?? warmlyShip.BodyColor);
-		}
 	}
 }
--- a/WarmlyShip/WarmlyShip/DrawningMotorShip.cs
+++ b/WarmlyShip/WarmlyShip/DrawningMotorShip.cs
@@ -40,10 +40,5 @@ namespace WarmlyShip
 				g.DrawEllipse(pen, _startPosX, _startPosY + 25, 25, 20);
 			}
 		}
-
-		public DrawningMotorShip ModifShip(int? speed = null, float? weight = null, Color? bodyColor = null, Color? dopColor = null, bool? tubes = null, bool? cistern = null)
-		{
-			return new DrawningMotorShip(speed ?? warmlyShip.Speed, weight ?? warmlyShip.Weight, bodyColor ?? warmlyShip.BodyColor, dopColor ?? ((EntityMotorShip)warmlyShip).DopColor, tubes ?? ((EntityMotorShip)warmlyShip).Tubes, cistern ?? ((EntityMotorShip)warmlyShip).Cistern);
-		}
 	}
 }
--- a/WarmlyShip/WarmlyShip/DrawningObjectShip.cs
+++ b/WarmlyShip/WarmlyShip/DrawningObjectShip.cs
@@ -36,9 +36,5 @@ namespace WarmlyShip
 		{
 			_warmlyShip?.SetPosition(x, y, width, height);	
 		}
-
-		public string GetInfo() => _warmlyShip?.GetDataForSave();
-
-		public static IDrawningObject Create(string data) => new DrawningObjectShip(data.CreateDrawningShip());
 	}
 }
--- a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs
+++ b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs
@@ -17,8 +17,8 @@ namespace WarmlyShip
 		public EntityWarmlyShip(int speed, float weight, Color bodyColor)
 		{
 			Random random = new Random();
-			Speed = speed <= 0 ? random.Next(100, 300) : speed;
-			Weight = weight <= 0 ? random.Next(1000, 2000) : weight;
+			Speed = speed <= 0 ? random.Next(50, 150) : speed;
+			Weight = weight <= 0 ? random.Next(40, 70) : weight;
 			BodyColor = bodyColor;
 		}
 	}
--- a/WarmlyShip/WarmlyShip/ExtentionShip.cs
+++ b/WarmlyShip/WarmlyShip/ExtentionShip.cs
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WarmlyShip
-{
-	internal static class ExtentionShip
-	{
-
-		private static readonly char _separatorForObject = ':';
-
-		public static DrawingWarmlyShip CreateDrawningShip(this string info)
-		{
-			string[] strs = info.Split(_separatorForObject);
-			if (strs.Length == 3)
-			{
-				return new DrawingWarmlyShip(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
-			}
-			if (strs.Length == 6)
-			{
-				return new DrawningMotorShip(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]));
-			}
-			return null;
-		}
-
-		public static string GetDataForSave(this DrawingWarmlyShip warmlyShip)
-		{
-			var ship = warmlyShip.warmlyShip;
-			var str = $"{ship.Speed}{_separatorForObject}{ship.Weight}{_separatorForObject}{ship.BodyColor.Name}";
-			if (ship is not EntityMotorShip motorShip)
-			{
-				return str;
-			}
-			return $"{str}{_separatorForObject}{motorShip.DopColor.Name}{_separatorForObject}{motorShip.Tubes}{_separatorForObject}{motorShip.Cistern}";
-		}
-	}
-}
--- a/WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs
+++ b/WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs
@@ -29,12 +29,6 @@
 		private void InitializeComponent()
 		{
 			this.groupBox1 = 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.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
 			this.buttonDown = new System.Windows.Forms.Button();
 			this.buttonLeft = new System.Windows.Forms.Button();
@@ -44,22 +38,14 @@
 			this.buttonShowStorage = new System.Windows.Forms.Button();
 			this.buttonRemoveShip = new System.Windows.Forms.Button();
 			this.buttonAddShip = new System.Windows.Forms.Button();
+			this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
 			this.pictureBox = new System.Windows.Forms.PictureBox();
-			this.menuStrip = new System.Windows.Forms.MenuStrip();
-			this.файлToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
 			this.groupBox1.SuspendLayout();
-			this.groupBoxMaps.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-			this.menuStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// groupBox1
 			// 
-			this.groupBox1.Controls.Add(this.groupBoxMaps);
 			this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
 			this.groupBox1.Controls.Add(this.buttonDown);
 			this.groupBox1.Controls.Add(this.buttonLeft);
@@ -69,80 +55,18 @@
 			this.groupBox1.Controls.Add(this.buttonShowStorage);
 			this.groupBox1.Controls.Add(this.buttonRemoveShip);
 			this.groupBox1.Controls.Add(this.buttonAddShip);
+			this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
 			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
-			this.groupBox1.Location = new System.Drawing.Point(815, 24);
+			this.groupBox1.Location = new System.Drawing.Point(600, 0);
 			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(200, 624);
+			this.groupBox1.Size = new System.Drawing.Size(200, 450);
 			this.groupBox1.TabIndex = 0;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.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, 22);
-			this.groupBoxMaps.Name = "groupBoxMaps";
-			this.groupBoxMaps.Size = new System.Drawing.Size(188, 244);
-			this.groupBoxMaps.TabIndex = 12;
-			this.groupBoxMaps.TabStop = false;
-			this.groupBoxMaps.Text = "Карта";
-			// 
-			// buttonDeleteMap
-			// 
-			this.buttonDeleteMap.Location = new System.Drawing.Point(6, 209);
-			this.buttonDeleteMap.Name = "buttonDeleteMap";
-			this.buttonDeleteMap.Size = new System.Drawing.Size(176, 23);
-			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 = 15;
-			this.listBoxMaps.Location = new System.Drawing.Point(6, 109);
-			this.listBoxMaps.Name = "listBoxMaps";
-			this.listBoxMaps.Size = new System.Drawing.Size(176, 94);
-			this.listBoxMaps.TabIndex = 2;
-			this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
-			// 
-			// buttonAddMap
-			// 
-			this.buttonAddMap.Location = new System.Drawing.Point(6, 80);
-			this.buttonAddMap.Name = "buttonAddMap";
-			this.buttonAddMap.Size = new System.Drawing.Size(176, 23);
-			this.buttonAddMap.TabIndex = 1;
-			this.buttonAddMap.Text = "Добавить карту";
-			this.buttonAddMap.UseVisualStyleBackColor = true;
-			this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
-			// 
-			// textBoxNewMapName
-			// 
-			this.textBoxNewMapName.Location = new System.Drawing.Point(6, 22);
-			this.textBoxNewMapName.Name = "textBoxNewMapName";
-			this.textBoxNewMapName.Size = new System.Drawing.Size(176, 23);
-			this.textBoxNewMapName.TabIndex = 0;
-			// 
-			// comboBoxSelectorMap
-			// 
-			this.comboBoxSelectorMap.FormattingEnabled = true;
-			this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Вторая карта",
-            "Последняя карта"});
-			this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 51);
-			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-			this.comboBoxSelectorMap.Size = new System.Drawing.Size(176, 23);
-			this.comboBoxSelectorMap.TabIndex = 0;
-			// 
 			// maskedTextBoxPosition
 			// 
-			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 345);
+			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 116);
 			this.maskedTextBoxPosition.Mask = "00";
 			this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
 			this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
@@ -153,7 +77,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.todown;
 			this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonDown.Location = new System.Drawing.Point(75, 565);
+			this.buttonDown.Location = new System.Drawing.Point(75, 391);
 			this.buttonDown.Name = "buttonDown";
 			this.buttonDown.Size = new System.Drawing.Size(50, 50);
 			this.buttonDown.TabIndex = 10;
@@ -165,7 +89,7 @@
 			this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.toleft;
 			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonLeft.Location = new System.Drawing.Point(19, 565);
+			this.buttonLeft.Location = new System.Drawing.Point(19, 391);
 			this.buttonLeft.Name = "buttonLeft";
 			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
 			this.buttonLeft.TabIndex = 9;
@@ -177,7 +101,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.totop;
 			this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonUp.Location = new System.Drawing.Point(75, 509);
+			this.buttonUp.Location = new System.Drawing.Point(75, 335);
 			this.buttonUp.Name = "buttonUp";
 			this.buttonUp.Size = new System.Drawing.Size(50, 50);
 			this.buttonUp.TabIndex = 8;
@@ -189,7 +113,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.toright;
 			this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonRight.Location = new System.Drawing.Point(131, 565);
+			this.buttonRight.Location = new System.Drawing.Point(131, 391);
 			this.buttonRight.Name = "buttonRight";
 			this.buttonRight.Size = new System.Drawing.Size(50, 50);
 			this.buttonRight.TabIndex = 7;
@@ -198,7 +122,7 @@
 			// 
 			// buttonShowOnMap
 			// 
-			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 432);
+			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 281);
 			this.buttonShowOnMap.Name = "buttonShowOnMap";
 			this.buttonShowOnMap.Size = new System.Drawing.Size(188, 23);
 			this.buttonShowOnMap.TabIndex = 5;
@@ -208,7 +132,7 @@
 			// 
 			// buttonShowStorage
 			// 
-			this.buttonShowStorage.Location = new System.Drawing.Point(6, 403);
+			this.buttonShowStorage.Location = new System.Drawing.Point(6, 226);
 			this.buttonShowStorage.Name = "buttonShowStorage";
 			this.buttonShowStorage.Size = new System.Drawing.Size(188, 23);
 			this.buttonShowStorage.TabIndex = 4;
@@ -218,7 +142,7 @@
 			// 
 			// buttonRemoveShip
 			// 
-			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 374);
+			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 170);
 			this.buttonRemoveShip.Name = "buttonRemoveShip";
 			this.buttonRemoveShip.Size = new System.Drawing.Size(188, 23);
 			this.buttonRemoveShip.TabIndex = 3;
@@ -228,7 +152,7 @@
 			// 
 			// buttonAddShip
 			// 
-			this.buttonAddShip.Location = new System.Drawing.Point(6, 316);
+			this.buttonAddShip.Location = new System.Drawing.Point(6, 65);
 			this.buttonAddShip.Name = "buttonAddShip";
 			this.buttonAddShip.Size = new System.Drawing.Size(188, 23);
 			this.buttonAddShip.TabIndex = 1;
@@ -236,75 +160,41 @@
 			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, 22);
+			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+			this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
+			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, 24);
+			this.pictureBox.Location = new System.Drawing.Point(0, 0);
 			this.pictureBox.Name = "pictureBox";
-			this.pictureBox.Size = new System.Drawing.Size(815, 624);
+			this.pictureBox.Size = new System.Drawing.Size(600, 450);
 			this.pictureBox.TabIndex = 1;
 			this.pictureBox.TabStop = false;
 			// 
-			// menuStrip
-			// 
-			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.файлToolStripMenuItem});
-			this.menuStrip.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip.Name = "menuStrip";
-			this.menuStrip.Size = new System.Drawing.Size(1015, 24);
-			this.menuStrip.TabIndex = 2;
-			// 
-			// файлToolStripMenuItem
-			// 
-			this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SaveToolStripMenuItem,
-            this.LoadToolStripMenuItem});
-			this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-			this.файлToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
-			this.файлToolStripMenuItem.Text = "Файл";
-			// 
-			// SaveToolStripMenuItem
-			// 
-			this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-			this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.SaveToolStripMenuItem.Text = "Сохранение";
-			this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
-			// 
-			// LoadToolStripMenuItem
-			// 
-			this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-			this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.LoadToolStripMenuItem.Text = "Загрузка";
-			this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
-			// 
-			// openFileDialog
-			// 
-			this.openFileDialog.Filter = "txt file | *.txt";
-			// 
-			// saveFileDialog
-			// 
-			this.saveFileDialog.Filter = "txt file | *.txt";
-			// 
 			// FormMapWithSetShip
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1015, 648);
+			this.ClientSize = new System.Drawing.Size(800, 450);
 			this.Controls.Add(this.pictureBox);
 			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.menuStrip);
-			this.MainMenuStrip = this.menuStrip;
 			this.Name = "FormMapWithSetShip";
 			this.Text = "FormMapWithSetShip";
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
-			this.groupBoxMaps.ResumeLayout(false);
-			this.groupBoxMaps.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-			this.menuStrip.ResumeLayout(false);
-			this.menuStrip.PerformLayout();
 			this.ResumeLayout(false);
-			this.PerformLayout();

 		}

@@ -322,16 +212,5 @@
 		private Button buttonUp;
 		private Button buttonRight;
 		private MaskedTextBox maskedTextBoxPosition;
-		private GroupBox groupBoxMaps;
-		private Button buttonDeleteMap;
-		private ListBox listBoxMaps;
-		private Button buttonAddMap;
-		private TextBox textBoxNewMapName;
-		private MenuStrip menuStrip;
-		private ToolStripMenuItem файлToolStripMenuItem;
-		private ToolStripMenuItem SaveToolStripMenuItem;
-		private ToolStripMenuItem LoadToolStripMenuItem;
-		private OpenFileDialog openFileDialog;
-		private SaveFileDialog saveFileDialog;
 	}
 }
--- a/WarmlyShip/WarmlyShip/FormMapWithSetShip.cs
+++ b/WarmlyShip/WarmlyShip/FormMapWithSetShip.cs
@@ -8,116 +8,67 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using WarmlyShip;
-using static System.Windows.Forms.DataFormats;

 namespace WarmlyShip
 {
 	public partial class FormMapWithSetShip : Form
 	{
-		private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-		{
-			{ "Простая карта", new SimpleMap() },
-			{ "Вторая карта", new SecondMap() },
-			{ "Последняя карта", new LastMap() }
-		};
-
-		private readonly MapsCollection _mapsCollection;
+		private MapWithSetShipGeneric<DrawningObjectShip, AbstractMap> _mapShipCollectionGeneric;
+		public bool ShipOnMap = false;

 		public FormMapWithSetShip()
 		{
 			InitializeComponent();
-			_mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
-			comboBoxSelectorMap.Items.Clear();
-			foreach (var elem in _mapsDict)
-			{
-				comboBoxSelectorMap.Items.Add(elem.Key);
-			}
 		}

-		private void ReloadMaps()
+		private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			int index = listBoxMaps.SelectedIndex;
-			listBoxMaps.Items.Clear();
-			for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+			AbstractMap map = null;
+			switch (comboBoxSelectorMap.Text)
 			{
-				listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+				case "Простая карта":
+					map = new SimpleMap();
+					break;
+				case "Вторая карта":
+					map = new SecondMap();
+					break;
+				case "Последняя карта":
+					map = new LastMap();
+					break;
 			}
-			if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+			if (map != null)
 			{
-				listBoxMaps.SelectedIndex = 0;
-			}
-			else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
-			{
-				listBoxMaps.SelectedIndex = index;
-			}
-		}
-
-		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();
-		}
-
-		private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-		}
-
-		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();
-			}
-		}
-
-		private void ButtonAddShip_Click(object sender, EventArgs e)
-		{
-			FormShipConfig formShipConfig = new();
-			formShipConfig.AddEvent(AddShip);
-			formShipConfig.Show();
-		}
-
-		private void AddShip(DrawingWarmlyShip ship)
-		{
-			if (listBoxMaps.SelectedIndex == -1)
-			{
-				return;
-			}
-
-			if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) > -1)
-			{
-				MessageBox.Show("Объект добавлен");
-				pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+				_mapShipCollectionGeneric = new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
 			}
 			else
 			{
-				MessageBox.Show("Не удалось добавить объект");
+				_mapShipCollectionGeneric = null;
+			}
+		}
+		private void ButtonAddShip_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			FormClass form = new();
+			if (form.ShowDialog() == DialogResult.OK)
+			{
+				DrawningObjectShip ship = new(form.SelectedShip);
+				if (_mapShipCollectionGeneric + ship > -1)
+				{
+					MessageBox.Show("Объект добавлен");
+					pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+				}
+				else
+				{
+					MessageBox.Show("Не удалось добавить объект");
+				}
 			}
 		}

 		private void ButtonRemoveShip_Click(object sender, EventArgs e)
 		{
-			if (listBoxMaps.SelectedIndex == -1)
-			{
-				return;
-			}
 			if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
 			{
 				return;
@@ -127,11 +78,10 @@ namespace WarmlyShip
 				return;
 			}
 			int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-			if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+			if (_mapShipCollectionGeneric - pos != null)
 			{
 				MessageBox.Show("Объект удален");
-				pictureBox.Image =
-			   _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+				pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
 			}
 			else
 			{
@@ -141,25 +91,27 @@ namespace WarmlyShip

 		private void ButtonShowStorage_Click(object sender, EventArgs e)
 		{
-			if (listBoxMaps.SelectedIndex == -1)
+			if (_mapShipCollectionGeneric == null)
 			{
 				return;
 			}
-			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+			pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+			ShipOnMap = false;
 		}

 		private void ButtonShowOnMap_Click(object sender, EventArgs e)
 		{
-			if (listBoxMaps.SelectedIndex == -1)
+			if (_mapShipCollectionGeneric == null)
 			{
 				return;
 			}
-			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+			pictureBox.Image = _mapShipCollectionGeneric.ShowOnMap();
+			ShipOnMap = true;
 		}

 		private void ButtonMove_Click(object sender, EventArgs e)
 		{
-			if (listBoxMaps.SelectedIndex == -1)
+			if (_mapShipCollectionGeneric == null || !ShipOnMap)
 			{
 				return;
 			}
@@ -181,38 +133,7 @@ namespace WarmlyShip
 					dir = Direction.Right;
 					break;
 			}
-			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
-		}
-
-		private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			if (saveFileDialog.ShowDialog() == DialogResult.OK)
-			{
-				if (_mapsCollection.SaveData(saveFileDialog.FileName))
-				{
-					MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-				}
-				else
-				{
-					MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			if (openFileDialog.ShowDialog() == DialogResult.OK)
-			{
-				if (_mapsCollection.LoadData(openFileDialog.FileName))
-				{
-					MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-					ReloadMaps();
-				}
-				else
-				{
-					MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
+			pictureBox.Image = _mapShipCollectionGeneric.MoveObject(dir);
 		}
 	}
 }
--- a/WarmlyShip/WarmlyShip/FormMapWithSetShip.resx
+++ b/WarmlyShip/WarmlyShip/FormMapWithSetShip.resx
@@ -57,13 +57,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>125, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>265, 17</value>
-  </metadata>
 </root>
--- a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs
+++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs
@@ -1,352 +0,0 @@
-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.panelBlack = new System.Windows.Forms.Panel();
-			this.panelWhite = new System.Windows.Forms.Panel();
-			this.panelBlue = new System.Windows.Forms.Panel();
-			this.panelYellow = new System.Windows.Forms.Panel();
-			this.panelCyan = new System.Windows.Forms.Panel();
-			this.panelGreen = new System.Windows.Forms.Panel();
-			this.panelRed = new System.Windows.Forms.Panel();
-			this.panelPink = new System.Windows.Forms.Panel();
-			this.checkBoxCistern = new System.Windows.Forms.CheckBox();
-			this.checkBoxTubes = 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.pictureBoxObject = new System.Windows.Forms.PictureBox();
-			this.panelObject = new System.Windows.Forms.Panel();
-			this.labelDopColor = new System.Windows.Forms.Label();
-			this.labelBaseColor = new System.Windows.Forms.Label();
-			this.buttonAddShip = 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();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
-			this.panelObject.SuspendLayout();
-			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.checkBoxCistern);
-			this.groupBoxConfig.Controls.Add(this.checkBoxTubes);
-			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(454, 259);
-			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(339, 149);
-			this.labelModifiedObject.Name = "labelModifiedObject";
-			this.labelModifiedObject.Size = new System.Drawing.Size(100, 23);
-			this.labelModifiedObject.TabIndex = 8;
-			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(233, 149);
-			this.labelSimpleObject.Name = "labelSimpleObject";
-			this.labelSimpleObject.Size = new System.Drawing.Size(100, 23);
-			this.labelSimpleObject.TabIndex = 7;
-			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.panelBlack);
-			this.groupBoxColors.Controls.Add(this.panelWhite);
-			this.groupBoxColors.Controls.Add(this.panelBlue);
-			this.groupBoxColors.Controls.Add(this.panelYellow);
-			this.groupBoxColors.Controls.Add(this.panelCyan);
-			this.groupBoxColors.Controls.Add(this.panelGreen);
-			this.groupBoxColors.Controls.Add(this.panelRed);
-			this.groupBoxColors.Controls.Add(this.panelPink);
-			this.groupBoxColors.Location = new System.Drawing.Point(239, 22);
-			this.groupBoxColors.Name = "groupBoxColors";
-			this.groupBoxColors.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.groupBoxColors.Size = new System.Drawing.Size(194, 113);
-			this.groupBoxColors.TabIndex = 6;
-			this.groupBoxColors.TabStop = false;
-			this.groupBoxColors.Text = "Цвета";
-			// 
-			// panelBlack
-			// 
-			this.panelBlack.BackColor = System.Drawing.Color.Black;
-			this.panelBlack.Location = new System.Drawing.Point(147, 67);
-			this.panelBlack.Name = "panelBlack";
-			this.panelBlack.Size = new System.Drawing.Size(41, 39);
-			this.panelBlack.TabIndex = 1;
-			// 
-			// panelWhite
-			// 
-			this.panelWhite.BackColor = System.Drawing.Color.White;
-			this.panelWhite.Location = new System.Drawing.Point(100, 67);
-			this.panelWhite.Name = "panelWhite";
-			this.panelWhite.Size = new System.Drawing.Size(41, 39);
-			this.panelWhite.TabIndex = 1;
-			// 
-			// panelBlue
-			// 
-			this.panelBlue.BackColor = System.Drawing.Color.Blue;
-			this.panelBlue.Location = new System.Drawing.Point(53, 67);
-			this.panelBlue.Name = "panelBlue";
-			this.panelBlue.Size = new System.Drawing.Size(41, 39);
-			this.panelBlue.TabIndex = 1;
-			// 
-			// panelYellow
-			// 
-			this.panelYellow.BackColor = System.Drawing.Color.Yellow;
-			this.panelYellow.Location = new System.Drawing.Point(6, 69);
-			this.panelYellow.Name = "panelYellow";
-			this.panelYellow.Size = new System.Drawing.Size(41, 39);
-			this.panelYellow.TabIndex = 4;
-			// 
-			// panelCyan
-			// 
-			this.panelCyan.BackColor = System.Drawing.Color.Cyan;
-			this.panelCyan.Location = new System.Drawing.Point(147, 22);
-			this.panelCyan.Name = "panelCyan";
-			this.panelCyan.Size = new System.Drawing.Size(41, 39);
-			this.panelCyan.TabIndex = 3;
-			// 
-			// panelGreen
-			// 
-			this.panelGreen.BackColor = System.Drawing.Color.Lime;
-			this.panelGreen.Location = new System.Drawing.Point(100, 22);
-			this.panelGreen.Name = "panelGreen";
-			this.panelGreen.Size = new System.Drawing.Size(41, 39);
-			this.panelGreen.TabIndex = 2;
-			// 
-			// panelRed
-			// 
-			this.panelRed.BackColor = System.Drawing.Color.Red;
-			this.panelRed.Location = new System.Drawing.Point(53, 22);
-			this.panelRed.Name = "panelRed";
-			this.panelRed.Size = new System.Drawing.Size(41, 39);
-			this.panelRed.TabIndex = 1;
-			// 
-			// panelPink
-			// 
-			this.panelPink.BackColor = System.Drawing.Color.Fuchsia;
-			this.panelPink.Location = new System.Drawing.Point(6, 22);
-			this.panelPink.Name = "panelPink";
-			this.panelPink.Size = new System.Drawing.Size(41, 39);
-			this.panelPink.TabIndex = 0;
-			// 
-			// checkBoxCistern
-			// 
-			this.checkBoxCistern.AutoSize = true;
-			this.checkBoxCistern.Location = new System.Drawing.Point(32, 116);
-			this.checkBoxCistern.Name = "checkBoxCistern";
-			this.checkBoxCistern.Size = new System.Drawing.Size(180, 19);
-			this.checkBoxCistern.TabIndex = 5;
-			this.checkBoxCistern.Text = "Признак наличия цистерны";
-			this.checkBoxCistern.UseVisualStyleBackColor = true;
-			// 
-			// checkBoxTubes
-			// 
-			this.checkBoxTubes.AutoSize = true;
-			this.checkBoxTubes.Location = new System.Drawing.Point(32, 91);
-			this.checkBoxTubes.Name = "checkBoxTubes";
-			this.checkBoxTubes.Size = new System.Drawing.Size(151, 19);
-			this.checkBoxTubes.TabIndex = 4;
-			this.checkBoxTubes.Text = "Признак наличия труб";
-			this.checkBoxTubes.UseVisualStyleBackColor = true;
-			// 
-			// numericUpDownWeight
-			// 
-			this.numericUpDownWeight.Location = new System.Drawing.Point(100, 51);
-			this.numericUpDownWeight.Name = "numericUpDownWeight";
-			this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23);
-			this.numericUpDownWeight.TabIndex = 3;
-			// 
-			// labelWeight
-			// 
-			this.labelWeight.AutoSize = true;
-			this.labelWeight.Location = new System.Drawing.Point(32, 53);
-			this.labelWeight.Name = "labelWeight";
-			this.labelWeight.Size = new System.Drawing.Size(29, 15);
-			this.labelWeight.TabIndex = 2;
-			this.labelWeight.Text = "Вес:";
-			// 
-			// numericUpDownSpeed
-			// 
-			this.numericUpDownSpeed.Location = new System.Drawing.Point(100, 22);
-			this.numericUpDownSpeed.Name = "numericUpDownSpeed";
-			this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23);
-			this.numericUpDownSpeed.TabIndex = 1;
-			// 
-			// labelSpeed
-			// 
-			this.labelSpeed.AutoSize = true;
-			this.labelSpeed.Location = new System.Drawing.Point(32, 24);
-			this.labelSpeed.Name = "labelSpeed";
-			this.labelSpeed.Size = new System.Drawing.Size(62, 15);
-			this.labelSpeed.TabIndex = 0;
-			this.labelSpeed.Text = "Скорость:";
-			// 
-			// pictureBoxObject
-			// 
-			this.pictureBoxObject.Location = new System.Drawing.Point(3, 32);
-			this.pictureBoxObject.Name = "pictureBoxObject";
-			this.pictureBoxObject.Size = new System.Drawing.Size(429, 185);
-			this.pictureBoxObject.TabIndex = 1;
-			this.pictureBoxObject.TabStop = false;
-			// 
-			// 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(472, 22);
-			this.panelObject.Name = "panelObject";
-			this.panelObject.Size = new System.Drawing.Size(435, 220);
-			this.panelObject.TabIndex = 2;
-			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(225, 6);
-			this.labelDopColor.Name = "labelDopColor";
-			this.labelDopColor.Size = new System.Drawing.Size(100, 23);
-			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.LabelBaseColor_DragEnter);
-			// 
-			// labelBaseColor
-			// 
-			this.labelBaseColor.AllowDrop = true;
-			this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.labelBaseColor.Location = new System.Drawing.Point(119, 6);
-			this.labelBaseColor.Name = "labelBaseColor";
-			this.labelBaseColor.Size = new System.Drawing.Size(100, 23);
-			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.LabelBaseColor_DragEnter);
-			// 
-			// buttonAddShip
-			// 
-			this.buttonAddShip.Location = new System.Drawing.Point(616, 248);
-			this.buttonAddShip.Name = "buttonAddShip";
-			this.buttonAddShip.Size = new System.Drawing.Size(75, 23);
-			this.buttonAddShip.TabIndex = 3;
-			this.buttonAddShip.Text = "Добавить";
-			this.buttonAddShip.UseVisualStyleBackColor = true;
-			this.buttonAddShip.Click += new System.EventHandler(this.ButtonOk_Click);
-			// 
-			// buttonCancel
-			// 
-			this.buttonCancel.Location = new System.Drawing.Point(697, 248);
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-			this.buttonCancel.TabIndex = 4;
-			this.buttonCancel.Text = "Отмена";
-			this.buttonCancel.UseVisualStyleBackColor = true;
-			// 
-			// FormShipConfig
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(919, 283);
-			this.Controls.Add(this.buttonCancel);
-			this.Controls.Add(this.buttonAddShip);
-			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();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
-			this.panelObject.ResumeLayout(false);
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private GroupBox groupBoxConfig;
-		private CheckBox checkBoxTubes;
-		private NumericUpDown numericUpDownWeight;
-		private Label labelWeight;
-		private NumericUpDown numericUpDownSpeed;
-		private Label labelSpeed;
-		private CheckBox checkBoxCistern;
-		private GroupBox groupBoxColors;
-		private Panel panelBlack;
-		private Panel panelWhite;
-		private Panel panelBlue;
-		private Panel panelYellow;
-		private Panel panelCyan;
-		private Panel panelGreen;
-		private Panel panelRed;
-		private Panel panelPink;
-		private Label labelSimpleObject;
-		private Label labelModifiedObject;
-		private PictureBox pictureBoxObject;
-		private Panel panelObject;
-		private Label labelDopColor;
-		private Label labelBaseColor;
-		private Button buttonAddShip;
-		private Button buttonCancel;
-	}
-}
--- a/WarmlyShip/WarmlyShip/FormShipConfig.cs
+++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs
@@ -1,136 +0,0 @@
-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
-	{
-
-		DrawingWarmlyShip _warmlyShip = null;
-
-		private Action<DrawingWarmlyShip> EventAddShip;
-
-		public FormShipConfig()
-		{
-			InitializeComponent();
-			panelBlack.MouseDown += PanelColor_MouseDown;
-			panelPink.MouseDown += PanelColor_MouseDown;
-			panelGreen.MouseDown += PanelColor_MouseDown;
-			panelCyan.MouseDown += PanelColor_MouseDown;
-			panelRed.MouseDown += PanelColor_MouseDown;
-			panelWhite.MouseDown += PanelColor_MouseDown;
-			panelYellow.MouseDown += PanelColor_MouseDown;
-			panelBlue.MouseDown += PanelColor_MouseDown;
-
-			buttonCancel.Click += (s, e) => Close();
-		}
-
-		private void DrawShip()
-		{
-			Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
-			Graphics gr = Graphics.FromImage(bmp);
-			_warmlyShip?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
-			_warmlyShip?.DrawTransport(gr);
-			pictureBoxObject.Image = bmp;
-		}
-
-		public void AddEvent(Action<DrawingWarmlyShip> ev)
-		{
-			if (EventAddShip == null)
-			{
-				EventAddShip = ev;
-			}
-			else
-			{
-				EventAddShip += ev;
-			}
-		}
-
-		private void LabelObject_MouseDown(object sender, MouseEventArgs e)
-		{
-			(sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
-		}
-
-		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":
-					_warmlyShip = new DrawingWarmlyShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
-					break;
-				case "labelModifiedObject":
-					_warmlyShip = new DrawningMotorShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxTubes.Checked, checkBoxCistern.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 LabelBaseColor_DragEnter(object sender, DragEventArgs e)
-		{
-			if (e.Data.GetDataPresent(typeof(Color)))
-			{
-				e.Effect = DragDropEffects.Copy;
-			}
-			else
-			{
-				e.Effect = DragDropEffects.None;
-			}
-		}
-
-		private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
-		{
-			if (_warmlyShip == null) return;
-
-			if (_warmlyShip is DrawningMotorShip)
-			{
-				_warmlyShip = ((DrawningMotorShip)_warmlyShip).ModifShip(bodyColor: (Color)e.Data.GetData(typeof(Color)));
-			}
-			else
-			{
-				_warmlyShip = _warmlyShip.ModifShip(bodyColor: (Color)e.Data.GetData(typeof(Color)));
-			}
-
-			DrawShip();
-		}
-
-		private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
-		{
-			if (_warmlyShip == null || !(_warmlyShip is DrawningMotorShip)) return;
-
-			_warmlyShip = ((DrawningMotorShip)_warmlyShip).ModifShip(dopColor: (Color)e.Data.GetData(typeof(Color)));
-
-			DrawShip();
-		}
-
-		private void ButtonOk_Click(object sender, EventArgs e)
-		{
-			EventAddShip?.Invoke(_warmlyShip);
-			Close();
-		}
-
-	}
-}
--- a/WarmlyShip/WarmlyShip/FormShipConfig.resx
+++ b/WarmlyShip/WarmlyShip/FormShipConfig.resx
@@ -1,60 +0,0 @@
-<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>
--- a/WarmlyShip/WarmlyShip/IDrawningObject.cs
+++ b/WarmlyShip/WarmlyShip/IDrawningObject.cs
@@ -13,7 +13,5 @@ namespace WarmlyShip
 		void MoveObject(Direction direction);
 		void DrawningObject(Graphics g);
 		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-
-		string GetInfo();
 	}
 }
--- a/WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs
+++ b/WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs
@@ -49,9 +49,13 @@ namespace WarmlyShip
 		public Bitmap ShowOnMap()
 		{
 			Shaking();
-			foreach (var ship in _setShips.GetShips())
+			for (int i = 0; i < _setShips.Count; i++)
 			{
-				return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+				var ship = _setShips.Get(i);
+				if (ship != null)
+				{
+					return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+				}
 			}
 			return new(_pictureWidth, _pictureHeight);
 		}
@@ -65,34 +69,16 @@ namespace WarmlyShip
 			return new(_pictureWidth, _pictureHeight);
 		}

-		public string GetData(char separatorType, char separatorData)
-		{
-			string data = $"{_map.GetType().Name}{separatorType}";
-			foreach (var ship in _setShips.GetShips())
-			{
-				data += $"{ship.GetInfo()}{separatorData}";
-			}
-			return data;
-		}
-
-		public void LoadData(string[] records)
-		{
-			foreach (var rec in records)
-			{
-				_setShips.Insert(DrawningObjectShip.Create(rec) as T);
-			}
-		}
-
 		private void Shaking()
 		{
 			int j = _setShips.Count - 1;
 			for (int i = 0; i < _setShips.Count; ++i)
 			{
-				if (_setShips[i] == null)
+				if (_setShips.Get(i) == null)
 				{
 					for (; j > i; --j)
 					{
-						var car = _setShips[j];
+						var car = _setShips.Get(j);
 						if (car != null)
 						{
 							_setShips.Insert(car, i);
@@ -125,18 +111,17 @@ namespace WarmlyShip

 		private void DrawShips(Graphics g)
 		{
-			int i = 0;
-			foreach (var ship in _setShips.GetShips())
+			for (int i = 0; i < _setShips.Count; ++i)
 			{
-				if (ship != null)
+				if (_setShips.Get(i) != null )
 				{
 					int temp = 0;
-					if (ship.GetCurrentPosition().Bottom - ship.GetCurrentPosition().Top < 75) temp = (int)(ship.GetCurrentPosition().Bottom - ship.GetCurrentPosition().Top);
-					ship.SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight + temp, _pictureWidth, _pictureHeight);
-					ship.DrawningObject(g);
+					if (_setShips.Get(i).GetCurrentPosition().Bottom - _setShips.Get(i).GetCurrentPosition().Top < 75) temp = (int)(_setShips.Get(i).GetCurrentPosition().Bottom - _setShips.Get(i).GetCurrentPosition().Top);
+					_setShips.Get(i).SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight + temp, _pictureWidth, _pictureHeight);
+					_setShips.Get(i).DrawningObject(g);
 				}
-				++i;
 			}
 		}
+
 	}
 }
--- a/WarmlyShip/WarmlyShip/MapsCollection.cs
+++ b/WarmlyShip/WarmlyShip/MapsCollection.cs
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.DirectoryServices.ActiveDirectory;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace WarmlyShip
-{
-	internal class MapsCollection
-	{
-		readonly Dictionary<string, MapWithSetShipGeneric<IDrawningObject, AbstractMap>> _mapStorages;
-
-		public List<string> Keys => _mapStorages.Keys.ToList();
-
-		private readonly int _pictureWidth;
-
-		private readonly int _pictureHeight;
-
-		private readonly char separatorDict = '|';
-
-		private readonly char separatorData = ';';
-
-		public MapsCollection(int pictureWidth, int pictureHeight)
-		{
-			_mapStorages = new Dictionary<string, MapWithSetShipGeneric<IDrawningObject, AbstractMap>>();
-			_pictureWidth = pictureWidth;
-			_pictureHeight = pictureHeight;
-		}
-
-		public void AddMap(string name, AbstractMap map)
-		{
-			if (_mapStorages.ContainsKey(name)) return;
-			_mapStorages.Add(name, new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-		}
-
-		public void DelMap(string name)
-		{
-			if (!_mapStorages.ContainsKey(name)) return;
-			_mapStorages.Remove(name);
-		}
-
-		public MapWithSetShipGeneric<IDrawningObject, AbstractMap> this[string ind]
-		{
-			get
-			{
-				if(_mapStorages.ContainsKey(ind)) return _mapStorages[ind];
-				return null;
-			}
-		}
-
-		public bool SaveData(string filename)
-		{
-			if (File.Exists(filename))
-			{
-				File.Delete(filename);
-			}
-			using (StreamWriter sw = new(filename))
-			{
-				sw.Write($"MapsCollection{Environment.NewLine}");
-				foreach (var storage in _mapStorages)
-				{
-
-					sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
-				}
-			}
-			return true;
-		}
-
-		public bool LoadData(string filename)
-		{
-			if (!File.Exists(filename))
-			{
-				return false;
-			}
-			using (StreamReader sr = new(filename))
-			{
-				string bufferStr;
-				bool firstIn = true;
-				while ((bufferStr = sr.ReadLine()) != null)
-				{
-					if (firstIn)
-					{
-						if (!bufferStr.Contains("MapsCollection"))
-						{
-							return false;
-						}
-						else
-						{
-							_mapStorages.Clear();
-						}
-						firstIn = false;
-					}
-					else
-					{
-						var elem = bufferStr.Split(separatorDict);
-						AbstractMap map = null;
-						switch (elem[1])
-						{
-							case "SimpleMap":
-								map = new SimpleMap();
-								break;
-							case "SecondMap":
-								map = new SecondMap();
-								break;
-							case "LastMap":
-								map = new LastMap();
-								break;
-						}
-						_mapStorages.Add(elem[0], new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-						_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
-					}
-				}
-			}
-			return true;
-		}
-	}
-}
--- a/WarmlyShip/WarmlyShip/SetShipGeneric.cs
+++ b/WarmlyShip/WarmlyShip/SetShipGeneric.cs
@@ -9,15 +9,19 @@ namespace WarmlyShip
 	internal class SetShipGeneric<T>
 		where T : class
 	{
-		private readonly List<T> _places;
-		public int Count => _places.Count;
-
-		private readonly int _maxCount;
+		private readonly T[] _places;
+		public int Count => _places.Length;

 		public SetShipGeneric(int count)
 		{
-			_maxCount = count;
-			_places = new List<T>();
+			_places = new T[count];
+		}
+
+		private bool CanInsert(int position)
+		{
+			for (int i = position; i < _places.Length; ++i)
+				if (_places[i] == null) return true;
+			return false;
 		}

 		public int Insert(T ship)
@@ -27,8 +31,19 @@ namespace WarmlyShip

 		public int Insert(T ship, int position)
 		{
-			if (position < 0 || position > Count || Count == _maxCount) return -1;
-			_places.Insert(position, ship);
+			if (position < 0 || position > _places.Length) return -1;
+			if (_places[position] != null && CanInsert(position))
+			{
+				for (int i = _places.Length - 1; i > position; --i)
+				{
+					if (_places[i] == null)
+					{
+						_places[i] = _places[i - 1];
+						_places[i - 1] = null;
+					}
+				}
+			}
+			_places[position] = ship;
 			return position;
 		}

@@ -39,33 +54,10 @@ namespace WarmlyShip
 			return DelElement;
 		}

-		public T this[int position]
+		public T Get(int position)
 		{
-			get
-			{
-				if (position < 0 || position > Count) return null;
-				return _places[position];
-			}
-			set
-			{
-				Insert(value, position);
-			}
-		}
-
-
-		public IEnumerable<T> GetShips()
-		{
-			foreach (var ship in _places)
-			{
-				if (ship != null)
-				{
-					yield return ship;
-				}
-				else
-				{
-					yield break;
-				}
-			}
+			if (position < 0 || position > _places.Length) return null;
+			return _places[position];
 		}

 	}
--- a/WarmlyShip/WarmlyShip/ShipDelegate.cs
+++ b/WarmlyShip/WarmlyShip/ShipDelegate.cs
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WarmlyShip
-{
-	public delegate void ShipDelegate(DrawingWarmlyShip warmlyShip);
-}