ProjectBulldozer/ProjectBulldozer/Drawnings/DirectionType.cs

@@ -8,11 +8,6 @@ namespace ProjectBulldozer.Drawnings;
 
 public enum DirectionType
 {
-    /// <summary>
-    /// Неизвестное направление
-    /// </summary>
-    Unknow = -1,
-
     ///<summary>
     /// Вверх
     /// </summary>

ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozer.cs

@@ -37,11 +37,6 @@ public class DrawningBulldozer : DrawningDozer
         Brush bodyBrush = new SolidBrush(EntityDozer.BodyColor);
         Brush additionalBrush = new SolidBrush(EntityDozer.AdditionalColor);
         //BULDOZER
-        _startPosX += 0;
-        _startPosY += 0;
-        base.DrawTransport(g);
-        _startPosX -= 0;
-        _startPosY -= 0;
         //caterpillar
         if (bulldozer.Caterpillar)
         {
@@ -63,5 +58,10 @@ public class DrawningBulldozer : DrawningDozer
             g.DrawRectangle(pen, _startPosX.Value + 125, _startPosY.Value, 25, 90);
             g.DrawLine(pen, _startPosX.Value + 140, _startPosY.Value, _startPosX.Value + 140, _startPosY.Value + 90);
         }
+        _startPosX += 0;
+        _startPosY += 0;
+        base.DrawTransport(g);
+        _startPosX -= 0;
+        _startPosY -= 0;
     }
 }

ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs

@@ -47,27 +47,6 @@ public class DrawningDozer
     /// </summary>
     private readonly int _drawningBulldozerHeight = 90;
 
-    /// <summary>
-    /// Координата X объекта
-    /// </summary>
-    public int? GetPosX => _startPosX;
-
-    /// <summary>
-    /// Координата Y объекта
-    /// </summary>
-    public int? GetPosY => _startPosY;
-
-    /// <summary>
-    /// Ширина объекта
-    /// </summary>
-    public int GetWidth => _drawningBulldozerWidth;
-
-    /// <summary>
-    /// Высота объекта
-    /// </summary>
-    public int GetHeight => _drawningBulldozerHeight;
-
-
     /// <summary>
     /// Пустой конструктор.
     /// </summary>
@@ -96,10 +75,12 @@ public class DrawningDozer
     /// </summary>
     /// <param name="drawningBulldozerWidth">Ширина прорисовки бульдозера</param>
     /// <param name="drawningBulldozerHeigh">Высота прорисовки бульдозера</param>
-    protected DrawningDozer (int drawningBulldozerWidth, int drawningBulldozerHeigh) :this() 
+    protected DrawningDozer (int drawningBulldozerWidth, int drawningBulldozerHeigh)
     {
         _drawningBulldozerWidth = drawningBulldozerWidth;
+        //????????
         _pictureHeight = drawningBulldozerHeigh;
+        //????????
     }
 
     ///<summary>
@@ -188,7 +169,7 @@ public class DrawningDozer
     /// </summary>
     /// <param name="direction">Направлениие</param>
     /// <returns>true - перемещениие выполнено, false - перемещение невозможно</returns>
-    public virtual bool MoveTransport(DirectionType direction)
+    public bool MoveTransport(DirectionType direction)
     {
         if (EntityDozer == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {

ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs

@@ -9,8 +9,27 @@ namespace ProjectBulldozer.Entities;
 /// <summary>
 /// Класс-сущность "Бульдозер"
 /// </summary>
-public class EntityBulldozer : EntityDozer
+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>
     /// Признак (опция) наличие отвала(ковша)
@@ -22,8 +41,26 @@ public class EntityBulldozer : EntityDozer
     /// </summary>
     public bool Caterpillar { get; private set; }
 
-    public EntityBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, bool blade, bool caterpillar) : base(speed, weight, bodyColor, additionalColor)
+    ///<summary>
+    /// Шаг перемещения бульдозера
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    ///<summary>
+    ///Инициализация полей объекта-класса бульдозера
+    /// </summary>
+    ///<param name="speed">Скорость</param>
+    ///<param name="weight">Вес</param>
+    ///<param name="bodyColor">Основной цвет</param>
+    ///<param name="additionalColor">Дополнительный цвет</param>
+    ///<param name="blade">Признак наличия отвала</param>
+    ///<param name="caterpillar">Признак наличия гусеницы</param>
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool blade, bool caterpillar)
     {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+        AdditionalColor = additionalColor;
         Blade = blade;
         Caterpillar = caterpillar;
     }

ProjectBulldozer/ProjectBulldozer/Entities/EntityDozer.cs

@@ -37,13 +37,13 @@ public class EntityDozer
     public double Step => Speed * 100 / Weight;
 
     ///<summary>
-    /// Конструктор
+    /// Конструктор сущности
     /// </summary>
     ///<param name="speed">Скорость</param>
     ///<param name="weight">Вес</param>
     ///<param name="bodyColor">Основной цвет</param>
     ///<param name="additionalColor">Дополнительный цвет</param>
-    public EntityDozer(int speed, double weight, Color bodyColor, Color additionalColor) 
+    public EntityDozer(int speed, double weight, Color bodyColor, Color additionalColor)
     {
         Speed = speed;
         Weight = weight;

ProjectBulldozer/ProjectBulldozer/FormBulldozer.Designer.cs

@@ -29,14 +29,11 @@
         private void InitializeComponent()
         {
             pictureBoxBulldozer = new PictureBox();
-            ButtonCreateBulldozer = new Button();
+            buttonCreate = new Button();
             buttonRight = new Button();
             buttonUp = new Button();
             buttonLeft = new Button();
             buttonDown = new Button();
-            ButtonCreateDozer = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBulldozer).BeginInit();
             SuspendLayout();
             // 
@@ -50,17 +47,17 @@
             pictureBoxBulldozer.TabIndex = 0;
             pictureBoxBulldozer.TabStop = false;
             // 
-            // ButtonCreateBulldozer
+            // buttonCreate
             // 
-            ButtonCreateBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            ButtonCreateBulldozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+            buttonCreate.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
-            ButtonCreateBulldozer.Location = new Point(12, 371);
+            buttonCreate.Location = new Point(12, 371);
-            ButtonCreateBulldozer.Name = "ButtonCreateBulldozer";
+            buttonCreate.Name = "buttonCreate";
-            ButtonCreateBulldozer.Size = new Size(325, 46);
+            buttonCreate.Size = new Size(150, 46);
-            ButtonCreateBulldozer.TabIndex = 1;
+            buttonCreate.TabIndex = 1;
-            ButtonCreateBulldozer.Text = "Создать крутой бульдозер";
+            buttonCreate.Text = "Создать";
-            ButtonCreateBulldozer.UseVisualStyleBackColor = true;
+            buttonCreate.UseVisualStyleBackColor = true;
-            ButtonCreateBulldozer.Click += ButtonCreateBulldozer_Click;
+            buttonCreate.Click += buttonCreate_Click;
             // 
             // buttonRight
             // 
@@ -110,53 +107,16 @@
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
             // 
-            // ButtonCreateDozer
-            // 
-            ButtonCreateDozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            ButtonCreateDozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
-            ButtonCreateDozer.Location = new Point(343, 371);
-            ButtonCreateDozer.Name = "ButtonCreateDozer";
-            ButtonCreateDozer.Size = new Size(248, 46);
-            ButtonCreateDozer.TabIndex = 6;
-            ButtonCreateDozer.Text = "Создать бульдозер";
-            ButtonCreateDozer.UseVisualStyleBackColor = true;
-            ButtonCreateDozer.Click += ButtonCreateDozer_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К левому нижнему краю", "К правому нижнему краю" });
-            comboBoxStrategy.Location = new Point(620, 12);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(242, 40);
-            comboBoxStrategy.TabIndex = 7;
-            // 
-            // buttonStrategyStep
-            // 
-            buttonStrategyStep.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonStrategyStep.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
-            buttonStrategyStep.Location = new Point(760, 58);
-            buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(102, 38);
-            buttonStrategyStep.TabIndex = 8;
-            buttonStrategyStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += ButtonStrategyStep_Click;
-            // 
             // FormBulldozer
             // 
             AutoScaleDimensions = new SizeF(13F, 32F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(874, 429);
-            Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(ButtonCreateDozer);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
-            Controls.Add(ButtonCreateBulldozer);
+            Controls.Add(buttonCreate);
             Controls.Add(pictureBoxBulldozer);
             Name = "FormBulldozer";
             Text = "FormBulldozer";
@@ -168,13 +128,10 @@
         #endregion
 
         private PictureBox pictureBoxBulldozer;
-        private Button ButtonCreateBulldozer;
+        private Button buttonCreate;
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonDown;
-        private Button ButtonCreateDozer;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStrategyStep;
     }
 }

ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs

@@ -4,177 +4,95 @@ using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ProjectBulldozer.Drawnings;
-using ProjectBulldozer.MovementStrategy;
 
-namespace ProjectBulldozer;
+namespace ProjectBulldozer
-
-/// <summary>
-/// Форма работы с объектом "Бульдозер"
-/// </summary>
-public partial class FormBulldozer : Form
 {
-    /// <summary>
+    public partial class FormBulldozer : Form
-    /// Поле-объект для прорисовки объекта
-    /// </summary>
-    private DrawningDozer? _drawningDozer;
-
-    /// <summary>
-    /// Стратегия перемещения
-    /// </summary>
-    private AbstractStrategy? _strategy;
-
-    /// <summary>
-    /// Конструктор формы
-    /// </summary>
-    public FormBulldozer()
     {
-        InitializeComponent();
+        private DrawningBulldozer? _drawningBulldozer;
-        _strategy = null;
+        //private EntityBulldozer? _entityBulldozer;
-    }
+        public FormBulldozer()
-
-    /// <summary>
-    /// Метод прорисовки транспорта
-    /// </summary>
-    private void Draw()
-    {
-        if (_drawningDozer == null)
         {
-            return;
+            InitializeComponent();
         }
 
-        Bitmap bmp = new(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+        private void Draw()
-        Graphics gr = Graphics.FromImage(bmp);
-        _drawningDozer.DrawTransport(gr);
-        pictureBoxBulldozer.Image = bmp;
-    }
-
-    /// <summary>
-    /// Создание объекта класса-перемещения
-    /// </summary>
-    /// <param name="type">Тип создаваемого объекта</param>
-    private void CreateObject(string type)
-    {
-        Random random = new();
-        switch (type)
         {
-            case nameof(DrawningDozer):
+            if (_drawningBulldozer == null)
-                _drawningDozer = new DrawningDozer(random.Next(100, 300), random.Next(1000, 3000),
-            Color.FromArgb(random.Next(170, 256), random.Next(170, 256), random.Next(30, 140)),
-            Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)));
-                break;
-            case nameof(DrawningBulldozer):
-                _drawningDozer = new DrawningBulldozer(random.Next(100, 300), random.Next(1000, 3000),
-            Color.FromArgb(random.Next(170, 256), random.Next(170, 256), random.Next(30, 140)),
-            Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)),
-            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-
-        _drawningDozer.SetPictureSize(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
-        _drawningDozer.SetPosition(random.Next(10, 100), random.Next(10, 100));
-        _strategy = null;
-        comboBoxStrategy.Enabled = true;
-        Draw();
-    }
-
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать крутой бульдозер"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateBulldozer_Click(object sender, EventArgs e) =>
-        CreateObject(nameof(DrawningBulldozer));
-
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать бульдозер"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateDozer_Click(object sender, EventArgs e) =>
-        CreateObject(nameof(DrawningDozer));
-
-    /// <summary>
-    /// Перемещение объекта по форме (нажатие кнопок навигации)
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonMove_Click(object sender, EventArgs e)
-    {
-        if (_drawningDozer == null)
-        {
-            return;
-        }
-
-        string name = ((Button)sender)?.Name ?? string.Empty;
-        bool result = false;
-        switch (name)
-        {
-            case "buttonUp":
-                result = _drawningDozer.MoveTransport(DirectionType.Up);
-                break;
-            case "buttonDown":
-                result = _drawningDozer.MoveTransport(DirectionType.Down);
-                break;
-            case "buttonLeft":
-                result = _drawningDozer.MoveTransport(DirectionType.Left);
-                break;
-            case "buttonRight":
-                result = _drawningDozer.MoveTransport(DirectionType.Right);
-                break;
-        }
-        if (result)
-        {
-            Draw();
-        }
-    }
-
-
-    private void ButtonStrategyStep_Click(object sender, EventArgs e)
-    {
-        if (_drawningDozer == null)
-        {
-            return;
-        }
-
-        if (comboBoxStrategy.Enabled)
-        {
-            _strategy = comboBoxStrategy.SelectedIndex switch
-            {
-                0 => new MoveToCenter(),
-                1 => new MoveToBorderLB(),
-                2 => new MoveToBorderRB(),
-                _ => null,
-            };
-
-            if (_strategy == null)
             {
                 return;
             }
 
-            _strategy.SetData(new MoveableDozer(_drawningDozer), pictureBoxBulldozer.Width,
+            Bitmap bmp = new(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
-                pictureBoxBulldozer.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningBulldozer.DrawTransport(gr);
+            pictureBoxBulldozer.Image = bmp;
         }
 
-        if (_strategy == null)
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreate_Click(object sender, EventArgs e)
         {
-            return;
+            Random random = new();
+            _drawningBulldozer = new DrawningBulldozer();
+            //_entityBulldozer = new EntityBulldozer();
+            /*_entityBulldozer.Init(random.Next(100, 300), random.Next(1000, 3000),
+                Color.FromArgb(random.Next(170, 256), random.Next(170, 210), random.Next(30, 140)),
+                Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));*/
+            //_drawningBulldozer.Init(_entityBulldozer);
+            _drawningBulldozer.Init(random.Next(100, 300), random.Next(1000, 3000),
+                Color.FromArgb(random.Next(170, 256), random.Next(170, 256), random.Next(30, 140)),
+                Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+            //_drawningBulldozer.Init(150, 2000, Color.FromArgb(240, 200, 50), Color.FromArgb(30, 30, 70), true, false);
+            _drawningBulldozer.SetPictureSize(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+            //_drawningBulldozer.SetPosition(pictureBoxBulldozer.Width - random.Next(150, 250), pictureBoxBulldozer.Height - random.Next(100, 200));
+            _drawningBulldozer.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
         }
 
-        comboBoxStrategy.Enabled = false;
+        /// <summary>
-        _strategy.MakeStep();
+        /// Перемещение объекта по форме (нажатие кнопок навигации)
-        Draw();
+        /// </summary>
-
+        /// <param name="sender"></param>
-        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
         {
-            comboBoxStrategy.Enabled = true;
+            if (_drawningBulldozer == null)
-            _strategy = null;
+            {
+                return;
+            }
+
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch (name)
+            {
+                case "buttonUp":
+                    result = _drawningBulldozer.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    result = _drawningBulldozer.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    result = _drawningBulldozer.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    result = _drawningBulldozer.MoveTransport(DirectionType.Right);
+                    break;
+            }
+            if (result)
+            {
+                Draw();
+            }
         }
+
     }
-}
+}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/AbstractStrategy.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-public abstract class AbstractStrategy
-{
-    /// <summary>
-    /// Перемещаемый объект
-    /// </summary>
-    private IMoveableObject? _moveableObject;
-
-    /// <summary>
-    /// Статус перемещения
-    /// </summary>
-    private StrategyStatus _state = StrategyStatus.NotInit;
-
-    /// <summary>
-    /// Ширина поля
-    /// </summary>
-    protected int FieldWidth {  get; private set; }
-
-    /// <summary>
-    /// Высота поля
-    /// </summary>
-    protected int FieldHeight { get; private set; }
-
-    /// <summary>
-    /// Статус перемещения
-    /// </summary>
-    /// <returns></returns>
-    public StrategyStatus 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 = StrategyStatus.NotInit;
-            return;
-        }
-        _state = StrategyStatus.InProgress;
-        _moveableObject = moveableObject;
-        FieldWidth = width;
-        FieldHeight = height;
-    }
-
-    /// <summary>
-    /// Шаг перемещения
-    /// </summary>
-    public void MakeStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return;
-        }
-
-        if (IsTargetDestinaion())
-        {
-            _state = StrategyStatus.Finish;
-            return;
-        }
-
-        MoveToTarget();
-    }
-
-    /// <summary>
-    /// Пермещение влево
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
-
-    /// <summary>
-    /// Пермещение вправо
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveRight() => MoveTo(MovementDirection.Right);
-
-    /// <summary>
-    /// Пермещение вверх
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveUp() => MoveTo(MovementDirection.Up);
-
-    /// <summary>
-    /// Пермещение вниз
-    /// </summary>
-    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-    protected bool MoveDown() => MoveTo(MovementDirection.Down);
-
-    /// <summary>
-    /// Параметры объекта
-    /// </summary>
-    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
-
-    /// <summary>
-    /// Шаг объекта
-    /// </summary>
-    /// <returns></returns>
-    protected int? GetStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return null;
-        }
-        return _moveableObject?.GetStep;
-    }
-
-    /// <summary>
-    /// Перемещение к цели
-    /// </summary>
-    protected abstract void MoveToTarget();
-
-    /// <summary>
-    /// Достигнута ли цель
-    /// </summary>
-    /// <returns></returns>
-    protected abstract bool IsTargetDestinaion();
-
-    /// <summary>
-    /// Попытка пермещения  в требуемом направлении
-    /// </summary>
-    /// <param name="movementDirection">Направление</param>
-    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
-    private bool MoveTo(MovementDirection movementDirection)
-    {
-        if (_state  != StrategyStatus.InProgress)
-        {
-            return false;
-        }
-        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
-    }
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/IMoveableObject.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-/// <summary>
-/// Интерфейс для работы с перемещаемым объектом
-/// </summary>
-public interface IMoveableObject
-{
-    /// <summary>
-    /// Получение координаты объекта
-    /// </summary>
-    ObjectParameters? GetObjectPosition {  get; }
-
-    /// <summary>
-    /// Шаг объекта
-    /// </summary>
-    int GetStep {  get; }
-
-    /// <summary>
-    /// Попытка переместить объект в указанном направлении
-    /// </summary>
-    /// <param name="direction">Направление</param>
-    /// <returns>true - объект перемещён, false - перемещение невозможно</returns>
-    bool TryMoveObject(MovementDirection direction);
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToBorderLB.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-public class MoveToBorderLB : AbstractStrategy
-{
-
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-
-        return objParams.LeftBorder - GetStep() <= 0 && objParams.BottomBorder + GetStep() >= FieldHeight;
-    }
-
-    protected override void MoveToTarget()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return;
-        }
-
-        int diffX = objParams.LeftBorder - FieldWidth;
-        if (Math.Abs(diffX) > GetStep())
-        {
-            MoveLeft();
-        }
-
-        int diffY = objParams.BottomBorder - FieldHeight;
-        if (Math.Abs(diffY) > GetStep())
-        {
-            MoveDown();
-        }
-    }
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToBorderRB.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-public class MoveToBorderRB : AbstractStrategy
-{
-
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-
-        return objParams.RightBorder + GetStep() >= FieldWidth && objParams.LeftBorder + GetStep() >= FieldHeight;
-    }
-
-    protected override void MoveToTarget()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return;
-        }
-
-        int diffX = objParams.RightBorder - FieldWidth;
-        if (Math.Abs(diffX) > GetStep())
-        {
-            MoveRight();
-        }
-
-        int diffY = objParams.BottomBorder - FieldHeight;
-        if (Math.Abs(diffY) > GetStep())
-        {
-            MoveDown();
-        }
-    }
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveToCenter.cs

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

ProjectBulldozer/ProjectBulldozer/MovementStrategy/MoveableDozer.cs

@@ -1,66 +0,0 @@
-using ProjectBulldozer.Drawnings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-/// <summary>
-/// Класс-реализация IMoveableObject с использованием DrawningDozer
-/// </summary>
-public class MoveableDozer : IMoveableObject
-{
-    /// <summary>
-    /// Поле-объект класса DrawningDozer или его наследника
-    /// </summary>
-    private readonly DrawningDozer? _dozer = null;
-
-    /// <summary>
-    /// Констректор
-    /// </summary>
-    /// <param name="dozer">Объект класса DrawningDozer</param>
-    public MoveableDozer(DrawningDozer dozer)
-    {
-        _dozer = dozer;
-    }
-
-    public ObjectParameters? GetObjectPosition
-    {
-        get
-        {
-            if (_dozer == null || _dozer.EntityDozer == null || 
-                !_dozer.GetPosX.HasValue || !_dozer.GetPosY.HasValue)
-            {
-                return null;
-            }
-            return new ObjectParameters(_dozer.GetPosX.Value, _dozer.GetPosY.Value,
-                _dozer.GetWidth, _dozer.GetHeight);
-        }
-    }
-
-    public int GetStep => (int)(_dozer?.EntityDozer?.Step ?? 0);
-
-    public bool TryMoveObject(MovementDirection direction)
-    {
-        if (_dozer == null || _dozer.EntityDozer == null)
-        {
-            return false;
-        }
-
-        return _dozer.MoveTransport(GetDirectionType(direction));
-    }
-
-    private static DirectionType GetDirectionType(MovementDirection direction)
-    {
-        return direction switch
-        {
-            MovementDirection.Left => DirectionType.Left,
-            MovementDirection.Right => DirectionType.Right,
-            MovementDirection.Up => DirectionType.Up,
-            MovementDirection.Down => DirectionType.Down,
-            _ => DirectionType.Unknow,
-        };
-    }
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/MovementDirection.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-public enum MovementDirection
-{
-    /// <summary>
-    /// Вверх
-    /// </summary>
-    Up = 1,
-
-    /// <summary>
-    /// Вниз
-    /// </summary>
-    Down = 2,
-
-    /// <summary>
-    /// Вллево
-    /// </summary>
-    Left = 3,
-
-    /// <summary>
-    /// Вправо
-    /// </summary>
-    Right = 4
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/ObjectParameters.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-/// <summary>
-/// Параметры-координаты объекта
-/// </summary>
-public class ObjectParameters
-{
-    /// <summary>
-    /// Координата X
-    /// </summary>
-    private readonly int _x;
-
-    /// <summary>
-    /// Координата Y
-    /// </summary>
-    private readonly int _y;
-
-    /// <summary>
-    /// Ширина объекта
-    /// </summary>
-    private readonly int _width;
-
-    /// <summary>
-    /// Высота объекта
-    /// </summary>
-    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 BottomBorder => _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;
-    }
-}

ProjectBulldozer/ProjectBulldozer/MovementStrategy/StrategyStatus.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBulldozer.MovementStrategy;
-
-/// <summary>
-/// Статус выполнения операции перемещения
-/// </summary>
-public enum StrategyStatus
-{
-    /// <summary>
-    /// Всё готово к началу
-    /// </summary>
-    NotInit,
-
-    /// <summary>
-    /// Выполняется
-    /// </summary>
-    InProgress,
-
-    /// <summary>
-    /// Завершено
-    /// </summary>
-    Finish
-}

ProjectBulldozer/ProjectBulldozer/NewClass.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer
+{
+    internal class NewClass
+    {
+        private int closedField;
+        public double Property { private get; set; }
+        public void NewMethod()
+        {
+            //Новый метод.
+        }
+    }
+}

ProjectBulldozer/ProjectBulldozer/ProjectBulldozer.csproj

@@ -23,4 +23,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="MovementStrategy\" />
+  </ItemGroup>
+
 </Project>