Коммит 2

ElectricLocomotive/ElectricLocomotive/AbstractMap.cs

@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal abstract class 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();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+
+            float locomotiveWidth = rightX - leftX;
+            float locomotiveHeight = bottomY - topY;
+
+            for (int i = 0; i < _map.GetLength(0); i++)
+            {
+                for (int j = 0; j < _map.GetLength(1); j++)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        switch (direction)
+                        {
+                            case Direction.Up:
+                                if (_size_y * (j + 1) >= topY - _drawningObject.Step && _size_y * (j + 1) < topY && _size_x * (i + 1) > leftX
+                                    && _size_x * (i + 1) <= rightX)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                            case Direction.Down:
+                                if (_size_y * j <= bottomY + _drawningObject.Step && _size_y * j > bottomY && _size_x * (i + 1) > leftX
+                                    && _size_x * (i + 1) <= rightX)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                            case Direction.Left:
+                                if (_size_x * (i + 1) >= leftX - _drawningObject.Step && _size_x * (i + 1) < leftX && _size_y * (j + 1) < bottomY
+                                    && _size_y * (j + 1) >= topY)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                            case Direction.Right:
+                                if (_size_x * i <= rightX + _drawningObject.Step && _size_x * i > leftX && _size_y * (j + 1) < bottomY
+                                    && _size_y * (j + 1) >= topY)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                        }
+                    }
+                }
+            }
+            if (true)
+            {
+                _drawningObject.MoveObject(direction);
+            }
+            return DrawMapWithObject();
+        }
+
+        private bool SetObjectOnMap()
+        {
+            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+            if (_drawningObject == null || _map == null)
+            {
+                return false;
+            }
+
+            float locomotiveWidth = rightX - leftX;
+            float locomotiveHeight = bottomY - topY;
+
+            int x = _random.Next(0, 10);
+            int y = _random.Next(0, 10);
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        if (x + locomotiveWidth >= _size_x * i && x <= _size_x * i && y + locomotiveHeight > _size_y * j && y <= _size_y * j)
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            _drawningObject.SetObject(x, y, _width, _height);
+            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);
+    }
+}

ElectricLocomotive/ElectricLocomotive/BushesMap.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class BushesMap : AbstractMap
+    {
+
+        private readonly Pen barrierColor = new Pen(Color.DarkGreen, 3);
+        private readonly Brush roadColor = new SolidBrush(Color.Brown);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7));
+            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1) + 7), Convert.ToInt32(j * (_size_y - 1)) + 7));
+            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7), new Point(Convert.ToInt32(i * (_size_x - 1) + 14), Convert.ToInt32(j * (_size_y - 1)) ));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        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 < 20)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    
+    }
+}

ElectricLocomotive/ElectricLocomotive/Direction.cs

@@ -8,6 +8,7 @@ namespace ElectricLocomotive
 {
     internal enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class DrawningElectricLocomotive : DrawningLocomotive
+    {
+        public DrawningElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+            base(speed, weight, bodyColor, 110, 60)
+        {
+            Locomotive = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Locomotive is not EntityElectricLocomotive sportCar)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Pen window = new(Color.Blue);
+            Brush dopBrush = new SolidBrush(sportCar.DopColor);
+
+
+            if (sportCar.BodyKit)
+            {
+                Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 15, Convert.ToInt32(_startPosY) - 20), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY) - 30), new Point(Convert.ToInt32(_startPosX) + 75, Convert.ToInt32(_startPosY) - 20), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY) + 10) };
+                g.DrawPolygon(window, pts);
+            }
+
+            if (sportCar.SportLine)
+            {
+                Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 150, Convert.ToInt32(_startPosY) + 60)};
+                g.FillPolygon(Brushes.Black, pts);
+            }
+
+            base.DrawTransport(g);
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs

@@ -9,69 +9,33 @@ namespace ElectricLocomotive
 {
     internal class DrawningLocomotive
     {
-        /// <summary>
-        /// Класс-сущность
-        /// </summary>
-        public EntityLocomotive Locomotive { get; private set; }
-        /// <summary>
-        /// Левая координата отрисовки автомобиля
-        /// </summary>
-        private float _startPosX;
-        /// <summary>
-        /// Верхняя кооридната отрисовки автомобиля
-        /// </summary>
-        private float _startPosY;
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private int? _pictureWidth = null;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private int? _pictureHeight = null;
-        /// <summary>
-        /// Ширина отрисовки автомобиля
-        /// </summary>
-        private readonly int _locomotiveWidth = 160;
-        /// <summary>
-        /// Высота отрисовки автомобиля
-        /// </summary>
-        private readonly int _locomotiveHeight = 90;
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityLocomotive Locomotive { get; protected set; }
+        protected float _startPosX;
+        protected float _startPosY;
+
+        protected int? _pictureWidth = null;
+        protected int? _pictureHeight = null;
+
+        protected readonly int _locomotiveWidth = 160;
+        protected readonly int _locomotiveHeight = 90;
+        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="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
         public void SetPosition(int x, int y, int width, int height)
         {
-            // TODO checks
+            if (width <= _locomotiveWidth + x || height <= _locomotiveHeight + y || x < 0 || y < 0)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
 
-            _startPosX = x;
-            _startPosY = y;
+            _startPosX = x + 20;
+            _startPosY = y + 30;
             _pictureWidth = width;
             _pictureHeight = height;
-
-            if (_startPosX + _locomotiveWidth > _pictureWidth) { _startPosX = 20; }
-            if (_startPosY - _locomotiveHeight / 2 < 0) { _startPosY = _locomotiveHeight + 10; }
-            if (_startPosY + _locomotiveHeight > _pictureHeight) { _startPosY -= _locomotiveHeight; }
         }
-        /// <summary>
-        /// Изменение направления пермещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
         public void MoveTransport(Direction direction)
         {
             if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
@@ -110,11 +74,15 @@ namespace ElectricLocomotive
                     break;
             }
         }
-        /// <summary>
-        /// Отрисовка автомобиля
-        /// </summary>
-        /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+
+        protected DrawningLocomotive(int speed, float weight, Color bodyColor, int
+        locomotiveWidth, int locomotiveHeight) :
+        this(speed, weight, bodyColor)
+        {
+            _locomotiveWidth = locomotiveWidth;
+            _locomotiveHeight = locomotiveHeight;
+        }
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -122,30 +90,43 @@ namespace ElectricLocomotive
                 return;
             }
             Brush brBody = new SolidBrush(Locomotive?.BodyColor ?? Color.Black);
+            Brush blackturbo = new SolidBrush(Color.Black);
             Pen pen = new Pen(Color.Black);
-            //колёса
-            g.FillEllipse(brBody, _startPosX + 10, _startPosY + 50, 30, 30);
-            g.FillEllipse(brBody, _startPosX + 50, _startPosY + 50, 30, 30);
-            g.FillEllipse(brBody, _startPosX + 90, _startPosY + 50, 30, 30);
-            g.FillEllipse(brBody, _startPosX + 130, _startPosY + 50, 30, 30);
+            Pen window = new Pen(Color.Blue);
 
-            g.DrawEllipse(pen, _startPosX + 10, _startPosY + 50, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 50, _startPosY + 50, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 50, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 130, _startPosY + 50, 30, 30);
+            g.FillPolygon(brBody, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60) });
+            g.FillRectangle(blackturbo, _startPosX + 5, _startPosY + 15, 5, 40);
+
+            g.FillEllipse(brBody, _startPosX + 15, _startPosY + 60, 20, 20);
+            g.FillEllipse(brBody, _startPosX + 45, _startPosY + 60, 20, 20);
+
+
+            g.FillEllipse(brBody, _startPosX + 85, _startPosY + 60, 20, 20);
+            g.FillEllipse(brBody, _startPosX + 115, _startPosY + 60, 20, 20);
+
+            // Окна
+
+            g.DrawRectangle(window, _startPosX + 20, _startPosY + 20, 20, 25);
+            g.DrawRectangle(window, _startPosX + 50, _startPosY + 20, 20, 25);
+
+            // Колёса
+
+            g.DrawEllipse(pen, _startPosX + 15, _startPosY + 60, 20, 20);
+            g.DrawEllipse(pen, _startPosX + 45, _startPosY + 60, 20, 20);
+
+
+            g.DrawEllipse(pen, _startPosX + 85, _startPosY + 60, 20, 20);
+            g.DrawEllipse(pen, _startPosX + 115, _startPosY + 60, 20, 20);
+
+            // Дверь
+
+            g.DrawRectangle(pen, _startPosX + 85, _startPosY + 15, 20, 40);
+
+            // Локомотив
+
+            g.DrawPolygon(pen, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60) });
 
-            g.FillRectangle(brBody, _startPosX + 10, _startPosY + 20, 150, 30);
-            g.FillRectangle(brBody, _startPosX + 10, _startPosY - 20, 40, 40);
-            g.FillRectangle(brBody, _startPosX + 100, _startPosY - 20, 10, 40);
-            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 150, 30);
-            g.DrawRectangle(pen, _startPosX + 10, _startPosY - 20, 40, 40);
-            g.DrawRectangle(pen, _startPosX + 100, _startPosY - 20, 10, 40);
         }
-        /// <summary>
-        /// Смена границ формы отрисовки
-        /// </summary>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
         public void ChangeBorders(int width, int height)
         {
             _pictureWidth = width;
@@ -165,6 +146,10 @@ namespace ElectricLocomotive
                 _startPosY = _pictureHeight.Value - _locomotiveHeight;
             }
         }
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _locomotiveWidth, _startPosY + _locomotiveHeight);
+        }
     }
 }
 

ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class DrawningObjectLocomotive : IDrawningObject
+    {
+        private DrawningLocomotive _locomotive = null;
+
+        public DrawningObjectLocomotive(DrawningLocomotive locomotive)
+        {
+            _locomotive = locomotive;
+        }
+
+        public float Step => _locomotive?.Locomotive?.Step ?? 0;
+
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return _locomotive?.GetCurrentPosition() ?? default;
+        }
+
+        public void MoveObject(Direction direction)
+        {
+            _locomotive?.MoveTransport(direction);
+        }
+
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _locomotive.SetPosition(x, y, width, height);
+        }
+
+        void IDrawningObject.DrawningObject(Graphics g)
+        {
+            _locomotive.DrawTransport(g);
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class EntityElectricLocomotive : EntityLocomotive
+    {
+        public Color DopColor { get; private set; }
+        public bool BodyKit { get; private set; }
+        public bool Wing { get; private set; }
+        public bool SportLine { get; private set; }
+        public EntityElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            BodyKit = bodyKit;
+            Wing = wing;
+            SportLine = sportLine;
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs

@@ -9,30 +9,11 @@ namespace ElectricLocomotive
 {
         internal class EntityLocomotive
         {
-            /// <summary>
-            /// Скорость
-            /// </summary>
             public int Speed { get; private set; }
-            /// <summary>
-            /// Вес
-            /// </summary>
             public float Weight { get; private set; }
-            /// <summary>
-            /// Цвет кузова
-            /// </summary>
             public Color BodyColor { get; private set; }
-            /// <summary>
-            /// Шаг перемещения автомобиля
-            /// </summary>
             public float Step => Speed * 100 / Weight;
-            /// <summary>
-            /// Инициализация полей объекта-класса автомобиля
-            /// </summary>
-            /// <param name="speed"></param>
-            /// <param name="weight"></param>
-            /// <param name="bodyColor"></param>
-            /// <returns></returns>
-            public void Init(int speed, float weight, Color bodyColor)
+            public EntityLocomotive(int speed, float weight, Color bodyColor)
             {
                 Random rnd = new Random();
                 Speed = speed <= 0 ? rnd.Next(40, 120) : speed;

ElectricLocomotive/ElectricLocomotive/FieldMap.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class FieldMap : AbstractMap
+    {
+        private readonly Brush barrierColor = new SolidBrush(Color.Brown);
+        private readonly Brush roadColor = new SolidBrush(Color.Green);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillEllipse(barrierColor, i * (_size_x-1), j * (_size_y-1), 30, 15);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_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 < 20)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs

@@ -38,6 +38,7 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
@@ -147,11 +148,22 @@
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Location = new System.Drawing.Point(93, 396);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(103, 23);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_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.buttonCreateModif);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -182,5 +194,6 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonUp;
+        private Button buttonCreateModif;
     }
 }

ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs

@@ -21,14 +21,8 @@ namespace ElectricLocomotive
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _locomotive = new DrawningLocomotive();
-            _locomotive.Init(rnd.Next(40, 120), rnd.Next(1500, 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),
-           pictureBox1.Width, pictureBox1.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
-            toolStripStatusLabelColor.Text = $"Цвет:{_locomotive.Locomotive.BodyColor.Name}";
+            _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData();
             Draw();
         }
 
@@ -81,5 +75,24 @@ namespace ElectricLocomotive
             Draw();
         }
 
+        private void SetData()
+        {
+            Random rnd = new();
+            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBox1.Width, pictureBox1.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
+            toolStripStatusLabelColor.Text = $"Цвет: {_locomotive.Locomotive.BodyColor.Name}";
+        }
+
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            _locomotive = new DrawningElectricLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
     }
 }

ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs

@@ -0,0 +1,215 @@
+namespace ElectricLocomotive
+{
+    partial class FormMap
+    {
+        /// <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.ButtonCreate = new System.Windows.Forms.Button();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ButtonCreate
+            // 
+            this.ButtonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonCreate.AutoSize = true;
+            this.ButtonCreate.Location = new System.Drawing.Point(12, 396);
+            this.ButtonCreate.Name = "ButtonCreate";
+            this.ButtonCreate.Size = new System.Drawing.Size(75, 25);
+            this.ButtonCreate.TabIndex = 8;
+            this.ButtonCreate.Text = "Создать";
+            this.ButtonCreate.UseVisualStyleBackColor = true;
+            this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(800, 428);
+            this.pictureBox1.TabIndex = 10;
+            this.pictureBox1.TabStop = false;
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 428);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(800, 22);
+            this.statusStrip1.TabIndex = 9;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
+            this.toolStripStatusLabelSpeed.Text = "Скорость";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17);
+            this.toolStripStatusLabelWeight.Text = "Вес";
+            // 
+            // toolStripStatusLabelColor
+            // 
+            this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
+            this.toolStripStatusLabelColor.Size = new System.Drawing.Size(33, 17);
+            this.toolStripStatusLabelColor.Text = "Цвет";
+            // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Location = new System.Drawing.Point(93, 396);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(103, 23);
+            this.buttonCreateModif.TabIndex = 15;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.AutoSize = true;
+            this.buttonUp.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowup;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(712, 353);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 14;
+            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.AutoSize = true;
+            this.buttonRight.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowright;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(748, 389);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 13;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.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.AutoSize = true;
+            this.buttonDown.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowdown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(712, 389);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 12;
+            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.AutoSize = true;
+            this.buttonLeft.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowleft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(676, 389);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 11;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Поле с грязью",
+            "Кусты на карте"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(104, 23);
+            this.comboBoxSelectorMap.TabIndex = 16;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // FormMap
+            // 
+            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.comboBoxSelectorMap);
+            this.Controls.Add(this.ButtonCreate);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.buttonCreateModif);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.pictureBox1);
+            this.Name = "FormMap";
+            this.Text = "Карта";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Button ButtonCreate;
+        private PictureBox pictureBox1;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelColor;
+        private Button buttonCreateModif;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private ComboBox comboBoxSelectorMap;
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormMap.cs

@@ -0,0 +1,105 @@
+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 ElectricLocomotive
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+        }
+
+        private void SetData(DrawningLocomotive locomotive)
+        {
+            toolStripStatusLabelSpeed.Text = $"Скорость: {locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {locomotive.Locomotive.Weight}";
+            toolStripStatusLabelColor.Text = $"Цвет: {locomotive.Locomotive.BodyColor.Name}";
+            pictureBox1.Image = _abstractMap.CreateMap(pictureBox1.Width, pictureBox1.Height,
+                new DrawningObjectLocomotive(locomotive));
+        }
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var car = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(car);
+        }
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //получаем имя кнопки
+            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;
+            }
+            pictureBox1.Image = _abstractMap?.MoveObject(dir);
+        }
+        /// <summary>
+        /// Обработка нажатия кнопки "Модификация"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var car = new DrawningElectricLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(car);
+        }
+        /// <summary>
+        /// Смена карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    _abstractMap = new SimpleMap();
+                    break;
+                
+                case "Поле с грязью":
+                    _abstractMap = new FieldMap();
+                    break;
+                case "Кусты на карте":
+                    _abstractMap = new BushesMap();
+                    break;
+            }
+        }
+
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormMap.resx

@@ -0,0 +1,63 @@
+<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="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal interface 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();
+	}
+}

ElectricLocomotive/ElectricLocomotive/Program.cs

@@ -11,7 +11,7 @@ namespace ElectricLocomotive
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormLocomotive());
+            Application.Run(new FormMap());
         }
     }
 }

ElectricLocomotive/ElectricLocomotive/SimpleMap.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    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, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_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++;
+                }
+            }
+        }
+    }
+}