исправил нерабочий кал

WarmlyShip/WarmlyShip/AbstractMap.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal abstract class AbstractMap : IEquatable<AbstractMap>
+	{
+		private IDrawningObject _drawningObject = null;
+
+		protected int[,] _map = null;
+		protected int _width;
+		protected int _height;
+		protected float _size_x;
+		protected float _size_y;
+		protected readonly Random _random = new();
+		protected readonly int _freeRoad = 0;
+		protected readonly int _barrier = 1;
+
+		public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+		{
+			_width = width;
+			_height = height;
+			_drawningObject = drawningObject;
+			GenerateMap();
+			while (!SetObjectOnMap())
+			{
+				GenerateMap();
+			}
+			return DrawMapWithObject();
+		}
+
+		private bool CanMove(Direction direction, (float Left, float Right, float Top, float Bottom) position) //Проверка на возможность шага
+		{
+			for (int i = (int)(position.Top / _size_y); i <= (int)(position.Bottom / _size_y); ++i)
+			{
+				for (int j = (int)(position.Left / _size_x); j <= (int)(position.Right / _size_x); ++j)
+				{
+					if (i >= 0 && j >= 0 && i < _map.GetLength(0) && j < _map.GetLength(1) && _map[i, j] == _barrier) return false;
+				}
+			}
+			return true;
+		}
+
+		public Bitmap MoveObject(Direction direction)
+		{
+			(float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition();
+			if (direction == Direction.Left)
+			{
+				position.Left -= _drawningObject.Step;
+			}
+			else if (direction == Direction.Right)
+			{
+				position.Right += _drawningObject.Step;
+			}
+			else if (direction == Direction.Up)
+			{
+				position.Top -= _drawningObject.Step;
+			}
+			else if (direction == Direction.Down)
+			{
+				position.Bottom += _drawningObject.Step;
+			}
+
+			if (CanMove(direction, position))
+			{
+				_drawningObject.MoveObject(direction);
+			}
+			return DrawMapWithObject();
+		}
+
+		private bool SetObjectOnMap()
+		{
+			if (_drawningObject == null || _map == null)
+			{
+				return false;
+			}
+			int x = _random.Next(0, 10);
+			int y = _random.Next(0, 10);
+			_drawningObject.SetObject(x, y, _width, _height);
+			for (int i = (int)(_drawningObject.GetCurrentPosition().Top / _size_y); i <= (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y); ++i)
+			{
+				for (int j = (int)(_drawningObject.GetCurrentPosition().Left / _size_x); j <= (int)(_drawningObject.GetCurrentPosition().Right / _size_x); ++j)
+				{
+					if (_map[i, j] == _barrier) _map[i, j] = _freeRoad;
+				}
+			}
+			return true;
+		}
+		private Bitmap DrawMapWithObject()
+		{
+			Bitmap bmp = new(_width, _height);
+			if (_drawningObject == null || _map == null)
+			{
+				return bmp;
+			}
+			Graphics gr = Graphics.FromImage(bmp);
+			for (int i = 0; i < _map.GetLength(0); ++i)
+			{
+				for (int j = 0; j < _map.GetLength(1); ++j)
+				{
+					if (_map[i, j] == _freeRoad)
+					{
+						DrawRoadPart(gr, i, j);
+					}
+					else if (_map[i, j] == _barrier)
+					{
+						DrawBarrierPart(gr, i, j);
+					}
+				}
+			}
+			_drawningObject.DrawningObject(gr);
+			return bmp;
+		}
+		protected abstract void GenerateMap();
+		protected abstract void DrawRoadPart(Graphics g, int i, int j);
+		protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+
+		public bool Equals(AbstractMap? other)
+		{
+			if (other == null || _map != other._map || _width != other._width ||
+				_size_x != other._size_x || _size_y != other._size_y || _height != other._height ||
+				GetType() != other.GetType() || _map.GetLength(0) != other._map.GetLength(0) || _map.GetLength(1) != other._map.GetLength(1))
+			{
+				return false;
+			}
+			for (int i = 0; i < _map.GetLength(0); i++)
+			{
+				for (int j = 0; j < _map.GetLength(1); j++)
+				{
+					if (_map[i, j] != other._map[i, j])
+					{
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+	}
+}

WarmlyShip/WarmlyShip/Direction.cs

@@ -6,8 +6,9 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal enum Direction //Направление при перемещении
+	public enum Direction //Направление при перемещении
 	{
+		None = 0,
 		Left = 1, //Влево
 		Up = 2, //Вверх
 		Right = 3, //Вправо

WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs

@@ -6,21 +6,26 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal class DrawingWarmlyShip
+	public class DrawingWarmlyShip
 	{
-		public EntityWarmlyShip warmlyShip { private set; get; } //Класс-сущность
-		public float _startPosX; //Координаты отрисовки по оси x
-		public float _startPosY; //Координаты отрисовки по оси y
+		public EntityWarmlyShip warmlyShip { protected set; get; } //Класс-сущность
+		protected float _startPosX; //Координаты отрисовки по оси x
+		protected float _startPosY; //Координаты отрисовки по оси y
 		private int? _pictureWidth = null; //Ширина окна
 		private int? _pictureHeight = null; //Высота окна
-		private readonly int _warmlyShipWidth = 125; //Ширина отрисовки корабля 
-		private readonly int _warmlyShipHeight = 50; //Высота отрисовки корабля
+		protected readonly int _warmlyShipWidth = 125; //Ширина отрисовки корабля 
+		protected readonly int _warmlyShipHeight = 50; //Высота отрисовки корабля
 
 		//Инициализация
-		public void Init(int speed, float weight, Color bodyColor)
+		public DrawingWarmlyShip(int speed, float weight, Color bodyColor)
 		{
-			warmlyShip = new EntityWarmlyShip();
-			warmlyShip.Init(speed, weight, bodyColor);
+			warmlyShip = new EntityWarmlyShip(speed, weight, bodyColor);
+		}
+
+		protected DrawingWarmlyShip(int speed, float weight, Color bodyColor, int warmlyWidth, int warmlyHeight) : this(speed, weight, bodyColor)
+		{
+			_warmlyShipWidth = warmlyWidth;
+			_warmlyShipHeight = warmlyHeight;
 		}
 
 		//Начальные коордитанты 
@@ -56,7 +61,7 @@ namespace WarmlyShip
 		}
 
 		//Отрисовка транспорта
-		public void DrawTransport(Graphics g)
+		public virtual void DrawTransport(Graphics g)
 		{
 			if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
 			{
@@ -109,5 +114,15 @@ namespace WarmlyShip
 			}
 
 		}
+
+		public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+		{
+			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);
+		}
 	}
 }

WarmlyShip/WarmlyShip/DrawningMotorShip.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class DrawningMotorShip : DrawingWarmlyShip
+	{
+		public DrawningMotorShip(int speed, float weight, Color bodyColor, Color dopColor, bool tubes, bool cistern) : base(speed, weight, bodyColor, 150, 75)
+		{
+			warmlyShip = new EntityMotorShip(speed, weight, bodyColor, dopColor, tubes , cistern);
+		}
+
+		public override void DrawTransport(Graphics g)
+		{
+			if (warmlyShip is not EntityMotorShip motorShip)
+			{
+				return;
+			}
+
+			Pen pen = new(Color.Black, 2);
+			Brush dopBrush = new SolidBrush(motorShip.DopColor);
+			if (motorShip.Tubes)
+			{
+				g.FillRectangle(dopBrush, _startPosX + _warmlyShipWidth / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+				g.DrawRectangle(pen, _startPosX + _warmlyShipWidth / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+				g.FillRectangle(dopBrush, _startPosX + _warmlyShipWidth * 3 / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+				g.DrawRectangle(pen, _startPosX + _warmlyShipWidth * 3 / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+			}
+
+			_startPosY += 25;
+			base.DrawTransport(g);
+			_startPosY -= 25;
+
+			if (motorShip.Cistern)
+			{
+				g.FillEllipse(dopBrush, _startPosX, _startPosY + 25, 25, 20);
+				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);
+		}
+	}
+}

WarmlyShip/WarmlyShip/DrawningObjectShip.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class DrawningObjectShip : IDrawningObject
+	{
+		private DrawingWarmlyShip _warmlyShip = null;
+
+		public DrawningObjectShip(DrawingWarmlyShip warmlyShip)
+		{
+			_warmlyShip = warmlyShip;
+		}
+
+		public float Step => _warmlyShip?.warmlyShip?.Step ?? 0;
+
+		public DrawingWarmlyShip GetWarmlyShip => _warmlyShip;
+
+		public void DrawningObject(Graphics g)
+		{
+			_warmlyShip?.DrawTransport(g);
+		}
+
+		public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+		{
+			return _warmlyShip?.GetCurrentPosition() ?? default;
+		}
+
+		public void MoveObject(Direction direction)
+		{
+			_warmlyShip?.MoveTransport(direction);
+		}
+
+		public void SetObject(int x, int y, int width, int height)
+		{
+			_warmlyShip?.SetPosition(x, y, width, height);	
+		}
+
+		public string GetInfo() => _warmlyShip?.GetDataForSave();
+
+		public static IDrawningObject Create(string data) => new DrawningObjectShip(data.CreateDrawningShip());
+
+		public bool Equals(IDrawningObject? other)
+		{
+			if (other == null)
+			{
+				return false;
+			}
+			var otherShip = other as DrawningObjectShip;
+			if (otherShip == null)
+			{
+				return false;
+			}
+			var ship = _warmlyShip.warmlyShip;
+			var otherShipShip = otherShip._warmlyShip.warmlyShip;
+			if (ship.Speed != otherShipShip.Speed)
+			{
+				return false;
+			}
+			if (ship.Weight != otherShipShip.Weight)
+			{
+				return false;
+			}
+			if (ship.BodyColor != otherShipShip.BodyColor)
+			{
+				return false;
+			}
+
+			if ((ship is EntityMotorShip) && !(otherShipShip is EntityMotorShip)
+				|| !(ship is EntityMotorShip) && (otherShipShip is EntityMotorShip))
+			{
+				return false;
+			}
+
+			if (ship is EntityMotorShip motorShip && otherShipShip is EntityMotorShip otherMotorShip)
+			{
+				if (motorShip.DopColor != otherMotorShip.DopColor)
+				{
+					return false;
+				}
+				if (motorShip.Tubes != otherMotorShip.Tubes)
+				{
+					return false;
+				}
+				if (motorShip.Cistern != otherMotorShip.Cistern)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+}

WarmlyShip/WarmlyShip/EntityMotorShip.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class EntityMotorShip : EntityWarmlyShip
+	{
+		public Color DopColor { get; private set; }
+		public bool Tubes { get; private set; }
+		public bool Cistern { get; private set; }
+
+		public EntityMotorShip(int speed, float weight, Color bodyColor, Color dopColor, bool tubes, bool cistern) : base(speed, weight, bodyColor)
+		{
+			DopColor = dopColor;
+			Tubes = tubes;
+			Cistern = cistern;
+		}
+
+	}
+}
+ 

WarmlyShip/WarmlyShip/EntityWarmlyShip.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal class EntityWarmlyShip
+	public class EntityWarmlyShip
 	{
 		public int Speed { get; private set; } //Скорость
 		public float Weight { get; private set; } //Вес
@@ -14,11 +14,11 @@ namespace WarmlyShip
 		public float Step => Speed * 100 / Weight; //Шаг при перемещении
 
 		//Инициализация
-		public void Init(int speed, float weight, Color bodyColor)
+		public EntityWarmlyShip(int speed, float weight, Color bodyColor)
 		{
 			Random random = new Random();
-			Speed = speed <= 0 ? random.Next(50, 150) : speed;
-			Weight = weight <= 0 ? random.Next(40, 70) : weight;
+			Speed = speed <= 0 ? 100 : speed;
+			Weight = weight <= 0 ? 1000 : weight;
 			BodyColor = bodyColor;
 		}
 	}

WarmlyShip/WarmlyShip/ExtentionShip.cs

@@ -0,0 +1,39 @@
+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}";
+		}
+	}
+}

WarmlyShip/WarmlyShip/FormClass.Designer.cs

@@ -38,6 +38,8 @@
 			this.buttonLeft = new System.Windows.Forms.Button();
 			this.buttonDown = new System.Windows.Forms.Button();
 			this.ButtonCreate = new System.Windows.Forms.Button();
+			this.buttonCreateModif = new System.Windows.Forms.Button();
+			this.buttonSelectShip = new System.Windows.Forms.Button();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
 			this.statusStrip.SuspendLayout();
 			this.SuspendLayout();
@@ -142,11 +144,34 @@
 			this.ButtonCreate.UseVisualStyleBackColor = true;
 			this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
 			// 
+			// buttonCreateModif
+			// 
+			this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonCreateModif.Location = new System.Drawing.Point(93, 402);
+			this.buttonCreateModif.Name = "buttonCreateModif";
+			this.buttonCreateModif.Size = new System.Drawing.Size(101, 23);
+			this.buttonCreateModif.TabIndex = 8;
+			this.buttonCreateModif.Text = "Модификация";
+			this.buttonCreateModif.UseVisualStyleBackColor = true;
+			this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+			// 
+			// buttonSelectShip
+			// 
+			this.buttonSelectShip.Location = new System.Drawing.Point(522, 402);
+			this.buttonSelectShip.Name = "buttonSelectShip";
+			this.buttonSelectShip.Size = new System.Drawing.Size(75, 23);
+			this.buttonSelectShip.TabIndex = 9;
+			this.buttonSelectShip.Text = "Выбрать";
+			this.buttonSelectShip.UseVisualStyleBackColor = true;
+			this.buttonSelectShip.Click += new System.EventHandler(this.ButtonSelectShip_Click);
+			// 
 			// FormClass
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(800, 450);
+			this.Controls.Add(this.buttonSelectShip);
+			this.Controls.Add(this.buttonCreateModif);
 			this.Controls.Add(this.ButtonCreate);
 			this.Controls.Add(this.buttonDown);
 			this.Controls.Add(this.buttonLeft);
@@ -176,5 +201,7 @@
 		private Button buttonLeft;
 		private Button buttonDown;
 		private Button ButtonCreate;
+		private Button buttonCreateModif;
+		private Button buttonSelectShip;
 	}
 }

WarmlyShip/WarmlyShip/FormClass.cs

@@ -4,6 +4,8 @@ namespace WarmlyShip
     {
         private DrawingWarmlyShip _warmlyShip;
 
+        public DrawingWarmlyShip SelectedShip { get; private set; }
+
         public FormClass()
         {
             InitializeComponent();
@@ -17,19 +19,31 @@ namespace WarmlyShip
             pictureBox.Image = bmp;
         }
 
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
+		private void SetData()
+		{
 			Random random = new Random();
-			_warmlyShip = new DrawingWarmlyShip();
-			_warmlyShip.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-			_warmlyShip.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBox.Width, pictureBox.Height);
-			toolStripStatusSpeed.Text = $"Ñêîðîñòü: {_warmlyShip.warmlyShip?.Speed}";
+			_warmlyShip.SetPosition(random.Next(0, 100), random.Next(0, 100), pictureBox.Width, pictureBox.Height);
+			toolStripStatusSpeed.Text = $"Ńęîđîńňü: { _warmlyShip.warmlyShip?.Speed}";
 			toolStripStatusWeight.Text = $"Âåñ: {_warmlyShip.warmlyShip?.Weight}";
 			toolStripStatusLabelBodyColor.Text = $"Öâåò: {_warmlyShip.warmlyShip?.BodyColor}";
-			Draw();
 		}
 
-        private void ButtonMove_Click(object sender, EventArgs e)
+		private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+			Random rnd = new();
+			Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+			ColorDialog dialog = new();
+			if (dialog.ShowDialog() == DialogResult.OK)
+			{
+				color = dialog.Color;
+			}
+			_warmlyShip = new DrawingWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+			SetData();
+			Draw();
+
+		}
+
+		private void ButtonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;
             switch (name)
@@ -55,5 +69,31 @@ namespace WarmlyShip
 			_warmlyShip?.ChangeBorders(pictureBox.Width, pictureBox.Height);
 			Draw();
 		}
+
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+			Random rnd = new();
+			Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+			ColorDialog dialog = new();
+			if (dialog.ShowDialog() == DialogResult.OK)
+			{
+				color = dialog.Color;
+			}
+			Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+			ColorDialog dialogDop = new();
+			if (dialogDop.ShowDialog() == DialogResult.OK)
+			{
+				dopColor = dialogDop.Color;
+			}
+			_warmlyShip = new DrawningMotorShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+			SetData();
+			Draw();
+		}
+
+        private void ButtonSelectShip_Click(object sender, EventArgs e)
+        {
+			SelectedShip = _warmlyShip;
+			DialogResult = DialogResult.OK;
+		}
     }
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs

@@ -0,0 +1,363 @@
+namespace WarmlyShip
+{
+	partial class FormMapWithSetShip
+	{
+		/// <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.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();
+			this.buttonUp = new System.Windows.Forms.Button();
+			this.buttonRight = new System.Windows.Forms.Button();
+			this.buttonShowOnMap = new System.Windows.Forms.Button();
+			this.buttonShowStorage = new System.Windows.Forms.Button();
+			this.buttonRemoveShip = new System.Windows.Forms.Button();
+			this.buttonAddShip = new System.Windows.Forms.Button();
+			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.buttonSortByType = new System.Windows.Forms.Button();
+			this.buttonSortByColor = new System.Windows.Forms.Button();
+			this.groupBox1.SuspendLayout();
+			this.groupBoxMaps.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+			this.menuStrip.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.buttonSortByColor);
+			this.groupBox1.Controls.Add(this.buttonSortByType);
+			this.groupBox1.Controls.Add(this.groupBoxMaps);
+			this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+			this.groupBox1.Controls.Add(this.buttonDown);
+			this.groupBox1.Controls.Add(this.buttonLeft);
+			this.groupBox1.Controls.Add(this.buttonUp);
+			this.groupBox1.Controls.Add(this.buttonRight);
+			this.groupBox1.Controls.Add(this.buttonShowOnMap);
+			this.groupBox1.Controls.Add(this.buttonShowStorage);
+			this.groupBox1.Controls.Add(this.buttonRemoveShip);
+			this.groupBox1.Controls.Add(this.buttonAddShip);
+			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+			this.groupBox1.Location = new System.Drawing.Point(815, 24);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(200, 624);
+			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, 375);
+			this.maskedTextBoxPosition.Mask = "00";
+			this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+			this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
+			this.maskedTextBoxPosition.TabIndex = 11;
+			// 
+			// buttonDown
+			// 
+			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.Name = "buttonDown";
+			this.buttonDown.Size = new System.Drawing.Size(50, 50);
+			this.buttonDown.TabIndex = 10;
+			this.buttonDown.UseVisualStyleBackColor = true;
+			this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// 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.toleft;
+			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+			this.buttonLeft.Location = new System.Drawing.Point(19, 565);
+			this.buttonLeft.Name = "buttonLeft";
+			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
+			this.buttonLeft.TabIndex = 9;
+			this.buttonLeft.UseVisualStyleBackColor = true;
+			this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonUp
+			// 
+			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.Name = "buttonUp";
+			this.buttonUp.Size = new System.Drawing.Size(50, 50);
+			this.buttonUp.TabIndex = 8;
+			this.buttonUp.UseVisualStyleBackColor = true;
+			this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonRight
+			// 
+			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.Name = "buttonRight";
+			this.buttonRight.Size = new System.Drawing.Size(50, 50);
+			this.buttonRight.TabIndex = 7;
+			this.buttonRight.UseVisualStyleBackColor = true;
+			this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonShowOnMap
+			// 
+			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 462);
+			this.buttonShowOnMap.Name = "buttonShowOnMap";
+			this.buttonShowOnMap.Size = new System.Drawing.Size(188, 23);
+			this.buttonShowOnMap.TabIndex = 5;
+			this.buttonShowOnMap.Text = "Посмотреть карту";
+			this.buttonShowOnMap.UseVisualStyleBackColor = true;
+			this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+			// 
+			// buttonShowStorage
+			// 
+			this.buttonShowStorage.Location = new System.Drawing.Point(6, 433);
+			this.buttonShowStorage.Name = "buttonShowStorage";
+			this.buttonShowStorage.Size = new System.Drawing.Size(188, 23);
+			this.buttonShowStorage.TabIndex = 4;
+			this.buttonShowStorage.Text = "Посмотреть хранилище";
+			this.buttonShowStorage.UseVisualStyleBackColor = true;
+			this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+			// 
+			// buttonRemoveShip
+			// 
+			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 404);
+			this.buttonRemoveShip.Name = "buttonRemoveShip";
+			this.buttonRemoveShip.Size = new System.Drawing.Size(188, 23);
+			this.buttonRemoveShip.TabIndex = 3;
+			this.buttonRemoveShip.Text = "Удалить корабль";
+			this.buttonRemoveShip.UseVisualStyleBackColor = true;
+			this.buttonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
+			// 
+			// buttonAddShip
+			// 
+			this.buttonAddShip.Location = new System.Drawing.Point(6, 346);
+			this.buttonAddShip.Name = "buttonAddShip";
+			this.buttonAddShip.Size = new System.Drawing.Size(188, 23);
+			this.buttonAddShip.TabIndex = 1;
+			this.buttonAddShip.Text = "Добавить корабль";
+			this.buttonAddShip.UseVisualStyleBackColor = true;
+			this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
+			// 
+			// pictureBox
+			// 
+			this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.pictureBox.Location = new System.Drawing.Point(0, 24);
+			this.pictureBox.Name = "pictureBox";
+			this.pictureBox.Size = new System.Drawing.Size(815, 624);
+			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(141, 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(141, 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";
+			// 
+			// buttonSortByType
+			// 
+			this.buttonSortByType.Location = new System.Drawing.Point(6, 272);
+			this.buttonSortByType.Name = "buttonSortByType";
+			this.buttonSortByType.Size = new System.Drawing.Size(188, 23);
+			this.buttonSortByType.TabIndex = 13;
+			this.buttonSortByType.Text = "Сортировка по типу";
+			this.buttonSortByType.UseVisualStyleBackColor = true;
+			this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+			// 
+			// buttonSortByColor
+			// 
+			this.buttonSortByColor.Location = new System.Drawing.Point(6, 301);
+			this.buttonSortByColor.Name = "buttonSortByColor";
+			this.buttonSortByColor.Size = new System.Drawing.Size(188, 23);
+			this.buttonSortByColor.TabIndex = 14;
+			this.buttonSortByColor.Text = "Сортировка по цвету";
+			this.buttonSortByColor.UseVisualStyleBackColor = true;
+			this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+			// 
+			// 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.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();
+
+		}
+
+		#endregion
+
+		private GroupBox groupBox1;
+		private PictureBox pictureBox;
+		private Button buttonAddShip;
+		private ComboBox comboBoxSelectorMap;
+		private Button buttonShowOnMap;
+		private Button buttonShowStorage;
+		private Button buttonRemoveShip;
+		private Button buttonDown;
+		private Button buttonLeft;
+		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;
+		private Button buttonSortByColor;
+		private Button buttonSortByType;
+	}
+}

WarmlyShip/WarmlyShip/FormMapWithSetShip.cs

@@ -0,0 +1,275 @@
+using Microsoft.Extensions.Logging;
+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;
+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 readonly ILogger _logger;
+
+		public FormMapWithSetShip(ILogger<FormMapWithSetShip> logger)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+			comboBoxSelectorMap.Items.Clear();
+			foreach (var elem in _mapsDict)
+			{
+				comboBoxSelectorMap.Items.Add(elem.Key);
+			}
+		}
+
+		private void ReloadMaps()
+		{
+			int index = listBoxMaps.SelectedIndex;
+			listBoxMaps.Items.Clear();
+			for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+			{
+				listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+			}
+			if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+			{
+				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();
+			_logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
+		}
+
+		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();
+				_logger.LogInformation("Удалена карта {0}", listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+			}
+		}
+
+		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;
+			}
+			try
+			{
+				if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) > -1)
+				{
+					MessageBox.Show("Объект добавлен");
+					pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+					_logger.LogInformation($"Добавлен объект: {ship} на карте: {listBoxMaps.SelectedItem}");
+				}
+				else MessageBox.Show("Объект не добавлен");
+			}
+			catch (StorageOverflowException ex)
+			{
+				_logger.LogWarning($"Ошибка переполнения при добавлении объекта: {ex.Message}");
+				MessageBox.Show($"Ошибка переполнения: {ex.Message}");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogWarning($"Неизвестная ошибка при добавлении объекта: {ex.Message}");
+				MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+			}
+		}
+
+		private void ButtonRemoveShip_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+			{
+				return;
+			}
+			if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+			{
+				return;
+			}
+			int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+			try
+			{
+				if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+				{
+					MessageBox.Show("Объект удален");
+					pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+					_logger.LogInformation($"Удален объект с позиции: [{pos}] на карте: {listBoxMaps.SelectedItem}");
+				}
+			}
+			catch (ShipNotFoundException ex)
+			{
+				_logger.LogWarning($"Ошибка при удалении объекта на позиции: {ex.Message}");
+				MessageBox.Show($"Ошибка удаления: {ex.Message} ");
+			}
+			catch (StorageOverflowException ex)
+			{
+				_logger.LogWarning($"Ошибка при удалении объекта на позиции: {ex.Message}");
+				MessageBox.Show($"Превышение размерности: {ex.Message}");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogWarning($"Неизвестная ошибка при удалении объекта на позиции: {ex.Message}");
+				MessageBox.Show($"Неизвестная ошибка: {ex.Message} ");
+			}
+		}
+
+		private void ButtonShowStorage_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+			_logger.LogInformation($"Переход в хранилище: {listBoxMaps.SelectedItem}");
+		}
+
+		private void ButtonShowOnMap_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+			_logger.LogInformation($"Переход на карту: {listBoxMaps.SelectedItem}");
+		}
+
+		private void ButtonMove_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			//получаем имя кнопки
+			string name = ((Button)sender)?.Name ?? string.Empty;
+			Direction dir = Direction.None;
+			switch (name)
+			{
+				case "buttonUp":
+					dir = Direction.Up;
+					break;
+				case "buttonDown":
+					dir = Direction.Down;
+					break;
+				case "buttonLeft":
+					dir = Direction.Left;
+					break;
+				case "buttonRight":
+					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)
+			{
+				try
+				{
+					_mapsCollection.SaveData(saveFileDialog.FileName);
+					_logger.LogInformation($"Карта успешно сохранена в файл: {saveFileDialog.FileName}");
+					MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				}
+				catch (Exception ex)
+				{
+					_logger.LogWarning($"Не сохранилось в файл: {saveFileDialog.FileName}");
+					MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
+
+		private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (openFileDialog.ShowDialog() == DialogResult.OK)
+			{
+				try
+				{
+					_mapsCollection.LoadData(openFileDialog.FileName);
+					_logger.LogInformation($"Карта успешно загружена из файла: {openFileDialog.FileName}");
+					MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					ReloadMaps();
+				}
+				catch (Exception ex)
+				{
+					_logger.LogWarning($"Не загрузилось из файла: {openFileDialog.FileName}");
+					MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
+
+		private void ButtonSortByType_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ShipCompareByType());
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+		}
+
+		private void ButtonSortByColor_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ShipCompareByColor());
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+		}
+	}
+}

WarmlyShip/WarmlyShip/FormMapWithSetShip.resx

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

WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs

@@ -0,0 +1,352 @@
+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;
+	}
+}

WarmlyShip/WarmlyShip/FormShipConfig.cs

@@ -0,0 +1,136 @@
+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();
+		}
+
+	}
+}

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/IDrawningObject.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal interface IDrawningObject : IEquatable<IDrawningObject>
+	{
+		public float Step { get; }
+		void SetObject(int x, int y, int width, int height);
+		void MoveObject(Direction direction);
+		void DrawningObject(Graphics g);
+		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+
+		string GetInfo();
+	}
+}

WarmlyShip/WarmlyShip/LastMap.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class LastMap : AbstractMap
+	{
+		private readonly Brush barrierColor = new SolidBrush(Color.Red);
+
+		private readonly Brush roadColor = new SolidBrush(Color.Green);
+
+		protected override void DrawBarrierPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void DrawRoadPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void GenerateMap()
+		{
+			_map = new int[100, 100];
+			_size_x = (float)_width / _map.GetLength(0);
+			_size_y = (float)_height / _map.GetLength(1);
+			int counter = 0;
+			for (int i = 0; i < _map.GetLength(0); ++i)
+			{
+				for (int j = 0; j < _map.GetLength(1); ++j)
+				{
+					_map[i, j] = _freeRoad;
+				}
+			}
+			while (counter < 45)
+			{
+				int x = _random.Next(0, 100);
+				int y = _random.Next(0, 100);
+				if (_map[x, y] == _freeRoad)
+				{
+					_map[x, y] = _barrier;
+					if (x > 0 && y > 0 && x < _map.GetLength(0) - 1 && y < _map.GetLength(1) - 1)
+					{
+						_map[x - 1, y] = _barrier;
+						_map[x + 1, y] = _barrier;
+						_map[x, y - 1] = _barrier;
+						_map[x, y + 1] = _barrier;
+					}
+					counter++;
+				}
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class MapWithSetShipGeneric<T, U>
+		where T : class, IDrawningObject, IEquatable<T>
+		where U : AbstractMap
+	{
+		private readonly int _pictureWidth;
+		private readonly int _pictureHeight;
+		private readonly int _placeSizeWidth = 210;
+		private readonly int _placeSizeHeight = 100;
+		private readonly SetShipGeneric<T> _setShips;
+		private readonly U _map;
+
+		public MapWithSetShipGeneric(int picWidth, int picHeight, U map)
+		{
+			int width = picWidth / _placeSizeWidth;
+			int height = picHeight / _placeSizeHeight;
+			_setShips = new SetShipGeneric<T>(width * height);
+			_pictureWidth = picWidth;
+			_pictureHeight = picHeight;
+			_map = map;
+		}
+
+		public static int operator +(MapWithSetShipGeneric<T, U> map, T ship)
+		{
+			return map._setShips.Insert(ship);
+		}
+
+		public static T operator -(MapWithSetShipGeneric<T, U> map, int position)
+		{
+			return map._setShips.Remove(position);
+		}
+
+		public Bitmap ShowSet()
+		{
+			Bitmap bmp = new(_pictureWidth, _pictureHeight);
+			Graphics gr = Graphics.FromImage(bmp);
+			DrawShips(gr);
+			DrawBackground(gr);
+			return bmp;
+		}
+
+		public Bitmap ShowOnMap()
+		{
+			Shaking();
+			foreach (var ship in _setShips.GetShips())
+			{
+				return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+			}
+			return new(_pictureWidth, _pictureHeight);
+		}
+
+		public Bitmap MoveObject(Direction direction)
+		{
+			if (_map != null)
+			{
+				return _map.MoveObject(direction);
+			}
+			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);
+			}
+		}
+
+		public void Sort(IComparer<T> comparer)
+		{
+			_setShips.SortSet(comparer);
+		}
+
+		private void Shaking()
+		{
+			int j = _setShips.Count - 1;
+			for (int i = 0; i < _setShips.Count; ++i)
+			{
+				if (_setShips[i] == null)
+				{
+					for (; j > i; --j)
+					{
+						var car = _setShips[j];
+						if (car != null)
+						{
+							_setShips.Insert(car, i);
+							_setShips.Remove(j);
+							break;
+						}
+					}
+					if (j <= i)
+					{
+						return;
+					}
+				}
+			}
+		}
+
+		private void DrawBackground(Graphics g)
+		{
+			Pen pen = new(Color.Brown, 8);
+			for (int i = 0; i < _pictureWidth / _placeSizeWidth; ++i)
+			{
+				for (int j = 1; j < _pictureHeight / _placeSizeHeight + 1; ++j) //линия рамзетки места
+				{
+					g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+					for (int k = 0; k < _placeSizeWidth / (30 * 2); ++k) 
+						g.DrawLine(pen, i * _placeSizeWidth + (k + 1) * 30, j * _placeSizeHeight, i * _placeSizeWidth + (k + 1) * 30, j * _placeSizeHeight + 30);
+				}
+				g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+			}
+		}
+
+		private void DrawShips(Graphics g)
+		{
+			int i = 0;
+			foreach (var ship in _setShips.GetShips())
+			{
+				if (ship != 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);
+				}
+				++i;
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -0,0 +1,117 @@
+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 void 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}");
+				}
+			}
+		}
+
+		public void LoadData(string filename)
+		{
+			if (!File.Exists(filename))
+			{
+				throw new FileNotFoundException("Файл не найден");
+			}
+			using (StreamReader sr = new(filename))
+			{
+				string bufferStr;
+				bool firstIn = true;
+				while ((bufferStr = sr.ReadLine()) != null)
+				{
+					if (firstIn)
+					{
+						if (!bufferStr.Contains("MapsCollection"))
+						{
+							throw new FormatException("Формат данных в файле не правильный");
+						}
+						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));
+					}
+				}
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace WarmlyShip
 {
     internal static class Program
@@ -11,7 +16,31 @@ namespace WarmlyShip
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormClass());
-        }
-    }
+			var services = new ServiceCollection();
+			ConfigureServices(services);
+			using (ServiceProvider serviceProvider =
+			services.BuildServiceProvider())
+			{
+				Application.Run(serviceProvider.GetRequiredService<FormMapWithSetShip>());
+			}
+		}
+
+		private static void ConfigureServices(ServiceCollection services)
+		{
+			services.AddSingleton<FormMapWithSetShip>().AddLogging(option =>
+			{
+				var configuration = new ConfigurationBuilder()
+					.SetBasePath(Directory.GetCurrentDirectory())
+					.AddJsonFile(path: "serilogConfig.json", optional: false, reloadOnChange: true)
+					.Build();
+
+				var logger = new LoggerConfiguration()
+					.ReadFrom.Configuration(configuration)
+					.CreateLogger();
+
+				option.SetMinimumLevel(LogLevel.Information);
+				option.AddSerilog(logger);
+			});
+		}
+	}
 }

WarmlyShip/WarmlyShip/SecondMap.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SecondMap : AbstractMap
+	{
+		private readonly Brush barrierColor = new SolidBrush(Color.Gold);
+
+		private readonly Brush roadColor = new SolidBrush(Color.Black);
+
+		protected override void DrawBarrierPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void DrawRoadPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void GenerateMap()
+		{
+			_map = new int[100, 100];
+			_size_x = (float)_width / _map.GetLength(0);
+			_size_y = (float)_height / _map.GetLength(1);
+			int counter = 0;
+			for (int i = 0; i < _map.GetLength(0); ++i)
+			{
+				for (int j = 0; j < _map.GetLength(1); ++j)
+				{
+					_map[i, j] = _freeRoad;
+				}
+			}
+			for (int i = 0; i < _map.GetLength(0); ++i) 
+			{
+				_map[i, _map.GetLength(1) / 2] = _barrier;
+				_map[i, _map.GetLength(1) - 1] = _barrier;
+			}
+			for (int j = 0; j < _map.GetLength(1); ++j)
+			{
+				_map[_map.GetLength(0) - 1, j] = _barrier;
+			}
+			while (counter < 45)
+			{
+				int x = _random.Next(0, 100);
+				int y = _random.Next(0, 100);
+				if (_map[x, y] == _freeRoad)
+				{
+					_map[x, y] = _barrier;
+					counter++;
+				}
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/SetShipGeneric.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SetShipGeneric<T>
+		where T : class, IEquatable<T>
+	{
+		private readonly List<T> _places;
+		public int Count => _places.Count;
+
+		private readonly int _maxCount;
+
+		public SetShipGeneric(int count)
+		{
+			_maxCount = count;
+			_places = new List<T>();
+		}
+
+		public int Insert(T ship)
+		{
+			return Insert(ship, 0);
+		}
+
+		public int Insert(T ship, int position)
+		{
+			if (_places.Contains(ship))
+			{
+				return -1;
+			}
+			if (position < 0 || position > Count || Count == _maxCount) throw new StorageOverflowException(_maxCount);
+			_places.Insert(position, ship);
+			return position;
+		}
+
+		public T Remove(int position)
+		{
+			if (position >= _maxCount || position >= _places.Count) throw new ShipNotFoundException(position);
+			T DelElement = _places[position];
+			_places.Remove(DelElement);
+			return DelElement;
+		}
+
+		public T this[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;
+				}
+			}
+		}
+
+		public void SortSet(IComparer<T> comparer)
+		{
+			if (comparer == null)
+			{
+				return;
+			}
+			_places.Sort(comparer);
+		}
+	}
+}

WarmlyShip/WarmlyShip/ShipCompareByColor.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class ShipCompareByColor : IComparer<IDrawningObject>
+	{
+		public int Compare(IDrawningObject? x, IDrawningObject? y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null && y != null)
+			{
+				return 1;
+			}
+			if (x != null && y == null)
+			{
+				return -1;
+			}
+			var xShip = x as DrawningObjectShip;
+			var yShip = y as DrawningObjectShip;
+			if (xShip == null && yShip == null)
+			{
+				return 0;
+			}
+			if (xShip == null && yShip != null)
+			{
+				return 1;
+			}
+			if (xShip != null && yShip == null)
+			{
+				return -1;
+			}
+			string xAirplaneColor = xShip.GetWarmlyShip.warmlyShip.BodyColor.Name;
+			string yAirplaneColor = yShip.GetWarmlyShip.warmlyShip.BodyColor.Name;
+			if (xAirplaneColor != yAirplaneColor)
+			{
+				return xAirplaneColor.CompareTo(yAirplaneColor);
+			}
+			if (xShip.GetWarmlyShip.warmlyShip is EntityMotorShip xAirbus && yShip.GetWarmlyShip.warmlyShip is EntityMotorShip yAirbus)
+			{
+				string xAirplaneDopColor = xAirbus.DopColor.Name;
+				string yAirplaneDopColor = yAirbus.DopColor.Name;
+				var dopColorCompare = xAirplaneDopColor.CompareTo(yAirplaneDopColor);
+				if (dopColorCompare != 0)
+				{
+					return dopColorCompare;
+				}
+			}
+			var speedCompare = xShip.GetWarmlyShip.warmlyShip.Speed.CompareTo(yShip.GetWarmlyShip.warmlyShip.Speed);
+			if (speedCompare != 0)
+			{
+				return speedCompare;
+			}
+			return xShip.GetWarmlyShip.warmlyShip.Weight.CompareTo(yShip.GetWarmlyShip.warmlyShip.Weight);
+		}
+	}
+}

WarmlyShip/WarmlyShip/ShipCompareByType.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class ShipCompareByType : IComparer<IDrawningObject>
+	{
+		public int Compare(IDrawningObject? x, IDrawningObject? y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null && y != null)
+			{
+				return 1;
+			}
+			if (x != null && y == null)
+			{
+				return -1;
+			}
+			var xShip = x as DrawningObjectShip;
+			var yShip = y as DrawningObjectShip;
+			if (xShip == null && yShip == null)
+			{
+				return 0;
+			}
+			if (xShip == null && yShip != null)
+			{
+				return 1;
+			}
+			if (xShip != null && yShip == null)
+			{
+				return -1;
+			}
+			if (xShip.GetWarmlyShip.GetType().Name != yShip.GetWarmlyShip.GetType().Name)
+			{
+				if (xShip.GetWarmlyShip.GetType().Name == "DrawingWarmlyShip")
+				{
+					return -1;
+				}
+				return 1;
+			}
+			var speedCompare = xShip.GetWarmlyShip.warmlyShip.Speed.CompareTo(yShip.GetWarmlyShip.warmlyShip.Speed);
+			if (speedCompare != 0)
+			{
+				return speedCompare;
+			}
+			return xShip.GetWarmlyShip.warmlyShip.Weight.CompareTo(yShip.GetWarmlyShip.warmlyShip.Weight);
+		}
+	}
+}

WarmlyShip/WarmlyShip/ShipNotFoundException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	[Serializable]
+	internal class ShipNotFoundException : Exception
+	{
+		public ShipNotFoundException(int i) : base($"Не найден объект по позиции { i}") { }
+		public ShipNotFoundException() : base() { }
+		public ShipNotFoundException(string message) : base(message) { }
+		public ShipNotFoundException(string message, Exception exception) : base(message, exception) { }
+		protected ShipNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+	}
+}

WarmlyShip/WarmlyShip/SimpleMap.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SimpleMap : AbstractMap
+	{
+		private readonly Brush barrierColor = new SolidBrush(Color.Black);
+
+		private readonly Brush roadColor = new SolidBrush(Color.Gray);
+
+		protected override void DrawBarrierPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void DrawRoadPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void GenerateMap()
+		{
+			_map = new int[100, 100];
+			_size_x = (float)_width / _map.GetLength(0);
+			_size_y = (float)_height / _map.GetLength(1);
+			int counter = 0;
+			for (int i = 0; i < _map.GetLength(0); ++i)
+			{
+				for (int j = 0; j < _map.GetLength(1); ++j)
+				{
+					_map[i, j] = _freeRoad;
+				}
+			}
+			while (counter < 50)
+			{
+				int x = _random.Next(0, 100);
+				int y = _random.Next(0, 100);
+				if (_map[x, y] == _freeRoad)
+				{
+					_map[x, y] = _barrier;
+					counter++;
+				}
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/StorageOverflowException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	[Serializable]
+	internal class StorageOverflowException : Exception
+	{
+		public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: { count}") { }
+		public StorageOverflowException() : base() { }
+		public StorageOverflowException(string message) : base(message) { }
+		public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
+		protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+	}
+}

WarmlyShip/WarmlyShip/WarmlyShip.csproj

@@ -8,6 +8,30 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="serilogConfig.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="serilogConfig.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Settings.Delegates" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

WarmlyShip/WarmlyShip/serilogConfig.json

@@ -0,0 +1,16 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log_.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ]
+  }
+}