Устранение замечаний преподавателя

Locomotives/Locomotives/AbstractMap.cs

@@ -0,0 +1,243 @@
+namespace Locomotives
+{
+    internal abstract class AbstractMap
+    {
+        /// <summary>
+        /// Поле от интерфейса прорисовки
+        /// </summary>
+        private IDrawningObject _drawningObject = null;
+        /// <summary>
+        /// Массив карты
+        /// </summary>
+        protected int[,] _map = null;
+        /// <summary>
+        /// Ширина карты (графической панели)
+        /// </summary>
+        protected int _width;
+        /// <summary>
+        /// Высота карты (графической панели)
+        /// </summary>
+        protected int _height;
+        /// <summary>
+        /// Ширина ячейки
+        /// </summary>
+        protected float _size_x;
+        /// <summary>
+        /// Высота ячейки
+        /// </summary>
+        protected float _size_y;
+        protected readonly Random _random = new();
+        /// <summary>
+        /// Доступная для движения ячейка
+        /// </summary>
+        protected readonly int _freeRoad = 0;
+        /// <summary>
+        /// Недоступная для движения ячейка
+        /// </summary>
+        protected readonly int _barrier = 1;
+        /// <summary>
+        /// Наполнение графической панели
+        /// </summary>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
+        /// <param name="drawningObject"></param>
+        /// <returns></returns>
+        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+        {
+            _width = width;
+            _height = height;
+            _drawningObject = drawningObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        /// <summary>
+        /// Получение координат отрисовываемого объекта в массиве
+        /// </summary>
+        /// <returns></returns>
+        public (int Top, int Bottom, int Left, int Right) GetObjectCoordinates()
+        {
+            return 
+                (
+                (int)(_drawningObject.GetCurrentPosition().Top / _size_y),
+                (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y),
+                (int)(_drawningObject.GetCurrentPosition().Left / _size_x),
+                (int)(_drawningObject.GetCurrentPosition().Right / _size_x)
+                );
+        }
+        /// <summary>
+        /// Проверка возможности движения в данном направлении
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// <returns></returns>
+        private bool AbleToMove(Direction direction)
+        {
+            switch (direction)
+            {
+                case Direction.Up:
+                    if (GetObjectCoordinates().Top - 1 < 0)
+                    {
+                        return false;
+                    }
+                    break;
+                case Direction.Down:
+                    if (GetObjectCoordinates().Bottom + 1 > _map.GetLength(0))
+                    {
+                        return false;
+                    }
+                    break;
+                case Direction.Left:
+                    if (GetObjectCoordinates().Left - 1 < 0)
+                    {
+                        return false;
+                    }
+                    break;
+                case Direction.Right:
+                    if (GetObjectCoordinates().Right + 1 > _map.GetLength(1))
+                    {
+                        return false;
+                    }
+                    break;
+            }
+            for (int i = GetObjectCoordinates().Left; i <= GetObjectCoordinates().Right; i++)
+            {
+                for (int j = GetObjectCoordinates().Top; j <= GetObjectCoordinates().Bottom; j++)
+                {
+                    if (i - 1 < 0 || j - 1 < 0 || i + 1 > _map.GetLength(0) || j + 1 > _map.GetLength(1))
+                    {
+                        return false;
+                    }
+                    switch (direction)
+                    {
+                        case Direction.Up:
+                            if (_map[i, j - 1] == _barrier)
+                            {
+                                return false;
+                            }
+                            break;
+                        case Direction.Down:
+                            if (_map[i, j + 1] == _barrier)
+                            {
+                                return false;
+                            }
+                            break;
+                        case Direction.Left:
+                            if (_map[i - 1, j] == _barrier)
+                            {
+                                return false;
+                            }
+                            break;
+                        case Direction.Right:
+                            if (_map[i + 1, j] == _barrier)
+                            {
+                                return false;
+                            }
+                            break;
+                    }
+                }
+            }
+            return true;
+        }
+        /// <summary>
+        /// Проверка возможности установить объект на карте
+        /// </summary>
+        /// <returns></returns>
+        private bool AbleToSetObject()
+        {
+            for (int i = GetObjectCoordinates().Left; i <= GetObjectCoordinates().Right; i++)
+            {
+                for (int j = GetObjectCoordinates().Top; j <= GetObjectCoordinates().Bottom; j++)
+                {
+                    if (_map[i, j] == _barrier || i < 0 || j < 0)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /// <summary>
+        /// Передвижение объекта по карте
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// <returns></returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (!AbleToMove(direction))
+            {
+                return DrawMapWithObject();
+            }
+            _drawningObject.MoveObject(direction);
+            return DrawMapWithObject();
+        }
+        /// <summary>
+        /// Создание объекта на карте
+        /// </summary>
+        /// <returns>Возможность создать объект</returns>
+        private bool SetObjectOnMap()
+        {
+            if (_drawningObject == null || _map == null)
+            {
+                return false;
+            }
+            int x = _random.Next(10, 100);
+            int y = _random.Next(10, 100);
+            _drawningObject.SetObject(x, y, _width, _height);
+            if (!AbleToSetObject())
+            {
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// Отрисовка карты
+        /// </summary>
+        /// <returns></returns>
+        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;
+        }
+        /// <summary>
+        /// Генерация массива карты
+        /// </summary>
+        protected abstract void GenerateMap();
+        /// <summary>
+        /// Отрисовка ячейки со свободным пространством (дорогой)
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected abstract void DrawRoadPart(Graphics g, int i, int j);
+        /// <summary>
+        /// Отрисовка ячейки с барьером
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

Locomotives/Locomotives/CrossMap.cs

@@ -0,0 +1,52 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Карта в виде креста
+    /// </summary>
+    internal class CrossMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Red);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Transparent);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * _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);
+            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 = 45; i < 55; i++)
+            {
+                for (int j = 15; j < 85; j++)
+                {
+                    _map[i, j] = _barrier;
+                }
+            }
+            for (int i = 45; i < 55; i++)
+            {
+                for (int j = 30; j < 80; j++)
+                {
+                    _map[j, i] = _barrier;
+                }
+            }
+        }
+    }
+}

Locomotives/Locomotives/Direction.cs

@@ -3,8 +3,12 @@
     /// <summary>
     /// Перечисление направлений перемещения
     /// </summary>
-    internal enum Direction
+    public enum Direction
     {
+        /// <summary>
+        /// никуда
+        /// </summary>
+        None = 0,
         /// <summary>
         /// вверх
         /// </summary>

Locomotives/Locomotives/DrawningLocomotive.cs

@@ -3,20 +3,20 @@
     /// <summary>
     /// Класс, отвечающий за отрисовку объекта-сущности
     /// </summary>
-    internal class DrawningLocomotive
+    public class DrawningLocomotive
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityLocomotive Locomotive { get; private set; }
+        public EntityLocomotive Locomotive { get; protected set; }
         /// <summary>
         /// Левая координата отрисовки локомотива
         /// </summary>
-        private float _startPosX;
+        protected float _startPosX;
         /// <summary>
         /// Верхняя координата отрисовки локомотива
         /// </summary>
-        private float _startPosY;
+        protected float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -39,10 +39,23 @@
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес</param>
         /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public DrawningLocomotive(int speed, float weight, Color bodyColor)
         {
-            Locomotive = new EntityLocomotive();
-            Locomotive.Init(speed, weight, bodyColor);
+            Locomotive = new EntityLocomotive(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Конструктор для изменения размеров локомотива
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="locomotiveWidth">Ширина локомотива</param>
+        /// <param name="locomotiveHeight">Высота локомотива</param>
+        protected DrawningLocomotive(int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight)
+            : this(speed, weight, bodyColor)
+        {
+            _locomotiveWidth = locomotiveWidth;
+            _locomotiveHeight = locomotiveHeight;
         }
         /// <summary>
         /// Установка начальной позиции локомотива
@@ -68,10 +81,6 @@
         /// <param name="direction">Направление</param>
         public void MoveLocomotive(Direction direction)
         {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
-            {
-                return;
-            }
             if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
             {
                 return;
@@ -112,7 +121,7 @@
         /// Метод отрисовки локомотива
         /// </summary>
         /// <param name="g">Графика</param>
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
             {
@@ -186,5 +195,13 @@
                 _startPosY = _pictureHeight.Value - _locomotiveHeight;
             }
         }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Top, float Bottom, float Left, float Right) GetCurrentPosition()
+        {
+            return (_startPosY, _startPosY + _locomotiveHeight, _startPosX, _startPosX + _locomotiveWidth);
+        }
     }
 }

Locomotives/Locomotives/DrawningObjectLocomotive.cs

@@ -0,0 +1,35 @@
+namespace Locomotives
+{
+/// <summary>
+/// Класс-наследник от интерфейса (реализация)
+/// </summary>
+    internal class DrawningObjectLocomotive : IDrawningObject
+    {
+        /// <summary>
+        /// Объект от класса отрисовки локомотива
+        /// </summary>
+        private DrawningLocomotive _locomotive = null;
+        public DrawningObjectLocomotive(DrawningLocomotive locomotive)
+        {
+            _locomotive = locomotive;
+        }
+        public float Step => _locomotive?.Locomotive?.Step ?? 0;
+        public (float Top, float Bottom, float Left, float Right) GetCurrentPosition()
+        {
+            return _locomotive?.GetCurrentPosition() ?? default;
+        }
+        public void MoveObject(Direction direction)
+        {
+            _locomotive?.MoveLocomotive(direction);
+        }
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _locomotive.SetPosition(x, y, width, height);
+        }
+        public void DrawningObject(Graphics g)
+        {
+            _locomotive.DrawTransport(g);
+        }
+
+    }
+}

Locomotives/Locomotives/DrawningWarmlyLocomotive.cs

@@ -0,0 +1,61 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Класс-наследник от класса отрисовки локомотива
+    /// </summary>
+    internal class DrawningWarmlyLocomotive : DrawningLocomotive
+    {
+        /// <summary>
+        /// Конструктор, передаём в protected конструктор базового класса обычные параметры и вводим новые
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="locomotiveWidth">Ширина локомотива</param>
+        /// <param name="locomotiveHeight">Высота локомотива</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="hasPipe">Признак наличия трубы</param>
+        /// <param name="hasFuelTank">Признак наличия топливного бака</param>
+        public DrawningWarmlyLocomotive(int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight, Color additionalColor, bool hasPipe, bool hasFuelTank) : base(speed, weight, bodyColor, locomotiveWidth, locomotiveHeight)
+        {
+            Locomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, additionalColor, hasPipe, hasFuelTank);
+        }
+        /// <summary>
+        /// Отрисовываем базовую часть локомотива и добавляем дополнительные элементы, если они есть
+        /// </summary>
+        /// <param name="g"></param>
+        public override void DrawTransport(Graphics g)
+        {
+            if (Locomotive is not EntityWarmlyLocomotive warmlyLocomotive)
+            {
+                return;
+            }
+            //Прорисовка трубы
+            if (warmlyLocomotive.HasPipe)
+            {
+                Pen pen = new Pen(Color.Black);
+                Brush brAdditionalColor = new SolidBrush(warmlyLocomotive.AdditionalColor);
+                g.FillRectangle(brAdditionalColor, _startPosX + 20, _startPosY, 25, 10);
+                g.DrawRectangle(pen, _startPosX + 20, _startPosY, 25, 10);
+                g.FillRectangle(brAdditionalColor, _startPosX + 25, _startPosY + 10, 15, 20);
+                g.DrawRectangle(pen, _startPosX + 25, _startPosY + 10, 15, 20);
+            }
+            _startPosY += 30;
+            base.DrawTransport(g);
+            _startPosY -= 30;
+            //Прорисовка топливного бака
+            if (warmlyLocomotive.HasFuelTank)
+            {
+                Pen pen = new Pen(Color.Black);
+                Brush brAdditionalColor = new SolidBrush(warmlyLocomotive.AdditionalColor);
+                Pen penYellow = new Pen(Color.Yellow);
+                g.FillRectangle(brAdditionalColor, _startPosX + 80, _startPosY + 40, 45, 20);
+                g.DrawRectangle(pen, _startPosX + 80, _startPosY + 40, 45, 20);
+                for (int i = (int)_startPosX + 100; i < (int)_startPosX + 110; i++)
+                {
+                    g.DrawLine(penYellow, _startPosX + 105, _startPosY + 45, i, _startPosY + 55);
+                }
+            }
+        }
+    }
+}

Locomotives/Locomotives/EntityLocomotive.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Класс-сущность локомотив
     /// </summary>
-    internal class EntityLocomotive
+    public class EntityLocomotive
     {
         /// <summary>
         /// Скорость
@@ -27,7 +27,7 @@
         /// <param name="speed">скорость</param>
         /// <param name="weight">вес</param>
         /// <param name="bodyColor">цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityLocomotive (int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

Locomotives/Locomotives/EntityWarmlyLocomotive.cs

@@ -0,0 +1,36 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Класс-наследник от класса-сущности локомотива (усложнённый локомотив/тепловоз)
+    /// </summary>
+    internal class EntityWarmlyLocomotive : EntityLocomotive
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+        /// <summary>
+        /// Признак наличия трубы
+        /// </summary>
+        public bool HasPipe { get; private set; }
+        /// <summary>
+        /// Признак наличия топливного бака
+        /// </summary>
+        public bool HasFuelTank { get; private set; }
+        /// <summary>
+        /// Инициализация свойств усложнённого локомотива (тепловоза)
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="hasPipe">Признак наличия трубы</param>
+        /// <param name="hasFuelTank">Признак наличия топливного бака</param>
+        public EntityWarmlyLocomotive(int speed, float weight, Color bodyColor, Color additionalColor, bool hasPipe, bool hasFuelTank) : base (speed, weight, bodyColor)
+        {
+            AdditionalColor = additionalColor;
+            HasPipe = hasPipe;
+            HasFuelTank = hasFuelTank;
+        }
+    }
+}

Locomotives/Locomotives/FormLocomotive.Designer.cs

@@ -33,11 +33,16 @@
             this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelAdditionalColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelHasPipe = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelHasFuelTank = new System.Windows.Forms.ToolStripStatusLabel();
             this.buttonCreate = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectLocomotive = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -59,7 +64,10 @@
             this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
+            this.toolStripStatusLabelBodyColor,
+            this.toolStripStatusLabelAdditionalColor,
+            this.toolStripStatusLabelHasPipe,
+            this.toolStripStatusLabelHasFuelTank});
             this.statusStrip.Location = new System.Drawing.Point(0, 428);
             this.statusStrip.Name = "statusStrip";
             this.statusStrip.Size = new System.Drawing.Size(800, 22);
@@ -84,6 +92,24 @@
             this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17);
             this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
             // 
+            // toolStripStatusLabelAdditionalColor
+            // 
+            this.toolStripStatusLabelAdditionalColor.Name = "toolStripStatusLabelAdditionalColor";
+            this.toolStripStatusLabelAdditionalColor.Size = new System.Drawing.Size(137, 17);
+            this.toolStripStatusLabelAdditionalColor.Text = "Дополнительный цвет: ";
+            // 
+            // toolStripStatusLabelHasPipe
+            // 
+            this.toolStripStatusLabelHasPipe.Name = "toolStripStatusLabelHasPipe";
+            this.toolStripStatusLabelHasPipe.Size = new System.Drawing.Size(99, 17);
+            this.toolStripStatusLabelHasPipe.Text = "Наличие трубы: ";
+            // 
+            // toolStripStatusLabelHasFuelTank
+            // 
+            this.toolStripStatusLabelHasFuelTank.Name = "toolStripStatusLabelHasFuelTank";
+            this.toolStripStatusLabelHasFuelTank.Size = new System.Drawing.Size(158, 17);
+            this.toolStripStatusLabelHasFuelTank.Text = "Наличие топливного бака: ";
+            // 
             // buttonCreate
             // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -143,11 +169,35 @@
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_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(108, 395);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(109, 30);
+            this.buttonCreateModif.TabIndex = 8;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // buttonSelectLocomotive
+            // 
+            this.buttonSelectLocomotive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSelectLocomotive.Location = new System.Drawing.Point(602, 395);
+            this.buttonSelectLocomotive.Name = "buttonSelectLocomotive";
+            this.buttonSelectLocomotive.Size = new System.Drawing.Size(78, 30);
+            this.buttonSelectLocomotive.TabIndex = 9;
+            this.buttonSelectLocomotive.Text = "Выбрать";
+            this.buttonSelectLocomotive.UseVisualStyleBackColor = true;
+            this.buttonSelectLocomotive.Click += new System.EventHandler(this.ButtonSelectLocomotive_Click);
+            // 
             // FormLocomotive
             // 
             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.buttonSelectLocomotive);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -177,5 +227,10 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonUp;
+        private ToolStripStatusLabel toolStripStatusLabelAdditionalColor;
+        private ToolStripStatusLabel toolStripStatusLabelHasPipe;
+        private ToolStripStatusLabel toolStripStatusLabelHasFuelTank;
+        private Button buttonCreateModif;
+        private Button buttonSelectLocomotive;
     }
 }

Locomotives/Locomotives/FormLocomotive.cs

@@ -6,6 +6,10 @@
         /// Объект от класса отрисовки локомотива
         /// </summary>
         private DrawningLocomotive _locomotive;
+        /// <summary>
+        /// Выбранный объект
+        /// </summary>
+        public DrawningLocomotive SelectedLocomotive { get; private set; }
 
         public FormLocomotive()
         {
@@ -22,6 +26,34 @@
             pictureBoxLocomotive.Image = bmp;
         }
         /// <summary>
+        /// Заполнение информации по объекту
+        /// </summary>
+        /// <param name="locomotive">Объект от класса отрисовки или его наследника</param>
+        private void SetData(DrawningLocomotive locomotive)
+        {
+            Random rnd = new();
+            toolStripStatusLabelSpeed.Text = $"Скорость: {locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {locomotive.Locomotive.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {locomotive.Locomotive.BodyColor.Name}";
+            toolStripStatusLabelAdditionalColor.Text = $"Дополнительный цвет: н/д";
+            toolStripStatusLabelHasPipe.Text = $"Наличие трубы: н/д";
+            toolStripStatusLabelHasFuelTank.Text = $"Наличие топливного бака: н/д";
+            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
+        }
+        /// <summary>
+        /// Заполнение дополнительной информации по объекту (только для усложнённого объекта)
+        /// </summary>
+        /// <param name="warmlylocomotive">Объект от наследника класса отрисовки</param>
+        private void SetAdditionalData(DrawningWarmlyLocomotive warmlylocomotive)
+        {
+            if (warmlylocomotive.Locomotive is EntityWarmlyLocomotive entityWarmlyLocomotive)
+            {
+                toolStripStatusLabelAdditionalColor.Text = $"Дополнительный цвет: {entityWarmlyLocomotive.AdditionalColor.Name}";
+                toolStripStatusLabelHasPipe.Text = $"Наличие трубы: {entityWarmlyLocomotive.HasPipe}";
+                toolStripStatusLabelHasFuelTank.Text = $"Наличие топливного бака: {entityWarmlyLocomotive.HasFuelTank}";
+            }
+        }
+        /// <summary>
         /// Метод обработки нажатия на кнопку "Создать"
         /// </summary>
         /// <param name="sender"></param>
@@ -29,12 +61,14 @@
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _locomotive = new DrawningLocomotive();
-            _locomotive.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {_locomotive.Locomotive.BodyColor.Name}";
+            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;
+            }
+            _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+            SetData(_locomotive);
             Draw();
         }
         /// <summary>
@@ -73,5 +107,41 @@
             _locomotive?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
             Draw();
         }
+        /// <summary>
+        /// Обработка нажатия кнопки "Модификация"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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 additionalColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                additionalColor = dialogDop.Color;
+            }
+            _locomotive = new DrawningWarmlyLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
+            color,
+            160, 85,
+            additionalColor,
+            Convert.ToBoolean(rnd.Next(0, 2)),
+            Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(_locomotive);
+            SetAdditionalData((DrawningWarmlyLocomotive)_locomotive);
+            Draw();
+        }
+
+        private void ButtonSelectLocomotive_Click(object sender, EventArgs e)
+        {
+            SelectedLocomotive = _locomotive;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

Locomotives/Locomotives/FormMapWithSetLocomotives.Designer.cs

@@ -0,0 +1,281 @@
+namespace Locomotives
+{
+    partial class FormMapWithSetLocomotives
+    {
+        /// <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.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = 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.buttonRemoveLocomotive = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddCar = new System.Windows.Forms.Button();
+            this.pictureBoxLocomotives = new System.Windows.Forms.PictureBox();
+            this.groupBoxTools.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotives)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
+            this.groupBoxTools.Controls.Add(this.buttonUp);
+            this.groupBoxTools.Controls.Add(this.buttonDown);
+            this.groupBoxTools.Controls.Add(this.buttonLeft);
+            this.groupBoxTools.Controls.Add(this.buttonRight);
+            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTools.Controls.Add(this.buttonRemoveLocomotive);
+            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTools.Controls.Add(this.buttonAddCar);
+            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTools.Location = new System.Drawing.Point(950, 0);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(223, 676);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "Инструменты";
+            // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            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, 18);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(217, 267);
+            this.groupBoxMaps.TabIndex = 11;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(25, 235);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(164, 26);
+            this.buttonDeleteMap.TabIndex = 14;
+            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(25, 112);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(164, 109);
+            this.listBoxMaps.TabIndex = 13;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(25, 80);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(164, 26);
+            this.buttonAddMap.TabIndex = 12;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(25, 22);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(164, 23);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Карта с крестом",
+            "Карта с дорожками"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(25, 51);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(164, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::Locomotives.Properties.Resources.ArrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(107, 604);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 10;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::Locomotives.Properties.Resources.ArrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(107, 640);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 9;
+            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::Locomotives.Properties.Resources.ArrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(71, 640);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.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::Locomotives.Properties.Resources.ArrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(143, 640);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            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(31, 426);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(164, 26);
+            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(31, 394);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(164, 26);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveLocomotive
+            // 
+            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(31, 362);
+            this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
+            this.buttonRemoveLocomotive.Size = new System.Drawing.Size(164, 26);
+            this.buttonRemoveLocomotive.TabIndex = 3;
+            this.buttonRemoveLocomotive.Text = "Удалить локомотив";
+            this.buttonRemoveLocomotive.UseVisualStyleBackColor = true;
+            this.buttonRemoveLocomotive.Click += new System.EventHandler(this.ButtonRemoveLocomotive_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(31, 333);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(164, 23);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddCar
+            // 
+            this.buttonAddCar.Location = new System.Drawing.Point(31, 291);
+            this.buttonAddCar.Name = "buttonAddCar";
+            this.buttonAddCar.Size = new System.Drawing.Size(164, 26);
+            this.buttonAddCar.TabIndex = 1;
+            this.buttonAddCar.Text = "Добавить локомотив";
+            this.buttonAddCar.UseVisualStyleBackColor = true;
+            this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddLocomotive_Click);
+            // 
+            // pictureBoxLocomotives
+            // 
+            this.pictureBoxLocomotives.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxLocomotives.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxLocomotives.Name = "pictureBoxLocomotives";
+            this.pictureBoxLocomotives.Size = new System.Drawing.Size(950, 676);
+            this.pictureBoxLocomotives.TabIndex = 1;
+            this.pictureBoxLocomotives.TabStop = false;
+            // 
+            // FormMapWithSetLocomotives
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1173, 676);
+            this.Controls.Add(this.pictureBoxLocomotives);
+            this.Controls.Add(this.groupBoxTools);
+            this.Name = "FormMapWithSetLocomotives";
+            this.Text = "Карта с набором объектов";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotives)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private PictureBox pictureBoxLocomotives;
+        private ComboBox comboBoxSelectorMap;
+        private Button buttonAddCar;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRemoveLocomotive;
+        private Button buttonShowStorage;
+        private Button buttonShowOnMap;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private GroupBox groupBoxMaps;
+        private Button buttonDeleteMap;
+        private ListBox listBoxMaps;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
+    }
+}

Locomotives/Locomotives/FormMapWithSetLocomotives.cs

@@ -0,0 +1,221 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Форма для работы с набором объектов
+    /// </summary>
+    public partial class FormMapWithSetLocomotives : Form
+    {
+        /// <summary>
+        /// Словарь для выпадающего списка
+        /// </summary>
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            {"Простая карта", new SimpleMap()},
+            {"Карта с крестом", new CrossMap()},
+            {"Карта с дорожками", new RoadsMap()},
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetLocomotives()
+        {
+            InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBoxLocomotives.Width, pictureBoxLocomotives.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        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;
+            }
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            textBoxNewMapName.Text = "";
+            ReloadMaps();
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+            MessageBox.Show("Карта удалена");
+        }
+
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddLocomotive_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            FormLocomotive form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectLocomotive locomotive = new(form.SelectedLocomotive);
+                if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive) > -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveLocomotive_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);
+            if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos) > -1)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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;
+            }
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+    }
+}

Locomotives/Locomotives/FormMapWithSetLocomotives.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>

Locomotives/Locomotives/IDrawningObject.cs

@@ -0,0 +1,36 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Интерфейс для отрисовки
+    /// </summary>
+    internal interface IDrawningObject
+    {
+        /// <summary>
+        /// Шаг перемещения объекта
+        /// </summary>
+        public float Step { get; }
+        /// <summary>
+        /// Установка позиции объекта
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина полотна</param>
+        /// <param name="height">Высота полотна</param>
+        void SetObject(int x, int y, int width, int height);
+        /// <summary>
+        /// Изменение направления пермещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        void MoveObject(Direction direction);
+        /// <summary>
+        /// Отрисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        void DrawningObject(Graphics g);
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        (float Top, float Bottom, float Left, float Right) GetCurrentPosition();
+    }
+}

Locomotives/Locomotives/MapWithSetLocomotivesGeneric.cs

@@ -0,0 +1,178 @@
+namespace Locomotives
+{
+    internal class MapWithSetLocomotivesGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 210;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 110;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetLocomotivesGeneric<T> _setLocomotives;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetLocomotivesGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setLocomotives = new SetLocomotivesGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="locomotive"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetLocomotivesGeneric<T, U> map, T locomotive)
+        {
+            return map._setLocomotives.Insert(locomotive);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static int operator -(MapWithSetLocomotivesGeneric<T, U> map, int position)
+        {
+            return map._setLocomotives.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawLocomotives(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var locomotive in _setLocomotives.GetLocomotives())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// Перемещение объекта по крате
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setLocomotives.Count - 1;
+            for (int i = 0; i < _setLocomotives.Count; i++)
+            {
+                if (_setLocomotives[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var locomotive = _setLocomotives[j];
+                        if (locomotive != null)
+                        {
+                            _setLocomotives.Insert(locomotive, i);
+                            _setLocomotives.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Brown, 3);
+            Brush brBackground = new SolidBrush(Color.Yellow);
+            g.FillRectangle(brBackground, 0, 0, _pictureWidth, _pictureHeight);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {//линия разметки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i *
+                   _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth,
+               (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawLocomotives(Graphics g)
+        {
+            int LocomotivesInLine = _pictureWidth / _placeSizeWidth;
+            int CurrentVertPos = 20;
+            int CurrentHorPos = 0;
+            int CurrentLocomotiveNumber = 0;
+            foreach (var locomotive in _setLocomotives.GetLocomotives())
+            {
+                _setLocomotives[CurrentLocomotiveNumber]?.SetObject(CurrentHorPos, CurrentVertPos, _pictureWidth, _pictureHeight);
+                _setLocomotives[CurrentLocomotiveNumber]?.DrawningObject(g);
+                if (CurrentHorPos < LocomotivesInLine)
+                {
+                    CurrentHorPos += _placeSizeWidth;
+                }
+                else
+                {
+                    CurrentHorPos = 0;
+                    CurrentVertPos += _placeSizeHeight;
+                }
+                CurrentLocomotiveNumber++;
+            }
+        }
+    }
+}

Locomotives/Locomotives/MapsCollection.cs

@@ -0,0 +1,66 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Класс для хранения коллекции карт
+    /// </summary>
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>> _mapStorages;
+        /// <summary>
+        /// Возвращение списка названий карт
+        /// </summary>
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        /// <param name="map">Карта</param>
+        public void AddMap(string name, AbstractMap map)
+        {
+            _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(_pictureWidth, _pictureHeight, map));
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            _mapStorages.Remove(name);
+        }
+        /// <summary>
+        /// Доступ к парковке
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> this[string ind]
+        {
+            get
+            {
+                return _mapStorages[ind];
+            }
+        }
+    }
+
+}

Locomotives/Locomotives/Program.cs

@@ -9,7 +9,7 @@ namespace Locomotives
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormLocomotive());
+            Application.Run(new FormMapWithSetLocomotives());
         }
     }
 }

Locomotives/Locomotives/RoadsMap.cs

@@ -0,0 +1,45 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Карта в виде дорожек
+    /// </summary>
+    internal class RoadsMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Blue);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Green);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * _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);
+            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 = 25; i < _map.GetLength(1) - 20; i++)
+            {
+                for (int j = 30; j < _map.GetLength(0); j += 20)
+                {
+                    _map[i, j] = _barrier;
+                }
+            }
+        }
+    }
+}

Locomotives/Locomotives/SetLocomotivesGeneric.cs

@@ -0,0 +1,123 @@
+namespace Locomotives
+{
+    internal class SetLocomotivesGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T> _places;
+        /// <summary>
+        /// Количество объектов в списке
+        /// </summary>
+        public int Count => _places.Count;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        private readonly int _maxCount;
+        public SetLocomotivesGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="locomotive">Добавляемый локомотив</param>
+        /// <returns></returns>
+        public int Insert(T locomotive)
+        {
+            if (_places.Count == 0)
+            {
+                _places.Add(locomotive);
+                return 0;
+            }
+            if (Count < _maxCount)
+            {
+                for (int i = Count; i >= 1; i--)
+                {
+                    _places.Insert(i, _places[i - 1]);
+                    _places.RemoveAt(i - 1);
+                }
+                _places.Insert(0, locomotive);
+                return 0;
+            }
+            return -1;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="locomotive">Добавляемый локомотив</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T locomotive, int position)
+        {
+            if (position < 0 || position > Count + 1)
+            {
+                return position;
+            }
+            if (_places[position] == null)
+            {
+                _places.Insert(position, locomotive);
+                return position;
+            }
+            return -1;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public int Remove(int position)
+        {
+            if (position > Count || _places[position] == null)
+            {
+                return -1;
+            }
+            _places.RemoveAt(position);
+            return position;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T this[int position]
+        {
+            get
+            {
+                if (_places[position] != null)
+                {
+                    return _places[position];
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            set
+            {
+                Insert(value, position);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetLocomotives()
+        {
+            foreach (var locomotive in _places)
+            {
+                if (locomotive != null)
+                {
+                    yield return locomotive;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

Locomotives/Locomotives/SimpleMap.cs

@@ -0,0 +1,49 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Карта с 50-ю барьерами в случайных местах
+    /// </summary>
+    internal class SimpleMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Gray);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _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++;
+                }
+            }
+        }
+    }
+}