Исправление ошибок. Форматирование кода

ProjectBulldozer/Direction.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer
-{
-    internal enum Direction
-    {
-
-        Up = 1,
-
-        Down = 2,
-
-        Left = 3,
-
-        Right = 4
-
-    }
-}

ProjectBulldozer/DirectionType.cs

@@ -0,0 +1,10 @@
+namespace ProjectBulldozer
+{
+    public enum DirectionType
+    {
+        Up = 1,
+        Down = 2,
+        Left = 3,
+        Right = 4,
+    }
+}

ProjectBulldozer/Drawning/DrawingBulldozer.cs

@@ -0,0 +1,60 @@
+using ProjectBulldozer.Entities;
+namespace ProjectBulldozer.Drawning
+{
+    public class DrawingBulldozer : DrawingTractor
+    {
+        public DrawingBulldozer(int speed, double weight, Color bodyColor, Color additionalColor,
+            bool horns, bool seifBatteries, int width, int height) : base(speed, weight, bodyColor, width, height, 120, 110)
+        {
+            if (EntityTractor != null)
+            {
+                EntityTractor = new EntityBulldozer(speed, width, bodyColor, additionalColor, horns, seifBatteries);
+            }
+        }
+        public object Otval { get; private set; }
+        public override void DrawTransport(Graphics g)
+        {
+            if (EntityTractor is not EntityBulldozer Bulldozer)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush blackBrush = new SolidBrush(Color.Black);
+            Brush windows = new SolidBrush(Color.LightBlue);
+            Brush bodyColor = new SolidBrush(Bulldozer.BodyColor);
+            Brush additionalColor = new SolidBrush(Bulldozer.AdditionalColor);
+            Brush grayBrush = new SolidBrush(Color.Gray);
+            //otval
+            Point[] Otval =
+      {
+                new Point(_startPosX + 118, _startPosY + 50),
+                new Point(_startPosX + 148, _startPosY + 111),
+                new Point(_startPosX+ 118, _startPosY + 111),
+
+
+            };
+            g.FillPolygon(additionalColor, Otval);
+            g.DrawPolygon(pen, Otval);
+            //гусеницы
+            Brush gg = new SolidBrush(Color.LightGray);
+            g.FillEllipse(gg, _startPosX + 16, _startPosY + 65, 101, 63);
+            g.DrawEllipse(pen, _startPosX + 16, _startPosY + 65, 101, 63);
+            g.FillEllipse(grayBrush, _startPosX + 65, _startPosY + 100, 13, 13);
+            g.DrawEllipse(pen, _startPosX + 65, _startPosY + 100, 13, 13);
+            Point[] Ttt =
+          {
+                new Point(_startPosX + 16, _startPosY + 79),
+                new Point(_startPosX + 16, _startPosY + 120),
+                new Point(_startPosX, _startPosY + 48),
+
+            };
+            g.FillPolygon(blackBrush, Ttt);
+            g.DrawPolygon(pen, Ttt);
+            if (Bulldozer.SeifBatteries)
+            {
+                g.FillRectangle(blackBrush, _startPosX + 110, _startPosY + 60, 5, 10);
+            }
+            base.DrawTransport(g);
+        }
+    }
+}

ProjectBulldozer/Drawning/DrawingTractor.cs

@@ -0,0 +1,137 @@
+using ProjectBulldozer.Entities;
+using ProjectBulldozer.MovementStrategy;
+
+namespace ProjectBulldozer.Drawning
+{
+    public class DrawingTractor
+    {
+        public EntityTractor? EntityTractor { get; protected set; }
+        protected int _pictureWidth;
+        protected int _pictureHeight;
+        protected int _startPosX;
+        protected int _startPosY;
+        protected readonly int _tractWidth = 120;
+        protected readonly int _tractHeight = 110;
+        public int GetPosX => _startPosX;
+        public int GetPosY => _startPosY;
+        public int GetWidth => _tractWidth;
+        public int GetHeight => _tractHeight;
+        public IMoveableObject GetMoveableObject => new DrawingObjectTractor(this);
+        public DrawingTractor(int speed, double weight, Color bodyColor, int width, int heigth)
+        {
+            if (width < _tractWidth || heigth < _tractHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = heigth;
+            EntityTractor = new EntityTractor(speed, weight, bodyColor);
+        }
+        protected DrawingTractor(int speed, double weight, Color bodyColor, int width,
+            int height, int tractWidth, int tractHeight)
+        {
+            if (width < _tractWidth || height < _tractHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            _tractWidth = tractWidth;
+            _tractHeight = tractHeight;
+            EntityTractor = new EntityTractor(speed, weight, bodyColor);
+        }
+        //Установка позиции
+        public void SetPosition(int x, int y)
+        {
+            if (x < 0 || x + _tractWidth > _pictureWidth)
+            {
+                x = _pictureWidth - _tractWidth;
+            }
+            if (y < 0 || y + _tractHeight > _pictureHeight)
+            {
+                y = _pictureHeight - _tractHeight;
+            }
+            _startPosX = x;
+            _startPosY = y;
+        }
+
+        public void MoveTransport(DirectionType direction)
+        {
+            if (EntityTractor == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                case DirectionType.Left:
+                    if (_startPosX - EntityTractor.Step > 0)
+                    {
+                        _startPosX -= (int)EntityTractor.Step;
+                    }
+                    break;
+                case DirectionType.Up:
+                    if (_startPosY - EntityTractor.Step > 0)
+                    {
+                        _startPosY -= (int)EntityTractor.Step;
+                    }
+                    break;
+                case DirectionType.Right:
+                    if (_startPosX + EntityTractor.Step + _tractWidth < _pictureWidth)
+                    {
+                        _startPosX += (int)EntityTractor.Step;
+                    }
+                    break;
+                case DirectionType.Down:
+                    if (_startPosY + EntityTractor.Step + _tractHeight < _pictureHeight)
+                    {
+                        _startPosY += (int)EntityTractor.Step;
+                    }
+                    break;
+            }
+        }
+
+        public virtual void DrawTransport(Graphics g)
+        {
+            {
+                if (EntityTractor == null) return;
+            }
+            Pen pen = new(Color.Black);
+            Brush brownBrush = new SolidBrush(Color.Brown);
+            Brush windows = new SolidBrush(Color.LightYellow);
+            Brush bodyColor = new SolidBrush(EntityTractor.BodyColor);
+            Brush grayBrush = new SolidBrush(Color.Gray);
+            //основное тело
+            g.FillRectangle(bodyColor, _startPosX + 18, _startPosY + 42, 99, 56);
+            g.DrawRectangle(pen, _startPosX + 18, _startPosY + 42, 99, 56);
+            //кабина водителя
+            g.FillRectangle(windows, _startPosX + 18, _startPosY + 4 , 37, 37);
+            g.DrawRectangle(pen, _startPosX + 18, _startPosY +4 , 37, 37);
+            //колеса
+            g.FillEllipse(grayBrush, _startPosX + 19, _startPosY + 76, 45, 45);
+            g.DrawEllipse(pen, _startPosX + 19, _startPosY + 76, 45, 45);
+            g.FillEllipse(grayBrush, _startPosX + 80, _startPosY + 87, 33, 33);
+            g.DrawEllipse(pen, _startPosX + 80, _startPosY + 87, 33, 33);
+            //выхлопная труба
+            g.FillRectangle(brownBrush, _startPosX + 88, _startPosY+ 6, 14, 35);
+            g.DrawRectangle(pen, _startPosX + 88, _startPosY + 6, 14, 35);
+        }
+        public bool CanMove(DirectionType direction)
+        {
+            if (EntityTractor == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                //влево
+                DirectionType.Left => _startPosX - EntityTractor.Step > 0,
+                //вверх
+                DirectionType.Up => _startPosY - EntityTractor.Step > 0,
+                // вправо
+                DirectionType.Right => _startPosX + EntityTractor.Step < _pictureWidth,
+                //вниз
+                DirectionType.Down => _startPosY + EntityTractor.Step < _pictureHeight,
+            };
+        }
+    }
+}

ProjectBulldozer/DrawningBulldozer.cs

@@ -1,207 +0,0 @@
-
-
-namespace ProjectBulldozer
-{
-    internal class DrawningBulldozer
-    {
-
-        public EntityBulldozer? EntityBulldozer { get; private set; }
-
-        private int _pictureWidth;
-
-        private int _pictureHeight;
-
-        private int _startPosX;
-
-        private int _startPosY;
-
-        private readonly int _BulldozerWidth = 180;
-
-        private readonly int _BulldozerHeight = 140;
-
-        public bool Init(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool additionalEngine, bool additionalCompartment, int width, int height)
-        {
-            if (_pictureWidth < _BulldozerWidth | _pictureHeight < _BulldozerHeight)
-            {
-                _pictureWidth = width;
-                _pictureHeight = height;
-                EntityBulldozer = new EntityBulldozer();
-                EntityBulldozer.Init(speed, weight, bodyColor, additionalColor,
-                additionalEngine, additionalCompartment);
-                return true;
-            }
-            else return false;
-        }
-
-        public void SetPosition(int x, int y)
-        {
-            if (_startPosY + _BulldozerHeight < _pictureHeight)
-                _startPosY = y;
-            else
-                _startPosY = _pictureHeight - _BulldozerHeight;
-            if (_startPosX + _BulldozerWidth < _pictureWidth)
-                _startPosX = x;
-            else
-                _startPosX = _pictureWidth - _BulldozerWidth;
-        }
-
-        public void MoveTransport(Direction direction)
-        {
-            if (EntityBulldozer == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                //влево
-                case Direction.Left:
-                    if (_startPosX - EntityBulldozer.Step > 0)
-                    {
-                        _startPosX -= (int)EntityBulldozer.Step;
-                    }
-                    else _startPosX = 0;
-                    break;
-                //вверх
-                case Direction.Up:
-                    if (_startPosY - EntityBulldozer.Step > 0)
-                    {
-                        _startPosY -= (int)EntityBulldozer.Step;
-                    }
-                    else _startPosY = 0;
-                    break;
-                // вправо
-                case Direction.Right:
-                    if (_startPosX + _BulldozerWidth + EntityBulldozer.Step < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityBulldozer.Step;
-                    }
-                    else _startPosX = _pictureWidth - _BulldozerWidth;
-                    break;
-                //вниз
-                case Direction.Down:
-                    if (_startPosY + _BulldozerHeight + EntityBulldozer.Step < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityBulldozer.Step;
-                    }
-                    else _startPosY = _pictureHeight - _BulldozerHeight;
-                    break;
-            }
-        }
-
-        public void DrawTransport(Graphics g)
-        {
-            if (EntityBulldozer == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush brush = new SolidBrush(Color.Black);
-            Brush bl = new SolidBrush(EntityBulldozer.AdditionalColor);
-            Brush bodyBrush = new SolidBrush(EntityBulldozer.BodyColor);
-            Brush bodyBrush2 = new SolidBrush(EntityBulldozer.AdditionalColor);
-
-
-
-
-            //основное тело
-            g.FillRectangle(bodyBrush, _startPosX + 20, _startPosY + 40, 120, 60);
-
-            g.DrawRectangle(pen, _startPosX + 20, _startPosY + 40, 120, 60);
-
-
-
-            //Гусеницы
-            Brush gg = new SolidBrush(Color.LightGray);
-            g.FillEllipse(gg, _startPosX + 23, _startPosY + 101, 118, 35);
-            g.DrawEllipse(pen, _startPosX + 23, _startPosY + 101, 118, 35);
-
-
-
-
-            g.DrawEllipse(pen, _startPosX + 26, _startPosY + 103, 110, 30);
-
-            //катки в гусеницах
-            Brush gr = new SolidBrush(Color.Gray);
-            g.FillEllipse(gr, _startPosX + 40, _startPosY + 108, 20, 20);
-            g.DrawEllipse(pen, _startPosX + 40, _startPosY + 108, 20, 20);
-
-
-            g.FillEllipse(gr, _startPosX + 65, _startPosY + 110, 20, 20);
-            g.DrawEllipse(pen, _startPosX + 65, _startPosY + 110, 20, 20);
-
-            g.FillEllipse(gr, _startPosX + 115, _startPosY + 110, 15, 15);
-            g.DrawEllipse(pen, _startPosX + 115, _startPosY + 110, 15, 15);
-
-            g.FillEllipse(gr, _startPosX + 90, _startPosY + 110, 20, 20);
-            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 110, 20, 20);
-
-
-
-
-            //кабина водителя
-            g.FillRectangle(bodyBrush2, _startPosX + 20, _startPosY, 40, 40);
-            g.DrawRectangle(pen, _startPosX + 20, _startPosY, 40, 40);
-
-
-            //выхлопная труба
-            Brush brBr = new SolidBrush(Color.Brown);
-
-            g.FillRectangle(brBr, _startPosX + 110, _startPosY, 15, 40);
-            g.DrawRectangle(pen, _startPosX + 110, _startPosY, 15, 40);
-
-
-
-            //Brush bl = new SolidBrush(Color.LightYellow);
-            /////////отвал
-            ///
-            Point[] Otval =
-          {
-                new Point(_startPosX + 142, _startPosY + 70),
-                new Point(_startPosX + 172, _startPosY + 130),
-                new Point(_startPosX+ 142, _startPosY + 130),
-
-
-            };
-
-            g.FillPolygon(bl, Otval);
-            g.DrawPolygon(pen, Otval);
-
-
-
-            Brush black = new SolidBrush(Color.Black);
-            Point[] Rihl =
-           {
-                new Point(_startPosX + 18 , _startPosY + 60),
-                new Point(_startPosX + 18, _startPosY + 80),
-                new Point(_startPosX, _startPosY + 120),
-
-            };
-
-            g.FillPolygon(black, Rihl);
-            g.DrawPolygon(pen, Rihl);
-
-
-
-            Point[] Ttt =
-           {
-                new Point(_startPosX + 18 , _startPosY + 80),
-                new Point(_startPosX + 18, _startPosY + 120),
-                new Point(_startPosX, _startPosY + 50),
-
-            };
-            g.FillPolygon(black, Ttt);
-            g.DrawPolygon(pen, Ttt);
-
-
-
-
-
-
-
-
-
-
-        }
-    }
-}

ProjectBulldozer/Entities/EntityBulldozer.cs

@@ -0,0 +1,16 @@
+namespace ProjectBulldozer.Entities
+{
+    public class EntityBulldozer : EntityTractor
+    {
+        public Color AdditionalColor { get; private set; }
+        public bool Horns { get; private set; }
+        public bool SeifBatteries { get; private set; }
+        public EntityBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, bool horns,
+            bool seifBatteries) : base(speed, weight, bodyColor)
+        {
+            AdditionalColor = additionalColor;
+            Horns = horns;
+            SeifBatteries = seifBatteries;
+        }
+    }
+}

ProjectBulldozer/Entities/EntityTractor.cs

@@ -0,0 +1,16 @@
+namespace ProjectBulldozer.Entities
+{
+    public class EntityTractor
+    {
+        public int Speed { get; private set; }
+        public double Weight { get; private set; }
+        public Color BodyColor { get; private set; }
+        public double Step => (double)Speed * 100 / Weight;
+        public EntityTractor(int speed, double weight, Color bodyColor)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

ProjectBulldozer/EntityBulldozer.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer
-{
-    public class EntityBulldozer
-    {
-
-
-        public int Speed { get; private set; }
-        public double Weight { get; private set; }
-        public Color BodyColor { get; private set; }
-        public Color AdditionalColor { get; private set; }
-        public bool AdditionalEngine { get; private set; }
-        public bool AdditionalCompartment { get; private set; }
-        public double Step => (double)Speed * 240 / Weight;
-
-
-        /// <summary>
-        /// Инициализация полей объекта-класса бульдозера
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес бульдозера</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="additionalEngine">Признак наличия дополнительного катка</param>
-        /// <param name="additionalCompartment">Признак наличия гусениц</param>
-        public void Init(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool additionalEngine, bool additionalCompartment)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalEngine = additionalEngine;
-            AdditionalColor = additionalColor;
-
-            AdditionalCompartment = additionalCompartment;
-        }
-    }
-}

ProjectBulldozer/FormBulldozer.Designer.cs

@@ -1,10 +1,8 @@
-namespace ProjectBulldozer
+
+namespace Bulldozer
 {
     partial class FormBulldozer
     {
-        /// <summary>
-        ///  Required designer variable.
-        /// </summary>
         private System.ComponentModel.IContainer components = null;
 
         /// <summary>
@@ -19,9 +17,7 @@
             }
             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.
@@ -30,11 +26,15 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBulldozer));
             pictureBoxBulldozer = new PictureBox();
-            buttonCreate = new Button();
+            buttonCreateBulldozer = new Button();
             buttonLeft = new Button();
             buttonUp = new Button();
             buttonRight = new Button();
             buttonDown = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonCreateTractor = new Button();
+            buttonStep = new Button();
+            ButtonSelect_Tractor = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBulldozer).BeginInit();
             SuspendLayout();
             // 
@@ -42,31 +42,34 @@
             // 
             pictureBoxBulldozer.Dock = DockStyle.Fill;
             pictureBoxBulldozer.Location = new Point(0, 0);
+            pictureBoxBulldozer.Margin = new Padding(2);
             pictureBoxBulldozer.Name = "pictureBoxBulldozer";
-            pictureBoxBulldozer.Size = new Size(884, 461);
+            pictureBoxBulldozer.Size = new Size(870, 572);
             pictureBoxBulldozer.SizeMode = PictureBoxSizeMode.AutoSize;
             pictureBoxBulldozer.TabIndex = 0;
             pictureBoxBulldozer.TabStop = false;
             // 
-            // buttonCreate
+            // buttonCreateBulldozer
             // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 426);
+            buttonCreateBulldozer.Location = new Point(20, 514);
-            buttonCreate.Name = "buttonCreate";
+            buttonCreateBulldozer.Margin = new Padding(2);
-            buttonCreate.Size = new Size(75, 23);
+            buttonCreateBulldozer.Name = "buttonCreateBulldozer";
-            buttonCreate.TabIndex = 1;
+            buttonCreateBulldozer.Size = new Size(88, 48);
-            buttonCreate.Text = "Создать";
+            buttonCreateBulldozer.TabIndex = 1;
-            buttonCreate.UseVisualStyleBackColor = true;
+            buttonCreateBulldozer.Text = "Создать бульдозер";
-            buttonCreate.Click += buttonCreate_Click;
+            buttonCreateBulldozer.UseVisualStyleBackColor = true;
+            buttonCreateBulldozer.Click += buttonCreateBulldozer_Click;
             // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
             buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.Location = new Point(769, 419);
+            buttonLeft.Location = new Point(732, 522);
+            buttonLeft.Margin = new Padding(2);
             buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(30, 30);
+            buttonLeft.Size = new Size(40, 33);
             buttonLeft.TabIndex = 2;
             buttonLeft.UseVisualStyleBackColor = true;
             buttonLeft.Click += buttonMove_Click;
@@ -76,11 +79,11 @@
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage");
             buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.Location = new Point(805, 383);
+            buttonUp.Location = new Point(776, 485);
+            buttonUp.Margin = new Padding(2);
             buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(30, 30);
+            buttonUp.Size = new Size(40, 33);
             buttonUp.TabIndex = 3;
-            buttonUp.TextAlign = ContentAlignment.BottomRight;
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += buttonMove_Click;
             // 
@@ -89,9 +92,10 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage");
             buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.Location = new Point(841, 419);
+            buttonRight.Location = new Point(819, 522);
+            buttonRight.Margin = new Padding(2);
             buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(30, 30);
+            buttonRight.Size = new Size(40, 33);
             buttonRight.TabIndex = 4;
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += buttonMove_Click;
@@ -101,38 +105,97 @@
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage");
             buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.Location = new Point(805, 419);
+            buttonDown.Location = new Point(776, 522);
+            buttonDown.Margin = new Padding(2);
             buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(30, 30);
+            buttonDown.Size = new Size(40, 33);
             buttonDown.TabIndex = 5;
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.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(740, 8);
+            comboBoxStrategy.Margin = new Padding(2);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(113, 23);
+            comboBoxStrategy.TabIndex = 6;
+            comboBoxStrategy.SelectedIndexChanged += comboBoxStrategy_SelectedIndexChanged;
+            // 
+            // buttonCreateTractor
+            // 
+            buttonCreateTractor.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateTractor.Location = new Point(122, 514);
+            buttonCreateTractor.Margin = new Padding(2);
+            buttonCreateTractor.Name = "buttonCreateTractor";
+            buttonCreateTractor.Size = new Size(88, 48);
+            buttonCreateTractor.TabIndex = 7;
+            buttonCreateTractor.Text = "Создать трактор";
+            buttonCreateTractor.UseVisualStyleBackColor = true;
+            buttonCreateTractor.Click += buttonCreateTractor_Click;
+            // 
+            // buttonStep
+            // 
+            buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStep.Location = new Point(755, 39);
+            buttonStep.Margin = new Padding(2);
+            buttonStep.Name = "buttonStep";
+            buttonStep.Size = new Size(88, 28);
+            buttonStep.TabIndex = 8;
+            buttonStep.Text = "Шаг";
+            buttonStep.UseVisualStyleBackColor = true;
+            buttonStep.Click += buttonStep_Click;
+            // 
+            // ButtonSelect_Tractor
+            // 
+            ButtonSelect_Tractor.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            ButtonSelect_Tractor.Location = new Point(755, 71);
+            ButtonSelect_Tractor.Margin = new Padding(2);
+            ButtonSelect_Tractor.Name = "ButtonSelect_Tractor";
+            ButtonSelect_Tractor.Size = new Size(88, 28);
+            ButtonSelect_Tractor.TabIndex = 9;
+            ButtonSelect_Tractor.Text = "Выбрать";
+            ButtonSelect_Tractor.UseVisualStyleBackColor = true;
+            ButtonSelect_Tractor.Click += ButtonSelect_Tractor_Click;
+            // 
             // FormBulldozer
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 461);
+            ClientSize = new Size(870, 572);
+            Controls.Add(ButtonSelect_Tractor);
+            Controls.Add(buttonStep);
+            Controls.Add(buttonCreateTractor);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
             Controls.Add(buttonUp);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
+            Controls.Add(buttonCreateBulldozer);
             Controls.Add(pictureBoxBulldozer);
+            Margin = new Padding(2);
             Name = "FormBulldozer";
-            Text = "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 buttonUp;
         private Button buttonRight;
         private Button buttonDown;
+        private ComboBox comboBoxStrategy;
+        private Button buttonCreateTractor;
+        private Button buttonStep;
+        private Button ButtonSelect_Tractor;
+        private EventHandler comboBoxStrategy_SelectedIndexChanged;
     }
 }

ProjectBulldozer/FormBulldozer.cs

@@ -1,51 +1,72 @@
-namespace ProjectBulldozer
+using ProjectBulldozer;
+using ProjectBulldozer.Drawning;
+using ProjectBulldozer.MovementStrategy;
+using System;
+using System.Windows.Forms;
+
+namespace Bulldozer
 {
     public partial class FormBulldozer : Form
     {
-
+        private DrawingTractor? _drawingTractor;
-        private DrawningBulldozer? _drawningBulldozer;
+        private AbstractStrategy? _abstractStrategy;
-
+        public DrawingTractor? SelectedTractor { get; private set; }
         public FormBulldozer()
         {
             InitializeComponent();
+            _abstractStrategy = null;
+            SelectedTractor = null;
         }
-
         private void Draw()
         {
-            if (_drawningBulldozer == null)
+            if (_drawingTractor == null)
             {
                 return;
             }
-            Bitmap bmp = new(pictureBoxBulldozer.Width,
+            Bitmap bmp = new(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
-            pictureBoxBulldozer.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningBulldozer.DrawTransport(gr);
+            _drawingTractor.DrawTransport(gr);
             pictureBoxBulldozer.Image = bmp;
         }
-
+        private void buttonCreateBulldozer_Click(object sender, EventArgs e)
-
-
-        private void buttonCreate_Click(object sender, EventArgs e)
         {
-            Random random = new();
+            Random random = new Random();
-            _drawningBulldozer = new DrawningBulldozer();
+            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            _drawningBulldozer.Init(random.Next(100, 300),
+
-            random.Next(1000, 3000),
+            ColorDialog colorDialog = new ColorDialog();
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+
-            random.Next(0, 256)),
+            if (colorDialog.ShowDialog() == DialogResult.OK)
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            {
-            random.Next(0, 256)),
+                color = colorDialog.Color;
-            Convert.ToBoolean(random.Next(0, 2)),
+            }
-            Convert.ToBoolean(random.Next(0, 2)),
+            Color dopColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            if (colorDialog.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = colorDialog.Color;
+            }
+            _drawingTractor = new DrawingBulldozer(random.Next(100, 300), random.Next(1000, 3000), color, dopColor,
+            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
             pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
-            _drawningBulldozer.SetPosition(random.Next(10, 100),
+            _drawingTractor.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            random.Next(10, 100));
+            Draw();
+        }
+        private void buttonCreateTractor_Click(object sender, EventArgs e)
+        {
+            Random rnd = new Random();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog colorDialog = new ColorDialog();
+            if (colorDialog.ShowDialog() == DialogResult.OK)
+            {
+                color = colorDialog.Color;
+            }
+            _drawingTractor = new DrawingTractor(rnd.Next(100, 300), rnd.Next(1000, 3000), color,
+                pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+            _drawingTractor.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100));
             Draw();
         }
-
         private void buttonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningBulldozer == null)
+            if (_drawingTractor == null)
             {
                 return;
             }
@@ -53,20 +74,58 @@ namespace ProjectBulldozer
             switch (name)
             {
                 case "buttonUp":
-                    _drawningBulldozer.MoveTransport(Direction.Up);
+                    _drawingTractor.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    _drawningBulldozer.MoveTransport(Direction.Down);
+                    _drawingTractor.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    _drawningBulldozer.MoveTransport(Direction.Left);
+                    _drawingTractor.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    _drawningBulldozer.MoveTransport(Direction.Right);
+                    _drawingTractor.MoveTransport(DirectionType.Right);
                     break;
             }
             Draw();
         }
+        private void buttonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawingTractor == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _abstractStrategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToRightCorner(),
+                    _ => null,
+                };
+                if (_abstractStrategy == null)
+                {
+                    return;
+                }
+                _abstractStrategy.SetData(_drawingTractor.GetMoveableObject, pictureBoxBulldozer.Width,
+                pictureBoxBulldozer.Height);
+            }
+            if (_abstractStrategy == null)
+            {
+                return;
+            }
+            comboBoxStrategy.Enabled = false;
+            _abstractStrategy.MakeStep();
+            Draw();
+            if (_abstractStrategy.GetStatus() == Status.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _abstractStrategy = null;
+            }
+        }
+        private void ButtonSelect_Tractor_Click(object sender, EventArgs e)
+        {
+            SelectedTractor = _drawingTractor;
+            DialogResult = DialogResult.OK;
+        }
     }
-
 }

ProjectBulldozer/FormBulldozerCollections.Designer.cs

@@ -0,0 +1,210 @@
+
+namespace ProjectBulldozer
+{
+    partial class FormTractorCollections
+    {
+        /// <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()
+        {
+            components = new System.ComponentModel.Container();
+            maskedTextBoxNumber = new MaskedTextBox();
+            ButtonRefreshCollection = new Button();
+            ButtonRemoveTractor = new Button();
+            ButtonAddTractor = new Button();
+            pictureBoxCollections = new PictureBox();
+            textBoxStorageName = new TextBox();
+            bindingSource1 = new BindingSource(components);
+            bindingSource2 = new BindingSource(components);
+            groupBox1 = new GroupBox();
+            listBoxStorage = new ListBox();
+            ButtonAddObject = new Button();
+            ButtonRemoveObject = new Button();
+            Instruments = new GroupBox();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollections).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)bindingSource2).BeginInit();
+            groupBox1.SuspendLayout();
+            Instruments.SuspendLayout();
+            SuspendLayout();
+            // 
+            // maskedTextBoxNumber
+            // 
+            maskedTextBoxNumber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBoxNumber.Location = new Point(33, 399);
+            maskedTextBoxNumber.Margin = new Padding(3, 2, 3, 2);
+            maskedTextBoxNumber.Mask = "0";
+            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            maskedTextBoxNumber.Size = new Size(131, 23);
+            maskedTextBoxNumber.TabIndex = 4;
+            // 
+            // ButtonRefreshCollection
+            // 
+            ButtonRefreshCollection.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            ButtonRefreshCollection.Location = new Point(33, 499);
+            ButtonRefreshCollection.Margin = new Padding(3, 2, 3, 2);
+            ButtonRefreshCollection.Name = "ButtonRefreshCollection";
+            ButtonRefreshCollection.Size = new Size(131, 31);
+            ButtonRefreshCollection.TabIndex = 2;
+            ButtonRefreshCollection.Text = "Обновить все";
+            ButtonRefreshCollection.UseVisualStyleBackColor = true;
+            // 
+            // ButtonRemoveTractor
+            // 
+            ButtonRemoveTractor.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            ButtonRemoveTractor.Location = new Point(33, 444);
+            ButtonRemoveTractor.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveTractor.Name = "ButtonRemoveTractor";
+            ButtonRemoveTractor.Size = new Size(131, 33);
+            ButtonRemoveTractor.TabIndex = 1;
+            ButtonRemoveTractor.Text = "Удалить объект";
+            ButtonRemoveTractor.UseVisualStyleBackColor = true;
+            ButtonRemoveTractor.Click += ButtonRemoveTractor_Click;
+            // 
+            // ButtonAddTractor
+            // 
+            ButtonAddTractor.Anchor = AnchorStyles.Top;
+            ButtonAddTractor.Location = new Point(33, 346);
+            ButtonAddTractor.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddTractor.Name = "ButtonAddTractor";
+            ButtonAddTractor.Size = new Size(131, 29);
+            ButtonAddTractor.TabIndex = 0;
+            ButtonAddTractor.Text = "Добавить объект";
+            ButtonAddTractor.UseVisualStyleBackColor = true;
+            ButtonAddTractor.Click += ButtonAddTractor_Click;
+            // 
+            // pictureBoxCollections
+            // 
+            pictureBoxCollections.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+            pictureBoxCollections.Location = new Point(4, 4);
+            pictureBoxCollections.Margin = new Padding(3, 2, 3, 2);
+            pictureBoxCollections.Name = "pictureBoxCollections";
+            pictureBoxCollections.Size = new Size(693, 541);
+            pictureBoxCollections.TabIndex = 1;
+            pictureBoxCollections.TabStop = false;
+            // 
+            // textBoxStorageName
+            // 
+            textBoxStorageName.Location = new Point(27, 32);
+            textBoxStorageName.Name = "textBoxStorageName";
+            textBoxStorageName.Size = new Size(131, 23);
+            textBoxStorageName.TabIndex = 5;
+            textBoxStorageName.TextChanged += textBoxStorageName_TextChanged;
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(listBoxStorage);
+            groupBox1.Controls.Add(ButtonAddObject);
+            groupBox1.Controls.Add(ButtonRemoveObject);
+            groupBox1.Controls.Add(textBoxStorageName);
+            groupBox1.Location = new Point(6, 22);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(189, 296);
+            groupBox1.TabIndex = 5;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Наборы";
+            // 
+            // listBoxStorage
+            // 
+            listBoxStorage.FormattingEnabled = true;
+            listBoxStorage.ItemHeight = 15;
+            listBoxStorage.Location = new Point(27, 122);
+            listBoxStorage.Name = "listBoxStorage";
+            listBoxStorage.Size = new Size(131, 94);
+            listBoxStorage.TabIndex = 9;
+            listBoxStorage.SelectedIndexChanged += listBoxStorage_SelectedIndexChanged;
+            // 
+            // ButtonAddObject
+            // 
+            ButtonAddObject.Anchor = AnchorStyles.Top;
+            ButtonAddObject.Location = new Point(27, 72);
+            ButtonAddObject.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddObject.Name = "ButtonAddObject";
+            ButtonAddObject.Size = new Size(131, 29);
+            ButtonAddObject.TabIndex = 7;
+            ButtonAddObject.Text = "Добавить набор";
+            ButtonAddObject.UseVisualStyleBackColor = true;
+            ButtonAddObject.Click += ButtonAddObject_Click;
+            // 
+            // ButtonRemoveObject
+            // 
+            ButtonRemoveObject.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            ButtonRemoveObject.Location = new Point(27, 244);
+            ButtonRemoveObject.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveObject.Name = "ButtonRemoveObject";
+            ButtonRemoveObject.Size = new Size(131, 33);
+            ButtonRemoveObject.TabIndex = 8;
+            ButtonRemoveObject.Text = "Удалить набор";
+            ButtonRemoveObject.UseVisualStyleBackColor = true;
+            ButtonRemoveObject.Click += ButtonRemoveObject_Click;
+            // 
+            // Instruments
+            // 
+            Instruments.Controls.Add(ButtonRefreshCollection);
+            Instruments.Controls.Add(groupBox1);
+            Instruments.Controls.Add(maskedTextBoxNumber);
+            Instruments.Controls.Add(ButtonAddTractor);
+            Instruments.Controls.Add(ButtonRemoveTractor);
+            Instruments.Location = new Point(697, 4);
+            Instruments.Name = "Instruments";
+            Instruments.Size = new Size(200, 541);
+            Instruments.TabIndex = 6;
+            Instruments.TabStop = false;
+            Instruments.Text = "Инструменты";
+            // 
+            // FormTractorCollections
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(904, 543);
+            Controls.Add(Instruments);
+            Controls.Add(pictureBoxCollections);
+            Margin = new Padding(3, 2, 3, 2);
+            Name = "FormTractorCollections";
+            Text = "Набор локомотивов";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollections).EndInit();
+            ((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)bindingSource2).EndInit();
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            Instruments.ResumeLayout(false);
+            Instruments.PerformLayout();
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private Button ButtonRefreshCollection;
+        private Button ButtonRemoveTractor;
+        private Button ButtonAddTractor;
+        private PictureBox pictureBoxCollections;
+        private MaskedTextBox maskedTextBoxNumber;
+        private GroupBox groupBox1;
+        private TextBox textBoxStorageName;
+        private BindingSource bindingSource1;
+        private BindingSource bindingSource2;
+        private ListBox listBoxStorage;
+        private Button ButtonAddObject;
+        private Button ButtonRemoveObject;
+        private GroupBox Instruments;
+        private EventHandler textBoxStorageName_TextChanged;
+    }
+}

ProjectBulldozer/FormBulldozerCollections.cs

@@ -0,0 +1,119 @@
+using Bulldozer;
+using ProjectBulldozer.Generics;
+namespace ProjectBulldozer
+{
+    public partial class FormTractorCollections : Form
+    {
+        private readonly TractorGenericStorage _storage;
+        //private readonly TractorGenericCollection<DrawingTractor, DrawingObjectTractor> _Tractors;
+        public FormTractorCollections()
+        {
+            InitializeComponent();
+            _storage = new TractorGenericStorage(pictureBoxCollections.Width, pictureBoxCollections.Height);
+        }
+        private void ReloadObjects()
+        {
+            int index = listBoxStorage.SelectedIndex;
+
+            listBoxStorage.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
+            {
+                listBoxStorage.Items.Add(_storage.Keys[i]);
+            }
+            if (listBoxStorage.Items.Count > 0 && (index == -1 || index >= listBoxStorage.Items.Count))
+            {
+                listBoxStorage.SelectedIndex = 0;
+            }
+            else if (listBoxStorage.Items.Count > 0 && index > -1 && index < listBoxStorage.Items.Count)
+            {
+                listBoxStorage.SelectedIndex = index;
+            }
+        }
+        private void ButtonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не всё заполнено", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+        }
+        private void listBoxStorage_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollections.Image = _storage[listBoxStorage.SelectedItem?.ToString() ?? string.Empty]?.ShowTractors();
+        }
+        private void ButtonRemoveObject_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorage.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить объект {listBoxStorage.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
+                MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(listBoxStorage.SelectedItem.ToString() ?? string.Empty);
+                ReloadObjects();
+            }
+        }
+        private void ButtonAddTractor_Click(object sender, EventArgs e)
+        {
+
+            if (listBoxStorage.SelectedIndex == -1) return;
+
+            var obj = _storage[listBoxStorage.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            FormBulldozer form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                //проверяем, удалось ли нам загрузить объект
+                if (obj + form.SelectedTractor > -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollections.Image = obj.ShowTractors();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        private void ButtonRemoveTractor_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorage.SelectedIndex == -1) return;
+            var obj = _storage[listBoxStorage.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            if (obj - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollections.Image = obj.ShowTractors();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorage.SelectedIndex == -1) return;
+            var obj = _storage[listBoxStorage.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            pictureBoxCollections.Image = obj.ShowTractors();
+        }
+    }
+}

ProjectBulldozer/FormBulldozerCollections.resx

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="
+	
+1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ProjectBulldozer/Generics/BulldozerGenericCollection.cs

@@ -0,0 +1,97 @@
+using ProjectBulldozer.Drawning;
+using ProjectBulldozer.MovementStrategy;
+
+namespace ProjectBulldozer.Generics
+{
+    internal class TractorGenericCollection<T, U> where T : DrawingTractor where U : IMoveableObject
+    {
+        //ширина/высота окна
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        //ширина/высота занимаемого места
+        private readonly int _placeSizeWidth = 150;
+        private readonly int _placeSizeHeight = 130;
+        /// Набор объектов
+        private readonly SetGeneric<T> _collection;
+        public TractorGenericCollection(int picWidth, int picHeight)
+        {
+
+            //  высчитываем размер массива для setgeneric
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+        /// Перегрузка оператора сложения
+        public static int operator +(TractorGenericCollection<T, U> collect, T? tract)
+        {
+            if (tract == null)
+            {
+                return -1;
+            }
+            return collect._collection.Insert(tract);
+        }
+        /// Перегрузка оператора вычитания
+        public static T? operator -(TractorGenericCollection<T, U> collect, int pos)
+        {
+            T? obj = collect._collection[pos];
+            if (obj != null)
+            {
+                collect._collection.Remove(pos);
+            }
+            return obj;
+        }
+        // получение объекта imoveableObj
+        public U? GetU(int pos)
+        {
+            return (U?)_collection[pos]?.GetMoveableObject;
+        }
+        /// Вывод всего набора объектов
+        public Bitmap ShowTractors()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {
+                    //линия рамзетки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 3, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+
+        private void DrawObjects(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+            for (int i = 0; i < _collection.Count; i++)
+            {
+                // Получение объекта
+                var obj = _collection[i];
+                // Установка позиции
+                obj?.SetPosition(
+                    (int)((width - 1) * _placeSizeWidth - (i % width * _placeSizeWidth)),
+                    (int)((height - 1) * _placeSizeHeight - (i / width * _placeSizeHeight))
+                );
+                // Прорисовка объекта
+                obj?.DrawTransport(g);
+            }
+        }
+    }
+    }
+
+
+
+
+
+

ProjectBulldozer/Generics/SetGeneric.cs

@@ -0,0 +1,59 @@
+namespace ProjectBulldozer.Generics
+{
+    internal class SetGeneric<T> where T : class
+    {
+        private readonly List<T?> _places;
+        public int Count => _places.Count;
+        /// Максимальное количество объектов в списке
+        private readonly int _maxCount;
+        public SetGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T?>(count);
+        }
+        /// Добавление объекта в набор
+        public int Insert(T tract)
+        {
+            return Insert(tract, 0);
+        }
+        public int Insert(T tract, int position)
+        {
+            if (position < 0 || position >= _maxCount) return -1;
+            _places.Insert(position, tract);
+            return position;
+        }
+        public T? Remove(int position)
+        {
+            if (position >= Count || position < 0)
+                return null;
+
+            T? tmp = _places[position];
+            _places[position] = null;
+            return tmp;
+        }
+        public T? this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= Count) return null;
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position >= Count || Count == _maxCount) return;
+                _places.Insert(position, value);
+            }
+        }
+        public IEnumerable<T?> GetTractors(int? maxTracts = null)
+        {
+            for (int i = 0; i < _places.Count; ++i)
+            {
+                yield return _places[i];
+                if (maxTracts.HasValue && i == maxTracts.Value)
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

ProjectBulldozer/Generics/Status.cs

@@ -0,0 +1,9 @@
+namespace ProjectBulldozer.MovementStrategy
+{
+    public enum Status
+    {
+        NotInit,
+        InProgress,
+        Finish
+    }
+}

ProjectBulldozer/Generics/TractorGenericStorage.cs

@@ -0,0 +1,44 @@
+using ProjectBulldozer.Drawning;
+using ProjectBulldozer.MovementStrategy;
+namespace ProjectBulldozer.Generics
+{
+    internal class TractorGenericStorage
+    {
+        readonly Dictionary<string, TractorGenericCollection<DrawingTractor, DrawingObjectTractor>> _TractorsStorage;
+        public List<string> Keys => _TractorsStorage.Keys.ToList();
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        public TractorGenericStorage(int pictureWidth, int pictureHeight)
+        {
+            _TractorsStorage = new Dictionary<string, TractorGenericCollection<DrawingTractor, DrawingObjectTractor>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        public void AddSet(string name)
+        {
+            if (!_TractorsStorage.ContainsKey(name))
+            {
+                _TractorsStorage.Add(name, new TractorGenericCollection<DrawingTractor, DrawingObjectTractor>(_pictureWidth, _pictureHeight));
+            }
+        }
+        public void DelSet(string name)
+        {
+            if (_TractorsStorage.ContainsKey(name))
+            {
+                _TractorsStorage.Remove(name);
+            }
+        }
+        public TractorGenericCollection<DrawingTractor, DrawingObjectTractor>?
+        this[string ind]
+        {
+            get
+            {
+                if (_TractorsStorage.ContainsKey(ind))
+                {
+                    return _TractorsStorage[ind];
+                }
+                return null;
+            }
+        }
+    }
+}

ProjectBulldozer/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,67 @@
+namespace ProjectBulldozer.MovementStrategy
+{
+    public abstract class AbstractStrategy
+    {
+        private IMoveableObject? _moveableObject;
+
+        private Status _state = Status.NotInit;
+        protected int FieldWidth { get; private set; }
+        protected int FieldHeight { get; private set; }
+        public Status GetStatus() { return _state; }
+
+        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;
+        }
+        public void MakeStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return;
+            }
+            if (IsTargetDestinaion())
+            {
+                _state = Status.Finish;
+                return;
+            }
+            MoveToTarget();
+        }
+        protected bool MoveLeft() => MoveTo(DirectionType.Left);
+        protected bool MoveRight() => MoveTo(DirectionType.Right);
+        protected bool MoveUp() => MoveTo(DirectionType.Up);
+        protected bool MoveDown() => MoveTo(DirectionType.Down);
+        /// Параметры объекта
+        protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+        protected int? GetStep()
+        {
+            if (_state != Status.InProgress)
+            {
+                return null;
+            }
+            return _moveableObject?.GetStep;
+        }
+        protected abstract void MoveToTarget();
+        protected abstract bool IsTargetDestinaion();
+        private bool MoveTo(DirectionType directionType)
+        {
+            if (_state != Status.InProgress)
+            {
+                return false;
+            }
+            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            {
+                _moveableObject.MoveObject(directionType);
+                return true;
+            }
+            return false;
+        }
+    }
+}

ProjectBulldozer/MovementStrategy/DrawingObjectTractor.cs

@@ -0,0 +1,29 @@
+using Bulldozer;
+using ProjectBulldozer.MovementStrategy;
+namespace ProjectBulldozer.Drawning
+{
+    public class DrawingObjectTractor : IMoveableObject
+    {
+        private readonly DrawingTractor? _drawningTractor = null;
+
+        public DrawingObjectTractor(DrawingTractor drawningTractor)
+        {
+            _drawningTractor = drawningTractor;
+        }
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawningTractor == null || _drawningTractor.EntityTractor == null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawningTractor.GetPosX,
+                _drawningTractor.GetPosY, _drawningTractor.GetWidth, _drawningTractor.GetHeight);
+            }
+        }
+        public int GetStep => (int)(_drawningTractor?.EntityTractor?.Step ?? 0);
+        public bool CheckCanMove(DirectionType direction) => _drawningTractor?.CanMove(direction) ?? false;
+        public void MoveObject(DirectionType direction) => _drawningTractor?.MoveTransport(direction);
+    }
+}

ProjectBulldozer/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,11 @@
+using Bulldozer;
+namespace ProjectBulldozer.MovementStrategy
+{
+    public interface IMoveableObject
+    {
+        ObjectParameters? GetObjectPosition { get; }
+        int GetStep { get; }
+        bool CheckCanMove(DirectionType direction);
+        void MoveObject(DirectionType direction);
+    }
+}

ProjectBulldozer/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,44 @@
+namespace ProjectBulldozer.MovementStrategy
+{
+    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();
+                }
+            }
+        }
+    }
+}

ProjectBulldozer/MovementStrategy/MoveToRightCorner.cs

@@ -0,0 +1,21 @@
+namespace ProjectBulldozer.MovementStrategy
+{
+    public class MoveToRightCorner : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null) return false;
+
+            return objParams.RightBorder >= FieldWidth - GetStep() && objParams.DownBorder >= FieldHeight - GetStep();
+        }
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null) return;
+            if (objParams.RightBorder < FieldWidth - GetStep()) MoveRight();
+            if (objParams.DownBorder < FieldHeight - GetStep()) MoveDown();
+
+        }
+    }
+}

ProjectBulldozer/MovementStrategy/ObjectsParameters.cs

@@ -0,0 +1,29 @@
+namespace ProjectBulldozer.MovementStrategy
+{
+    public class ObjectParameters
+    {
+        private readonly int _x;
+        private readonly int _y;
+        private readonly int _width;
+        private readonly int _height;
+        /// Левая граница
+        public int LeftBorder => _x;
+        /// Верхняя граница
+        public int TopBorder => _y;
+        /// Правая граница
+        public int RightBorder => _x + _width;
+        /// Нижняя граница
+        public int DownBorder => _y + _height;
+        /// Середина объекта по горизонтали
+        public int ObjectMiddleHorizontal => _x + _width / 2;
+        /// Середина объекта по вертикали
+        public int ObjectMiddleVertical => _y + _height / 2;
+        public ObjectParameters(int x, int y, int width, int height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+    }
+}

ProjectBulldozer/Program.cs

@@ -1,17 +1,14 @@
-namespace ProjectBulldozer
+using ProjectBulldozer;
+namespace Bulldozer
 {
     internal static class Program
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
         [STAThread]
         static void Main()
         {
-            // To customize application configuration such as set high DPI settings or default font,
+            https://aka.ms/applicationconfiguration.
-            // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormBulldozer());
+            Application.Run(new FormTractorCollections());
         }
     }
 }

ProjectBulldozer/Properties/Resources.Designer.cs

@@ -59,5 +59,45 @@ namespace ProjectBulldozer.Properties {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap down1 {
+            get {
+                object obj = ResourceManager.GetObject("down1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap left1 {
+            get {
+                object obj = ResourceManager.GetObject("left1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap right1 {
+            get {
+                object obj = ResourceManager.GetObject("right1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap up1 {
+            get {
+                object obj = ResourceManager.GetObject("up1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

ProjectBulldozer/Properties/Resources.resx

@@ -117,4 +117,17 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="down1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\down1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="left1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\left1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="right1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\right1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="up1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\up1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>