Bulldozer/Bulldozer/Bulldozer.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bulldozer
-{
-    public class EntityBulldozer
-    {
-        /// <summary>
-        ///  Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-        /// <summary>
-        ///  Вес
-        /// </summary>
-        public double Weight { get; private set; }
-        /// <summary>
-        ///  Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-        /// <summary>
-        ///  Дополнительный цвет бульдозера
-        /// </summary>
-        public Color AdditionalColor { get; private set; }
-        /// <summary>
-        ///  Дополнительный цвет 
-        /// </summary>
-        public Color DopColor { get; private set; }
-        /// <summary>
-        ///  Отвал бульдозера
-        /// </summary>
-        public bool Blade { get; private set; }
-        /// <summary>
-        ///  Рыхлитель бульдозера
-        /// </summary>
-        public bool Ripper { get; private set; }
-        /// <summary>
-        /// Шаг перемещения бульдозера 
-        /// </summary>
-        public double Step => (double)Speed * 100 / Weight;
-        
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес бульдозера</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="blade">Отвал бульдозера</param>
-        /// <param name="ripper">Рыхлитель бульдозера</param>
-        public void Init(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool blade, bool ripper)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalColor = additionalColor;
-            DopColor = dopColor;
-            Blade = blade;
-            Ripper = ripper;
-        }
-    }
-}

Bulldozer/Bulldozer/DirectionType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bulldozer
+namespace Bulldozer
 {
     /// <summary>
     ///  Направления движения

Bulldozer/Bulldozer/DrawingBulldozer.cs

@@ -1,220 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.AxHost;
-
-namespace Bulldozer
-{
-    /// <summary>
-    ///  Класс отрисовки и перемещения объекта-сущности
-    /// </summary>
-    public class DrawingBulldozer
-    {
-        /// <summary>
-        ///  Класс-сущность
-        /// </summary>
-        public EntityBulldozer? EntityBulldozer { get; private set; }
-        /// <summary>
-        ///  Ширина окна
-        /// </summary>
-        private int _pictureWidth;
-        /// <summary>
-        ///  Высота окна
-        /// </summary>
-        private int _pictureHeight;
-        /// <summary>
-        ///  Координата прорисовки по оси X
-        /// </summary>
-        private int _startPosX;
-        /// <summary>
-        ///  Координата прорисовки по оси Y
-        /// </summary>
-        private int _startPosY;
-        /// <summary>
-        ///  Ширина бульдозера
-        /// </summary>
-        private readonly int _bulldozerWidth = 150;
-        /// <summary>
-        ///  Высота бульдозера
-        /// </summary>
-        private readonly int _bulldozerHeight = 60;
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес бульдозера</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="blade">Отвал бульдозера</param>
-        /// <param name="ripper">Рыхлитель бульдозера</param>
-        /// <param name="width">Ширина изображения</param>
-        /// <param name="height">Высота изображения</param>
-
-        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool blade, bool ripper, int width, int height)
-        {
-            if ((height < _bulldozerHeight) || (width < _bulldozerWidth))
-            {
-                return false;
-            }
-            else
-            {
-                _pictureWidth = width;
-                _pictureHeight = height;
-                EntityBulldozer = new EntityBulldozer();
-                EntityBulldozer.Init(speed, weight, bodyColor, additionalColor, dopColor, blade, ripper);
-                return true;
-            }
-        }
-
-        public void SetPosition(int x, int y)
-        {
-            if (x < 0)
-            {
-                x = 0;
-            }
-            else if (x > _pictureWidth - _bulldozerWidth)
-            {
-                x = _pictureWidth - _bulldozerWidth;
-            }
-
-            if (y < 0)
-            {
-                y = 0;
-            }
-            else if (y > _pictureHeight - _bulldozerHeight)
-            {
-                y = _pictureHeight - _bulldozerHeight;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-
-        public void MoveBulldozer(DirectionType direction)
-        {
-            if (EntityBulldozer == null)
-            {
-            return;
-            } 
-            switch (direction)
-            {
-                case DirectionType.Left:
-                    if (_startPosX - EntityBulldozer.Step > 0)
-                    {
-                        _startPosX -= (int)EntityBulldozer.Step;
-                    }
-                    break;
-                case DirectionType.Up:
-                    if (_startPosY - EntityBulldozer.Step > 0)
-                    {
-                        _startPosY -= (int)EntityBulldozer.Step;
-                    }
-                    break;
-                case DirectionType.Right:
-                    if (_startPosX + _bulldozerWidth + EntityBulldozer.Step < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityBulldozer.Step;
-                    }
-                    break;
-                case DirectionType.Down:
-                    if (_startPosY + _bulldozerHeight + EntityBulldozer.Step < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityBulldozer.Step;
-                    }
-                    break;
-            }
-        }
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
-    {
-        if (EntityBulldozer == null)
-        {
-            return;
-        }
-        Pen pen = new(Color.Black);
-        Brush bodyBrush = new SolidBrush(EntityBulldozer.BodyColor);
-        Brush additionalBrush = new SolidBrush(EntityBulldozer.AdditionalColor);
-        Brush dopBrush = new SolidBrush(EntityBulldozer.DopColor);
-        Pen dopPen = new Pen(EntityBulldozer.DopColor);
-
-            /// <summary>
-            /// <summary>
-            /// Отрисовка отвала бульдозера
-            /// </summary>
-            if (EntityBulldozer.Blade) 
-            {
-                Point point1 = new Point(_startPosX + 8, _startPosY + 29);
-                Point point2 = new Point(_startPosX + 8, _startPosY + 50);
-                Point point3 = new Point(_startPosX, _startPosY + 50);
-                Point[] triangle = { point1, point2, point3 };
-
-                g.FillRectangle(dopBrush, _startPosX + 8, _startPosY + 29, 8, 8); // заливка основания отвала
-                g.FillPolygon(dopBrush, triangle); // заливка отвала
-
-                g.DrawRectangle(dopPen, _startPosX+8, _startPosY + 29, 8, 8); // обводка основания отвала
-                g.DrawPolygon(dopPen, triangle); // обводка отвала
-            }
-            /// <summary>
-            /// Отрисовка рыхлителя бульдозера
-            /// </summary>
-            if (EntityBulldozer.Ripper)
-            {
-                Point ripperPoint1 = new Point(_startPosX + 140, _startPosY + 37);
-                Point ripperPoint2 = new Point(_startPosX + 151, _startPosY + 37);
-                Point ripperPoint3 = new Point(_startPosX + 140, _startPosY + 60);
-                Point[] ripper = { ripperPoint1, ripperPoint2, ripperPoint3 };
-
-                g.FillRectangle(dopBrush, _startPosX + 136, _startPosY + 29, 15, 8); // заливка основания рыхлителя
-                g.FillPolygon(dopBrush, ripper); // заливка отвала
-
-                g.DrawRectangle(dopPen, _startPosX + 136, _startPosY + 29, 15, 8); // обводка основания рыхлителя
-                g.DrawPolygon(dopPen, ripper);
-            }
-
-            /// <summary>
-            /// Заливка гусеницы бульдозера 
-            /// </summary>
-            Brush brGray = new SolidBrush(Color.Gray);
-
-            g.FillEllipse(brGray, _startPosX + 17, _startPosY + 24, 119, 40); //Гусеница
-            g.FillEllipse(additionalBrush, _startPosX + 20, _startPosY + 35, 20, 20); // Левое колесо гусеницы
-            g.FillEllipse(additionalBrush, _startPosX + 115, _startPosY + 35, 20, 20); // Правое колесо гусеницы
-            g.FillEllipse(additionalBrush, _startPosX + 50, _startPosY + 45, 10, 10); // 1 центральное колесо гусеницы
-            g.FillEllipse(additionalBrush, _startPosX + 70, _startPosY + 45, 10, 10); // 2 центральное колесо гусеницы
-            g.FillEllipse(additionalBrush, _startPosX + 90, _startPosY + 45, 10, 10); // 3 центральное колесо гусеницы
-
-            /// <summary>
-            /// Отрисовка границ бульдозера
-            /// </summary> 
-
-            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 35, 20, 20); // Левое колесо гусеницы
-            g.DrawEllipse(pen, _startPosX + 115, _startPosY + 35, 20, 20); // Правое колесо гусеницы
-            g.DrawEllipse(pen, _startPosX + 50, _startPosY + 45, 10, 10); // 1 центральное колесо гусеницы
-            g.DrawEllipse(pen, _startPosX + 70, _startPosY + 45, 10, 10); // 2 центральное колесо гусеницы
-            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 45, 10, 10); // 3 центральное колесо гусеницы
-
-
-            /// <summary>
-            /// Кузов бульдозера
-            /// </summary>
-            g.FillRectangle(bodyBrush, _startPosX + 102, _startPosY, 28, 24); //кабина
-            g.FillRectangle(bodyBrush, _startPosX + 17, _startPosY + 24, 119, 18); // основная часть
-            g.FillRectangle(bodyBrush, _startPosX + 30, _startPosY, 10, 24); // выхлопная труба
-
-            /// <summary>
-            /// Корпус
-            /// </summary>
-            g.DrawRectangle(pen, _startPosX + 102, _startPosY, 28, 24); //кабина
-            g.DrawRectangle(pen, _startPosX + 17, _startPosY + 24, 119, 18); // основная часть
-            g.DrawRectangle(pen, _startPosX + 30, _startPosY, 10, 24); // выхлопная труба
-
-            
-            
-        }
-    }
-}

Bulldozer/Bulldozer/DrawingObjects/DrawingBulldozer.cs

@@ -0,0 +1,218 @@
+using Bulldozer.Entities;
+
+namespace Bulldozer.DrawingObjects
+{
+    /// <summary>
+    ///  Класс отрисовки и перемещения объекта-сущности
+    /// </summary>
+    public class DrawingBulldozer
+    {
+        /// <summary>
+        ///  Класс-сущность
+        /// </summary>
+        public EntityBulldozer? EntityBulldozer { get; protected set; }
+        /// <summary>
+        ///  Ширина окна
+        /// </summary>
+        private int _pictureWidth;
+        /// <summary>
+        ///  Высота окна
+        /// </summary>
+        private int _pictureHeight;
+        /// <summary>
+        ///  Координата прорисовки по оси X
+        /// </summary>
+        protected int _startPosX;
+        /// <summary>
+        ///  Координата прорисовки по оси Y
+        /// </summary>
+        protected int _startPosY;
+        /// <summary>
+        ///  Ширина бульдозера
+        /// </summary>
+        protected readonly int _bulldozerWidth = 150;
+        /// <summary>
+        ///  Высота бульдозера
+        /// </summary>
+        protected readonly int _bulldozerHeight = 60;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public DrawingBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, int width, int height)
+        {
+            if (width < _bulldozerWidth || height < _bulldozerHeight)
+            {
+                width += _bulldozerWidth * 2;
+                height += _bulldozerHeight * 2;
+            }
+            else
+            {
+                _pictureWidth = width;
+                _pictureHeight = height;
+                EntityBulldozer = new EntityBulldozer(speed, weight, bodyColor, additionalColor);
+            }
+        }
+
+        protected DrawingBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, int width, int height, int bulldozerWidth, int bulldozerHeight)
+        {
+            if (width < _bulldozerWidth || height < _bulldozerHeight)
+            {
+                width += _bulldozerWidth * 2;
+                height += _bulldozerHeight * 2;
+            }
+            else
+            {
+                _pictureWidth = width;
+                _pictureHeight = height;
+                EntityBulldozer = new EntityBulldozer(speed, weight, bodyColor, additionalColor);
+            }
+        }
+
+        /// <summary>
+        /// Установка позиции
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+
+        public void SetPosition(int x, int y)
+        {
+            if (x < 0 || y < 0)
+            {
+                _startPosX = 0; _startPosY = 0;
+            }
+            else
+            {
+                _startPosX = x;
+                _startPosY = y;
+            }
+        }
+
+        /// <summary>
+        /// Координата X объекта
+        /// </summary>
+        public int GetPosX => _startPosX;
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int GetPosY => _startPosY;
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _bulldozerWidth;
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _bulldozerHeight;
+        /// <summary>
+        /// Проверка, что объект может переместится по указанному направлению
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// <returns>true - можно переместится по указанному направлению</returns>
+        public bool CanMove(DirectionType direction)
+        {
+            if (EntityBulldozer == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                //влево
+                DirectionType.Left => _startPosX - EntityBulldozer.Step > 0,
+                //вверх
+                DirectionType.Up => _startPosY - EntityBulldozer.Step > 0,
+                // вправо
+                DirectionType.Right => _startPosX + EntityBulldozer.Step < _pictureWidth,
+                //вниз
+                DirectionType.Down => _startPosY + EntityBulldozer.Step < _pictureHeight,
+                _ => false,
+            };
+        }
+        /// <summary>
+        /// Изменение направления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public virtual void MoveBulldozer(DirectionType direction)
+        {
+            if (!CanMove(direction) || EntityBulldozer == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                //влево
+                case DirectionType.Left:
+                    _startPosX -= (int)EntityBulldozer.Step;
+                    break;
+                //вверх
+                case DirectionType.Up:
+                    _startPosY -= (int)EntityBulldozer.Step;
+                    break;
+                // вправо
+                case DirectionType.Right:
+                    _startPosX += (int)EntityBulldozer.Step;
+                    break;
+                //вниз
+                case DirectionType.Down:
+                    _startPosY += (int)EntityBulldozer.Step;
+                    break;
+            }
+        }
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void DrawBulldozer(Graphics g)
+        {
+            if (EntityBulldozer == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush bodyBrush = new SolidBrush(EntityBulldozer.BodyColor);
+            Brush additionalBrush = new SolidBrush(EntityBulldozer.AdditionalColor);
+
+            /// <summary>
+            /// Заливка гусеницы бульдозера 
+            /// </summary>
+            Brush brGray = new SolidBrush(Color.Gray);
+
+            g.FillEllipse(brGray, _startPosX + 17, _startPosY + 24, 119, 40); //Гусеница
+            g.FillEllipse(additionalBrush, _startPosX + 20, _startPosY + 35, 20, 20); // Левое колесо гусеницы
+            g.FillEllipse(additionalBrush, _startPosX + 115, _startPosY + 35, 20, 20); // Правое колесо гусеницы
+            g.FillEllipse(additionalBrush, _startPosX + 50, _startPosY + 45, 10, 10); // 1 центральное колесо гусеницы
+            g.FillEllipse(additionalBrush, _startPosX + 70, _startPosY + 45, 10, 10); // 2 центральное колесо гусеницы
+            g.FillEllipse(additionalBrush, _startPosX + 90, _startPosY + 45, 10, 10); // 3 центральное колесо гусеницы
+
+            /// <summary>
+            /// Отрисовка границ бульдозера
+            /// </summary> 
+
+            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 35, 20, 20); // Левое колесо гусеницы
+            g.DrawEllipse(pen, _startPosX + 115, _startPosY + 35, 20, 20); // Правое колесо гусеницы
+            g.DrawEllipse(pen, _startPosX + 50, _startPosY + 45, 10, 10); // 1 центральное колесо гусеницы
+            g.DrawEllipse(pen, _startPosX + 70, _startPosY + 45, 10, 10); // 2 центральное колесо гусеницы
+            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 45, 10, 10); // 3 центральное колесо гусеницы
+
+            /// <summary>
+            /// Кузов бульдозера
+            /// </summary>
+            g.FillRectangle(bodyBrush, _startPosX + 102, _startPosY, 28, 24); //кабина
+            g.FillRectangle(bodyBrush, _startPosX + 17, _startPosY + 24, 119, 18); // основная часть
+            g.FillRectangle(bodyBrush, _startPosX + 30, _startPosY, 10, 24); // выхлопная труба
+
+            /// Корпус
+            /// </summary>
+            g.DrawRectangle(pen, _startPosX + 102, _startPosY, 28, 24); //кабина
+            g.DrawRectangle(pen, _startPosX + 17, _startPosY + 24, 119, 18); // основная часть
+            g.DrawRectangle(pen, _startPosX + 30, _startPosY, 10, 24); // выхлопная труба
+        }
+    }
+
+}
+

Bulldozer/Bulldozer/DrawingObjects/DrawingUpgradedBulldozer.cs

@@ -0,0 +1,73 @@
+using Bulldozer.Entities;
+
+namespace Bulldozer.DrawingObjects
+{
+    public class DrawingBulldozerUpgraded : DrawingBulldozer
+    {
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="additionalColor">Цвет обвесов</param>
+        /// <param name="blade">Признак наличия рыхлителя</param>
+        /// <param name="ripper">Признак наличия отвала</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+
+
+        public DrawingBulldozerUpgraded(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool blade, bool ripper, int width, int height) :
+        base(speed, weight, bodyColor, additionalColor, width, height)
+        {
+            if (EntityBulldozer != null)
+            {
+                EntityBulldozer = new EntityBulldozerUpgraded(speed, weight, bodyColor, additionalColor, dopColor, blade, ripper);
+            }
+        }
+
+        public override void DrawBulldozer(Graphics g)
+        {
+            if (EntityBulldozer is not EntityBulldozerUpgraded upgradedBulldozer)
+            {
+                return;
+            }
+            Pen dopPen = new(upgradedBulldozer.DopColor);
+            Brush dopBrush = new SolidBrush(upgradedBulldozer.DopColor);
+            /// <summary>
+            /// Отрисовка отвала бульдозера
+            /// </summary>
+            base.DrawBulldozer(g);
+            if (upgradedBulldozer.Blade)
+            {
+                Point point1 = new Point(_startPosX + 8, _startPosY + 29);
+                Point point2 = new Point(_startPosX + 8, _startPosY + 50);
+                Point point3 = new Point(_startPosX, _startPosY + 50);
+                Point[] triangle = { point1, point2, point3 };
+
+                g.FillRectangle(dopBrush, _startPosX + 8, _startPosY + 29, 8, 8); // заливка основания отвала
+                g.FillPolygon(dopBrush, triangle); // заливка отвала
+
+                g.DrawRectangle(dopPen, _startPosX + 8, _startPosY + 29, 8, 8); // обводка основания отвала
+                g.DrawPolygon(dopPen, triangle); // обводка отвала
+            }
+            /// <summary>
+            /// Отрисовка рыхлителя бульдозера
+            /// </summary>
+            if (upgradedBulldozer.Ripper)
+            {
+                Point ripperPoint1 = new Point(_startPosX + 140, _startPosY + 37);
+                Point ripperPoint2 = new Point(_startPosX + 151, _startPosY + 37);
+                Point ripperPoint3 = new Point(_startPosX + 140, _startPosY + 60);
+                Point[] ripper = { ripperPoint1, ripperPoint2, ripperPoint3 };
+
+                g.FillRectangle(dopBrush, _startPosX + 136, _startPosY + 29, 15, 8); // заливка основания рыхлителя
+                g.FillPolygon(dopBrush, ripper); // заливка отвала
+
+                g.DrawRectangle(dopPen, _startPosX + 136, _startPosY + 29, 15, 8); // обводка основания рыхлителя
+                g.DrawPolygon(dopPen, ripper);
+            }
+        }
+    }
+}

Bulldozer/Bulldozer/Entities/EntityBulldozer.cs

@@ -0,0 +1,44 @@
+namespace Bulldozer.Entities
+{
+    /// <summary>
+    /// Класс-сущность "Бульдозер"
+    /// </summary>
+    public class EntityBulldozer
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weight { get; private set; }
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения бульдозера
+        /// </summary>
+        public double Step => (double)Speed * 100 / Weight;
+        /// <summary>
+        /// Конструктор с параметрами
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес бульдозера</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        public EntityBulldozer(int speed, double weight, Color bodyColor, Color additionalColor)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+            AdditionalColor = additionalColor;
+        }
+    }
+}
+

Bulldozer/Bulldozer/Entities/EntityBulldozerUpgraded.cs

@@ -0,0 +1,35 @@
+namespace Bulldozer.Entities
+{
+    public class EntityBulldozerUpgraded : EntityBulldozer
+    {
+        /// <summary>
+        /// Дополнительный цвет (для опциональных элементов)
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        ///  Отвал бульдозера
+        /// </summary>
+        public bool Blade { get; private set; }
+        /// <summary>
+        ///  Рыхлитель бульдозера
+        /// </summary>
+        public bool Ripper { get; private set; }
+        /// <summary>
+        /// Инициализация полей объекта-класса бульдозера с обвесами
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="additionalColor">Цвет обвесов</param>
+        /// <param name="blade">Отвал бульдозера</param>
+        /// <param name="ripper">Рыхлитель бульдозера</param>
+        public EntityBulldozerUpgraded(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool blade, bool ripper) :
+        base(speed, weight, bodyColor, additionalColor)
+        {
+            DopColor = dopColor;
+            Blade = blade;
+            Ripper = ripper;
+        }
+    }
+}

Bulldozer/Bulldozer/FormBulldozer.Designer.cs

@@ -28,121 +28,156 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pictureBoxBulldozer = new System.Windows.Forms.PictureBox();
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBulldozer)).BeginInit();
-            this.SuspendLayout();
+            pictureBoxBulldozer = new PictureBox();
+            buttonCreateBulldozer = new Button();
+            buttonLeft = new Button();
+            buttonDown = new Button();
+            buttonRight = new Button();
+            buttonUp = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStep = new Button();
+            buttonCreateUpgradedBulldozer = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxBulldozer).BeginInit();
+            SuspendLayout();
             // 
-            // pictureBox
+            // pictureBoxBulldozer
             // 
-            this.pictureBoxBulldozer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxBulldozer.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxBulldozer.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.pictureBoxBulldozer.Name = "pictureBoxBulldozer";
-            this.pictureBoxBulldozer.Size = new System.Drawing.Size(1010, 615);
-            this.pictureBoxBulldozer.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxBulldozer.TabIndex = 0;
-            this.pictureBoxBulldozer.TabStop = false;
+            pictureBoxBulldozer.Dock = DockStyle.Fill;
+            pictureBoxBulldozer.Location = new Point(0, 0);
+            pictureBoxBulldozer.Name = "pictureBoxBulldozer";
+            pictureBoxBulldozer.Size = new Size(884, 461);
+            pictureBoxBulldozer.SizeMode = PictureBoxSizeMode.AutoSize;
+            pictureBoxBulldozer.TabIndex = 0;
+            pictureBoxBulldozer.TabStop = false;
             // 
-            // buttonCreate
+            // buttonCreateBulldozer
             // 
-            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(14, 568);
-            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(86, 31);
-            this.buttonCreate.TabIndex = 1;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+            buttonCreateBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateBulldozer.Location = new Point(12, 426);
+            buttonCreateBulldozer.Name = "buttonCreateBulldozer";
+            buttonCreateBulldozer.Size = new Size(132, 23);
+            buttonCreateBulldozer.TabIndex = 1;
+            buttonCreateBulldozer.Text = "Создать бульдозер";
+            buttonCreateBulldozer.UseVisualStyleBackColor = true;
+            buttonCreateBulldozer.Click += buttonCreateBulldozer_Click;
             // 
             // buttonLeft
             // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::Bulldozer.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Image = global::Bulldozer.Properties.Resources.arrowLeft;
-            this.buttonLeft.Location = new System.Drawing.Point(867, 563);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(34, 40);
-            this.buttonLeft.TabIndex = 2;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonLeft.Image = Properties.Resources.arrowLeft;
+            buttonLeft.Location = new Point(759, 422);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(30, 30);
+            buttonLeft.TabIndex = 2;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
             // 
             // buttonDown
             // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::Bulldozer.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(909, 563);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(34, 40);
-            this.buttonDown.TabIndex = 3;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackgroundImage = Properties.Resources.arrowDown;
+            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonDown.Location = new Point(795, 422);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(30, 30);
+            buttonDown.TabIndex = 3;
+            buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += ButtonMove_Click;
             // 
             // buttonRight
             // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::Bulldozer.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Image = global::Bulldozer.Properties.Resources.arrowRight;
-            this.buttonRight.Location = new System.Drawing.Point(950, 563);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(34, 40);
-            this.buttonRight.TabIndex = 4;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.arrowRight;
+            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonRight.Image = Properties.Resources.arrowRight;
+            buttonRight.Location = new Point(831, 422);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(30, 30);
+            buttonRight.TabIndex = 4;
+            buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.Click += ButtonMove_Click;
             // 
             // buttonUp
             // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::Bulldozer.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Image = global::Bulldozer.Properties.Resources.arrowUp;
-            this.buttonUp.Location = new System.Drawing.Point(909, 515);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(34, 40);
-            this.buttonUp.TabIndex = 5;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.arrowUp;
+            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonUp.Image = Properties.Resources.arrowUp;
+            buttonUp.Location = new Point(795, 386);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(30, 30);
+            buttonUp.TabIndex = 5;
+            buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += ButtonMove_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "Движение к центру", "Движение к правой нижней границе" });
+            comboBoxStrategy.Location = new Point(642, 9);
+            comboBoxStrategy.Margin = new Padding(3, 2, 3, 2);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(232, 23);
+            comboBoxStrategy.TabIndex = 6;
+            // 
+            // buttonStep
+            // 
+            buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStep.Location = new Point(821, 35);
+            buttonStep.Name = "buttonStep";
+            buttonStep.Size = new Size(52, 23);
+            buttonStep.TabIndex = 7;
+            buttonStep.Text = "Шаг";
+            buttonStep.UseVisualStyleBackColor = true;
+            buttonStep.Click += buttonStep_Click;
+            // 
+            // buttonCreateUpgradedBulldozer
+            // 
+            buttonCreateUpgradedBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateUpgradedBulldozer.Location = new Point(150, 426);
+            buttonCreateUpgradedBulldozer.Name = "buttonCreateUpgradedBulldozer";
+            buttonCreateUpgradedBulldozer.Size = new Size(206, 23);
+            buttonCreateUpgradedBulldozer.TabIndex = 8;
+            buttonCreateUpgradedBulldozer.Text = "Создать бульдозер с обвесами";
+            buttonCreateUpgradedBulldozer.UseVisualStyleBackColor = true;
+            buttonCreateUpgradedBulldozer.Click += buttonCreateUpgradedBulldozer_Click;
             // 
             // FormBulldozer
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1010, 615);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxBulldozer);
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.Name = "FormBulldozer";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Bulldozer";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBulldozer)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(884, 461);
+            Controls.Add(buttonCreateUpgradedBulldozer);
+            Controls.Add(buttonStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonRight);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonLeft);
+            Controls.Add(buttonCreateBulldozer);
+            Controls.Add(pictureBoxBulldozer);
+            Name = "FormBulldozer";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Bulldozer";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxBulldozer).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
 
         private PictureBox pictureBoxBulldozer;
-        private Button buttonCreate;
+        private Button buttonCreateBulldozer;
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonUp;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStep;
+        private Button buttonCreateUpgradedBulldozer;
     }
 }

Bulldozer/Bulldozer/FormBulldozer.cs

@@ -1,7 +1,11 @@
+using Bulldozer.MovementStrategy;
+using Bulldozer.DrawingObjects;
+
 namespace Bulldozer
 {
     public partial class FormBulldozer : Form
     {
+
         private DrawingBulldozer? _drawingBulldozer;
 
         public FormBulldozer()
@@ -9,6 +13,11 @@ namespace Bulldozer
             InitializeComponent();
         }
 
+        /// <summary>
+        /// Ñòðàòåãèÿ ïåðåìåùåíèÿ
+        /// </summary>
+        private AbstractStrategy? _abstractStrategy;
+
         private void Draw()
         {
             if (_drawingBulldozer == null)
@@ -17,10 +26,16 @@ namespace Bulldozer
             }
             Bitmap bmp = new(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawingBulldozer.DrawTransport(gr);
+            _drawingBulldozer.DrawBulldozer(gr);
             pictureBoxBulldozer.Image = bmp;
         }
 
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü áóëüäîçåð ñ îáâåñàìè"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             if (_drawingBulldozer == null)
@@ -45,25 +60,63 @@ namespace Bulldozer
             }
             Draw();
         }
-        
-        private void ButtonCreate_Click(object sender, EventArgs e)
+
+        private void buttonCreateBulldozer_Click(object sender, EventArgs e)
         {
             Random random = new();
-            _drawingBulldozer = new DrawingBulldozer();
-            _drawingBulldozer.Init(random.Next(100, 300),
-            random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)), 
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            pictureBoxBulldozer.Width,
-            pictureBoxBulldozer.Height);
-            _drawingBulldozer.SetPosition(random.Next(10, 100),random.Next(10, 100));
+            _drawingBulldozer = new DrawingBulldozer(random.Next(100, 300), random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+            pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+            _drawingBulldozer.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
         }
+
+        private void buttonCreateUpgradedBulldozer_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawingBulldozer = new DrawingBulldozerUpgraded(random.Next(100, 300), random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
+            pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+            _drawingBulldozer.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+
+        private void buttonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawingBulldozer == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _abstractStrategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_abstractStrategy == null)
+                {
+                    return;
+                }
+                _abstractStrategy.SetData(new DrawingObjectBulldozer(_drawingBulldozer), pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+                comboBoxStrategy.Enabled = false;
+            }
+            if (_abstractStrategy == null)
+            {
+                return;
+            }
+            _abstractStrategy.MakeStep();
+            Draw();
+            if (_abstractStrategy.GetStatus() == Status.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _abstractStrategy = null;
+            }
+        }
     }
 }

Bulldozer/Bulldozer/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,126 @@
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Класс-стратегия перемещения объекта
+    /// </summary>
+    public abstract class AbstractStrategy
+    {
+        /// <summary>
+        /// Перемещаемый объект
+        /// </summary>
+        private IMoveableObject? _moveableObject;
+        /// <summary>
+        /// Статус перемещения
+        /// </summary>
+        private Status _state = Status.NotInit;
+        /// <summary>
+        /// Ширина поля
+        /// </summary>
+        protected int FieldWidth { get; private set; }
+        /// <summary>
+        /// Высота поля
+        /// </summary>
+        protected int FieldHeight { get; private set; }
+        /// <summary>
+        /// Статус перемещения
+        /// </summary>
+        public Status GetStatus() { return _state; }
+        /// <summary>
+        /// Установка данных
+        /// </summary>
+        /// <param name="moveableObject">Перемещаемый объект</param>
+        /// <param name="width">Ширина поля</param>
+        /// <param name="height">Высота поля</param>
+        public void SetData(IMoveableObject moveableObject, int width, int height)
+        {
+            if (moveableObject == null)
+            {
+                _state = Status.NotInit;
+                return;
+            }
+            _state = Status.InProgress;
+            _moveableObject = moveableObject;
+            FieldWidth = width;
+            FieldHeight = height;
+        }
+        /// <summary>
+        /// Шаг перемещения
+        /// </summary>
+        public void MakeStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return;
+            }
+            if (IsTargetDestinaion())
+            {
+                _state = Status.Finish;
+                return;
+            }
+            MoveToTarget();
+        }
+        /// <summary>
+        /// Перемещение влево
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveLeft() => MoveTo(DirectionType.Left);
+        /// <summary>
+        /// Перемещение вправо
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveRight() => MoveTo(DirectionType.Right);
+        /// <summary>
+        /// Перемещение вверх
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveUp() => MoveTo(DirectionType.Up);
+        /// <summary>
+        /// Перемещение вниз
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveDown() => MoveTo(DirectionType.Down);
+        /// <summary>
+        /// Параметры объекта
+        /// </summary>
+        protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+        /// <summary>
+        /// Шаг объекта
+        /// </summary>
+        /// <returns></returns>
+        protected int? GetStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return null;
+            }
+            return _moveableObject?.GetStep;
+        }
+        /// <summary>
+        /// Перемещение к цели
+        /// </summary>
+        protected abstract void MoveToTarget();
+        /// <summary>
+        /// Достигнута ли цель
+        /// </summary>
+        /// <returns></returns>
+        protected abstract bool IsTargetDestinaion();
+        /// <summary>
+        /// Попытка перемещения в требуемом направлении
+        /// </summary>
+        /// <param name="directionType">Направление</param>
+        /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+        private bool MoveTo(DirectionType directionType)
+        {
+            if (_state != Status.InProgress)
+            {
+                return false;
+            }
+            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            {
+                _moveableObject.MoveObject(directionType);
+                return true;
+            }
+            return false;
+        }
+    }
+}

Bulldozer/Bulldozer/MovementStrategy/DrawingObjectBulldozer.cs

@@ -0,0 +1,30 @@
+using Bulldozer.DrawingObjects;
+
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Реализация интерфейса IDrawingObject для работы с объектом DrawingBulldozer (паттерн Adapter)
+    /// </summary>
+    public class DrawingObjectBulldozer : IMoveableObject
+    {
+        private readonly DrawingBulldozer? _drawingBulldozer = null;
+        public DrawingObjectBulldozer(DrawingBulldozer drawingBulldozer)
+        {
+            _drawingBulldozer = drawingBulldozer;
+        }
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawingBulldozer == null || _drawingBulldozer.EntityBulldozer == null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawingBulldozer.GetPosX, _drawingBulldozer.GetPosY, _drawingBulldozer.GetWidth, _drawingBulldozer.GetHeight);
+            }
+        }
+        public int GetStep => (int)(_drawingBulldozer?.EntityBulldozer?.Step ?? 0);
+        public bool CheckCanMove(DirectionType direction) => _drawingBulldozer?.CanMove(direction) ?? false;
+        public void MoveObject(DirectionType direction) => _drawingBulldozer?.MoveBulldozer(direction);
+    }
+}

Bulldozer/Bulldozer/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,30 @@
+using Bulldozer.DrawingObjects;
+
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Интерфейс для работы с перемещаемым объектом
+    /// </summary>
+    public interface IMoveableObject
+    {
+        /// <summary>
+        /// Получение координаты X объекта
+        /// </summary>
+        ObjectParameters? GetObjectPosition { get; }
+        /// <summary>
+        /// Шаг объекта
+        /// </summary>
+        int GetStep { get; }
+        /// <summary>
+        /// Проверка, можно ли переместиться по нужному направлению
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        bool CheckCanMove(DirectionType direction);
+        /// <summary>
+        /// Изменение направления пермещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        void MoveObject(DirectionType direction);
+    }
+}

Bulldozer/Bulldozer/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,57 @@
+using Bulldozer.DrawingObjects;
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в правую нижнюю границу экрана
+    /// </summary>
+    public class MoveToBorder : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            
+            var objParams = GetObjectParameters;
+
+            return objParams != null 
+                && objParams.RightBorder <= FieldWidth
+                && objParams.RightBorder + GetStep() >= FieldWidth
+                && objParams.TopBorder <= FieldHeight
+                && objParams.DownBorder + GetStep() >= FieldHeight;
+        }
+
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+
+            var diffX = objParams.RightBorder - FieldWidth;
+            var diffY = objParams.DownBorder - FieldHeight;
+
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

Bulldozer/Bulldozer/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,51 @@
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в центр экрана
+    /// </summary>
+    public class MoveToCenter : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+        }
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

Bulldozer/Bulldozer/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,51 @@
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Параметры-координаты объекта
+    /// </summary>
+    public class ObjectParameters
+    {
+        private readonly int _x;
+        private readonly int _y;
+        private readonly int _width;
+        private readonly int _height;
+        /// <summary>
+        /// Левая граница
+        /// </summary>
+        public int LeftBorder => _x;
+        /// <summary>
+        /// Верхняя граница
+        /// </summary>
+        public int TopBorder => _y;
+        /// <summary>
+        /// Правая граница
+        /// </summary>
+        public int RightBorder => _x + _width;
+        /// <summary>
+        /// Нижняя граница
+        /// </summary>
+        public int DownBorder => _y + _height;
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
+        public int ObjectMiddleHorizontal => _x + _width / 2;
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
+        public int ObjectMiddleVertical => _y + _height / 2;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
+        public ObjectParameters(int x, int y, int width, int height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+    }
+}

Bulldozer/Bulldozer/MovementStrategy/Status.cs

@@ -0,0 +1,12 @@
+namespace Bulldozer.MovementStrategy
+{
+    /// <summary>
+    /// Статус выполнения операции перемещения
+    /// </summary>
+    public enum Status
+    {
+        NotInit,
+        InProgress,
+        Finish
+    }
+}

Bulldozer/Bulldozer/Program.cs

@@ -1,4 +1,4 @@
-namespace Bulldozer
+namespace Bulldozer.MovementStrategy
 {
     internal static class Program
     {
@@ -8,7 +8,6 @@ namespace Bulldozer
         [STAThread]
         static void Main()
         {
-
             ApplicationConfiguration.Initialize();
             Application.Run(new FormBulldozer());
         }