RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32602.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTractor", "RPP_FirstLaba_Tractor\ProjectTractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RPP_FirstLaba_Tractor", "RPP_FirstLaba_Tractor\RPP_FirstLaba_Tractor.csproj", "{EF413F48-FFBF-4510-BA11-FAEBE7C0142A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/AbstractStrategy.cs

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

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DirectionType.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectTractor
+namespace RPP_FirstLaba_Tractor
 {
 	public enum DirectionType
 	{

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawingTractor.cs

@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RPP_FirstLaba_Tractor
+{
+    internal class DrawningTractor
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityTractor? EntityTractor { get; private set; }
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        private int _pictureWidth;
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        private int _pictureHeight;
+        /// <summary>
+        /// Левая координата прорисовки автомобиля
+        /// </summary>
+        private int _startPosX;
+        /// <summary>
+        /// Верхняя кооридната прорисовки автомобиля
+        /// </summary>
+        private int _startPosY;
+        /// <summary>
+        /// Ширина прорисовки автомобиля
+        /// </summary>
+        private readonly int _tractorWidth = 80;
+        /// <summary>
+        /// Высота прорисовки автомобиля
+        /// </summary>
+        private readonly int _tractorHeight = 60;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        /// <returns>true - объект создан, false - проверка не пройдена,нельзя создать объект в этих размерах</returns>
+        public bool Init(int speed, double weight, Color bodyColor, int width, int height)
+        {
+
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_tractorWidth > _pictureHeight || _tractorHeight > _pictureHeight)
+            {
+                _pictureWidth = 2 * _tractorWidth;
+                _pictureHeight = 2 * _tractorHeight;
+
+            }
+            EntityTractor = new EntityTractor();
+            EntityTractor.Init(speed, weight, bodyColor);
+            return true;
+        }
+        /// <summary>
+        /// Установка позиции
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        public void SetPosition(int x, int y)
+        {
+            _startPosX = x;
+            _startPosY = y;
+
+            if ((x + _tractorWidth > _pictureWidth) || (y + _pictureHeight > _pictureHeight))
+            {
+                Random random = new();
+                x = random.Next(0, _pictureWidth);
+                x = random.Next(0, _pictureHeight);
+            }
+        }
+        /// <summary>
+        /// Изменение направления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// 
+
+        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 + _tractorWidth + EntityTractor.Step < _pictureWidth)
+                    {
+                        _startPosX += (int)EntityTractor.Step;
+                    }
+                    break;
+                //вниз
+                case DirectionType.Down:
+                    if (_startPosY + _tractorHeight + EntityTractor.Step < _pictureHeight)
+                    {
+                        _startPosY += (int)EntityTractor.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        public void DrawTransport(Graphics g)
+        {
+            if (EntityTractor == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush brGray = new SolidBrush(Color.Gray);
+            Brush brBlack = new SolidBrush(Color.Black);
+            Brush additionalBrush = new
+            SolidBrush(EntityTractor.BodyColor);
+
+            //Гусеницы         
+            g.FillEllipse(brGray, _startPosX, _startPosY + 41, 25, 25);
+            g.FillEllipse(brGray, _startPosX + 55, _startPosY + 41, 25, 25);
+            g.FillRectangle(brGray, _startPosX + 13, _startPosY + 41, 54, 25);
+            //колеса
+            g.FillEllipse(brBlack, _startPosX, _startPosY + 45, 15, 15);
+            g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 45, 15, 15);
+            g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 55, 10, 10);
+            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 55, 10, 10);
+            g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 55, 10, 10);
+            g.FillEllipse(brBlack, _startPosX + 25, _startPosY + 40, 10, 10);
+            g.FillEllipse(brBlack, _startPosX + 45, _startPosY + 40, 10, 10);
+            //кузов
+            g.FillRectangle(additionalBrush, _startPosX, _startPosY + 20, 80, 20);
+            g.FillRectangle(additionalBrush, _startPosX + 60, _startPosY, 10, 20);
+            g.FillRectangle(additionalBrush, _startPosX, _startPosY, 40, 20);
+
+            //Окно
+            Brush brBlue = new SolidBrush(Color.Blue);
+            g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 3, 25, 15);
+
+            //Колеса
+            g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11);
+            g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11);
+            g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6);
+            g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6);
+            g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6);
+            g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6);
+            g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6);
+
+            //границы трактора
+            g.DrawRectangle(pen, _startPosX, _startPosY + 20, 80, 20);
+            g.DrawRectangle(pen, _startPosX + 60, _startPosY, 10, 20);
+            g.DrawRectangle(pen, _startPosX, _startPosY, 40, 20);
+        }
+    }
+}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningBulldoser.cs

@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.Entities;
-
-namespace ProjectTractor.DrawningObjects
-{
-    /// <summary>
-    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-    /// </summary>
-    public class DrawningBulldoser : DrawningTractor
-    {
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="wheelsOrnament">Признак наличия орнамента на колесах</param>
-        /// <param name="blade">Признак наличия отвала</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public DrawningBulldoser(int speed, double weight, Color bodyColor, Color
-       additionalColor, bool wheelsOrnament, bool blade, int width, int height) :
-        base(speed, weight, bodyColor, width, height, 110, 60)
-        {
-            if (EntityTractor != null)
-            {
-                EntityTractor = new EntityBulldoser(speed, weight, bodyColor,
-                additionalColor, wheelsOrnament, blade);
-            }
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (EntityTractor is not EntityBulldoser bulldoser)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(bulldoser.AdditionalColor);
-            
-            base.DrawTransport(g);
-            // орнамент на колесах
-            if (bulldoser.WheelsOrnament)
-            {
-                g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11);
-                g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11);
-                g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6);
-                g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6);
-                g.DrawLine(pen, _startPosX + 7, _startPosY + 47, _startPosX + 7, _startPosY + 58);
-                g.DrawLine(pen, _startPosX + 2, _startPosY + 53, _startPosX + 13, _startPosY + 53);
-
-                g.DrawLine(pen, _startPosX + 73, _startPosY + 47, _startPosX + 73, _startPosY + 58);
-                g.DrawLine(pen, _startPosX + 67, _startPosY + 53, _startPosX + 78, _startPosY + 53);
-
-                g.DrawLine(pen, _startPosX + 40, _startPosY + 57, _startPosX + 40, _startPosY + 62);
-                g.DrawLine(pen, _startPosX + 37, _startPosY + 60, _startPosX + 43, _startPosY + 60);
-
-                g.DrawLine(pen, _startPosX + 25, _startPosY + 57, _startPosX + 25, _startPosY + 62);
-                g.DrawLine(pen, _startPosX + 22, _startPosY + 60, _startPosX + 28, _startPosY + 60);
-
-                g.DrawLine(pen, _startPosX + 55, _startPosY + 57, _startPosX + 55, _startPosY + 62);
-                g.DrawLine(pen, _startPosX + 52, _startPosY + 60, _startPosX + 58, _startPosY + 60);
-
-                g.DrawLine(pen, _startPosX + 30, _startPosY + 42, _startPosX + 30, _startPosY + 48);
-                g.DrawLine(pen, _startPosX + 27, _startPosY + 45, _startPosX + 33, _startPosY + 45);
-
-                g.DrawLine(pen, _startPosX + 50, _startPosY + 42, _startPosX + 50, _startPosY + 48);
-                g.DrawLine(pen, _startPosX + 47, _startPosY + 45, _startPosX + 53, _startPosY + 45);
-            }
-            // отвал
-            if (bulldoser.Blade)
-            {
-                g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 30, 10, 40);
-                g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 60, 40, 10);
-
-                for (int i = 0; i < 15; i++)
-                {
-                    g.FillRectangle(additionalBrush, _startPosX + 82, _startPosY + 60 - i * 2, 40 - i * 2, 10);
-                }
-
-                g.FillRectangle(additionalBrush, _startPosX + 50, _startPosY + 25, 10, 10);
-
-                for (int i = 0; i < 16; i++)
-                {
-                    g.FillRectangle(additionalBrush, _startPosX + 50 + i * 2, _startPosY + 25 + i, 10, 10);
-                }
-            }
-        }
-
-    }
-}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningObjectTractor.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.DrawningObjects;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Реализация интерфейса IDrawningObject для работы с объектом DrawningTractor(паттерн Adapter)
-    /// </summary>
-    public class DrawningObjectTractor : IMoveableObject
-    {
-        private readonly DrawningTractor? _drawningTractor = null;
-        public DrawningObjectTractor(DrawningTractor 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);
-        
-        public void getData()
-        {
-
-        }
-    }
-
-}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/DrawningTractor.cs

@@ -1,229 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectTractor.Entities;
-
-namespace ProjectTractor.DrawningObjects { 
-
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-/// </summary>
-    public class DrawningTractor 
-{
-    /// <summary>
-    /// Класс-сущность
-    /// </summary>
-    public EntityTractor? EntityTractor { get; protected set; }
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int _pictureWidth;
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int _pictureHeight;
-    /// <summary>
-    /// Левая координата прорисовки автомобиля
-    /// </summary>
-    protected int _startPosX;
-    /// <summary>
-    /// Верхняя кооридната прорисовки автомобиля
-    /// </summary>
-    protected int _startPosY;
-    /// <summary>
-    /// Ширина прорисовки автомобиля
-    /// </summary>
-    protected readonly int _tractorWidth = 75;
-    /// <summary>
-    /// Высота прорисовки автомобиля
-    /// </summary>
-    protected readonly int _tractorHeight = 60;
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="width">Ширина картинки</param>
-    /// <param name="height">Высота картинки</param>
-    public DrawningTractor(int speed, double weight, Color bodyColor, int
-    width, int height)
-    {        
-        if (width <= _tractorWidth || height <= _tractorHeight)
-             return;
-        _pictureWidth = width;
-        _pictureHeight = height;
-        EntityTractor = new EntityTractor(speed, weight, bodyColor);
-    }
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="width">Ширина картинки</param>
-    /// <param name="height">Высота картинки</param>
-    /// <param name="tractorWidth">Ширина прорисовки автомобиля</param>
-    /// <param name="tractorHeight">Высота прорисовки автомобиля</param>
-    protected DrawningTractor(int speed, double weight, Color bodyColor, int
-    width, int height, int tractorWidth, int tractorHeight)
-    {
-        if (width <= _tractorWidth || height <= _tractorHeight)
-            return;
-        _pictureWidth = width;
-        _pictureHeight = height;
-        _tractorWidth = tractorWidth;
-        _tractorHeight = tractorHeight;
-        EntityTractor = new EntityTractor(speed, weight, bodyColor);
-    }
-
-
-        /// <summary>
-        /// Координата X объекта
-        /// </summary>
-        public int GetPosX => _startPosX;
-        /// <summary>
-        /// Координата Y объекта
-        /// </summary>
-        public int GetPosY => _startPosY;
-        /// <summary>
-        /// Ширина объекта
-        /// </summary>
-        public int GetWidth => _tractorWidth;
-        /// <summary>
-        /// Высота объекта
-        /// </summary>
-        public int GetHeight => _tractorHeight;
-        /// <summary>
-        /// Проверка, что объект может переместится по указанному направлению
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        /// <returns>true - можно переместится по указанномнаправлению</returns>
-        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 + _tractorWidth < _pictureWidth,
-                // вниз
-                DirectionType.Down => _startPosY + EntityTractor.Step + _tractorHeight < _pictureHeight,
-                _ => false,
-            };
-        }
-        /// <summary>
-        /// Изменение направления перемещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityTractor == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                //влево
-                case DirectionType.Left:
-                    _startPosX -= (int)EntityTractor.Step;
-                    break;
-                //вверх
-                case DirectionType.Up:
-                    _startPosY -= (int)EntityTractor.Step;
-                    break;
-                // вправо
-                case DirectionType.Right:
-                    _startPosX += (int)EntityTractor.Step;
-                    break;
-                //вниз
-                case DirectionType.Down:
-                    _startPosY += (int)EntityTractor.Step;
-                    break;
-            }
-        }
-
-
-        /// <summary>
-        /// Установка позиции
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        public void SetPosition(int x, int y)
-    {
-            if (EntityTractor == null)
-                return;
-            _startPosX = x;
-            _startPosY = y;
-            if (x + _tractorWidth >= _pictureWidth || y + _tractorHeight >= _pictureHeight)
-            {
-                _startPosX = 1;
-                _startPosY = (_tractorHeight + _tractorHeight) / 2;
-            }
-        }
-
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public virtual void DrawTransport(Graphics g)
-    {
-            if (EntityTractor == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush brGray = new SolidBrush(Color.Gray);
-            Brush brBlack = new SolidBrush(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(EntityTractor.BodyColor);
-
-            //Гусеницы         
-            g.FillEllipse(brGray, _startPosX, _startPosY + 41, 25, 25);
-            g.FillEllipse(brGray, _startPosX + 55, _startPosY + 41, 25, 25);
-            g.FillRectangle(brGray, _startPosX + 13, _startPosY + 41, 54, 25);
-            //колеса
-            g.FillEllipse(brBlack, _startPosX, _startPosY + 45, 15, 15);
-            g.FillEllipse(brBlack, _startPosX + 65, _startPosY + 45, 15, 15);
-            g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 55, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 20, _startPosY + 55, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 55, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 25, _startPosY + 40, 10, 10);
-            g.FillEllipse(brBlack, _startPosX + 45, _startPosY + 40, 10, 10);
-            //кузов
-            g.FillRectangle(additionalBrush, _startPosX, _startPosY + 20, 80, 20);
-            g.FillRectangle(additionalBrush, _startPosX + 60, _startPosY, 10, 20);
-            g.FillRectangle(additionalBrush, _startPosX, _startPosY, 40, 20);
-
-            //Окно
-            Brush brBlue = new SolidBrush(Color.Blue);
-            g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 3, 25, 15);
-
-            //Колеса
-            g.FillEllipse(additionalBrush, _startPosX + 2, _startPosY + 47, 11, 11);
-            g.FillEllipse(additionalBrush, _startPosX + 67, _startPosY + 47, 11, 11);
-            g.FillEllipse(additionalBrush, _startPosX + 37, _startPosY + 57, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 22, _startPosY + 57, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 52, _startPosY + 57, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 27, _startPosY + 42, 6, 6);
-            g.FillEllipse(additionalBrush, _startPosX + 47, _startPosY + 42, 6, 6);
-
-            //границы трактора
-            g.DrawRectangle(pen, _startPosX, _startPosY + 20, 80, 20);
-            g.DrawRectangle(pen, _startPosX + 60, _startPosY, 10, 20);
-            g.DrawRectangle(pen, _startPosX, _startPosY, 40, 20);
-        }
-}
-}
-
-
-
-

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/EntityBulldoser.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.Entities
-{
-    /// <summary>
-    /// Класс-сущность "Спортивный автомобиль"
-    /// </summary>
-    public class EntityBulldoser : EntityTractor
-    {
-        /// <summary>
-        /// Дополнительный цвет (для опциональных элементов)
-        /// </summary>
-        public Color AdditionalColor { get; private set; }
-        /// <summary>
-        /// Признак (опция) наличия обвеса
-        /// </summary>
-        public bool WheelsOrnament { get; private set; }
-        /// <summary>
-        /// Признак (опция) наличия антикрыла
-        /// </summary>
-        public bool Blade { get; private set; }
-
-        /// <summary>
-        /// Инициализация полей объекта-класса спортивного автомобиля
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="wheelsOrnament">Признак наличия обвеса</param>
-        /// <param name="blade">Признак наличия отвала</param>
-
-        public EntityBulldoser(int speed, double weight, Color bodyColor, Color
-       additionalColor, bool wheelsOrnament, bool blade) : base(speed, weight, bodyColor)
-        {
-            AdditionalColor = additionalColor;
-            WheelsOrnament = wheelsOrnament;
-            Blade = blade;
-        }
-    }
-
-}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractor.cs

@@ -1,30 +1,17 @@
-
-using ProjectTractor.MovementStrategy;
-using ProjectTractor.DrawningObjects;
-
-namespace ProjectTractor
+namespace RPP_FirstLaba_Tractor
 {
-
     /// <summary>
     /// Ôîðìà ðàáîòû ñ îáúåêòîì "Ñïîðòèâíûé àâòîìîáèëü"
     /// </summary>
     public partial class FormTractor : Form
     {
         private PictureBox pictureBoxTractor;
-        private Button buttonCreateTractor;
+        private Button buttonCreate;
         private Button buttonTop;
         private Button buttonLeft;
         private Button buttonDown;
-        private Button buttonCreateBulldoserTractor;
-        private Button buttonStep;
-        private ComboBox comboBoxStrategy;
         private Button buttonRight;
 
-        /// <summary>
-        /// Ñòðàòåãèÿ ïåðåìåùåíèÿ
-        /// </summary>
-        private AbstractStrategy? _abstractStrategy;
-
         public int getPictureWidth()
         {
             return pictureBoxTractor.Width;
@@ -68,7 +55,8 @@ namespace ProjectTractor
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
-            _drawningTractor = new DrawningTractor(random.Next(100, 300),
+            _drawningTractor = new DrawningTractor();
+            _drawningTractor.Init(random.Next(100, 300),
             random.Next(1000, 3000),
             Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
             random.Next(0, 256)),
@@ -111,14 +99,11 @@ namespace ProjectTractor
         private void InitializeComponent()
         {
             this.pictureBoxTractor = new System.Windows.Forms.PictureBox();
-            this.buttonCreateTractor = new System.Windows.Forms.Button();
+            this.buttonCreate = new System.Windows.Forms.Button();
             this.buttonTop = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateBulldoserTractor = new System.Windows.Forms.Button();
-            this.buttonStep = new System.Windows.Forms.Button();
-            this.comboBoxStrategy = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTractor)).BeginInit();
             this.SuspendLayout();
             // 
@@ -127,28 +112,28 @@ namespace ProjectTractor
             this.pictureBoxTractor.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxTractor.Location = new System.Drawing.Point(0, 0);
             this.pictureBoxTractor.Name = "pictureBoxTractor";
-            this.pictureBoxTractor.Size = new System.Drawing.Size(882, 453);
+            this.pictureBoxTractor.Size = new System.Drawing.Size(891, 490);
             this.pictureBoxTractor.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxTractor.TabIndex = 0;
             this.pictureBoxTractor.TabStop = false;
             // 
-            // buttonCreateTractor
+            // buttonCreate
             // 
-            this.buttonCreateTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateTractor.Location = new System.Drawing.Point(12, 403);
-            this.buttonCreateTractor.Name = "buttonCreateTractor";
-            this.buttonCreateTractor.Size = new System.Drawing.Size(246, 29);
-            this.buttonCreateTractor.TabIndex = 1;
-            this.buttonCreateTractor.Text = "Ñîçäàòü òðàêòîð";
-            this.buttonCreateTractor.UseVisualStyleBackColor = true;
-            this.buttonCreateTractor.Click += new System.EventHandler(this.ButtonCreate_Click);
+            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreate.Location = new System.Drawing.Point(12, 440);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+            this.buttonCreate.TabIndex = 1;
+            this.buttonCreate.Text = "Ñîçäàòü";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
             // 
             // buttonTop
             // 
             this.buttonTop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonTop.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowUp;
+            this.buttonTop.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowUp;
             this.buttonTop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonTop.Location = new System.Drawing.Point(804, 375);
+            this.buttonTop.Location = new System.Drawing.Point(813, 412);
             this.buttonTop.Name = "buttonTop";
             this.buttonTop.Size = new System.Drawing.Size(30, 30);
             this.buttonTop.TabIndex = 2;
@@ -158,9 +143,9 @@ namespace ProjectTractor
             // buttonLeft
             // 
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(768, 411);
+            this.buttonLeft.Location = new System.Drawing.Point(777, 448);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 3;
@@ -170,9 +155,9 @@ namespace ProjectTractor
             // buttonDown
             // 
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(804, 411);
+            this.buttonDown.Location = new System.Drawing.Point(813, 448);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 4;
@@ -182,61 +167,23 @@ namespace ProjectTractor
             // buttonRight
             // 
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::ProjectTractor.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImage = global::RPP_FirstLaba_Tractor.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(840, 411);
+            this.buttonRight.Location = new System.Drawing.Point(849, 448);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 5;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreateBulldoserTractor
-            // 
-            this.buttonCreateBulldoserTractor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateBulldoserTractor.Location = new System.Drawing.Point(264, 403);
-            this.buttonCreateBulldoserTractor.Name = "buttonCreateBulldoserTractor";
-            this.buttonCreateBulldoserTractor.Size = new System.Drawing.Size(199, 29);
-            this.buttonCreateBulldoserTractor.TabIndex = 6;
-            this.buttonCreateBulldoserTractor.Text = "Ñîçäàòü áóëüäîçåð";
-            this.buttonCreateBulldoserTractor.UseVisualStyleBackColor = true;
-            this.buttonCreateBulldoserTractor.Click += new System.EventHandler(this.buttonCreateBulldoserTractor_Click);
-            // 
-            // buttonStep
-            // 
-            this.buttonStep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonStep.Location = new System.Drawing.Point(776, 46);
-            this.buttonStep.Name = "buttonStep";
-            this.buttonStep.Size = new System.Drawing.Size(94, 29);
-            this.buttonStep.TabIndex = 7;
-            this.buttonStep.Text = "Øàã";
-            this.buttonStep.UseVisualStyleBackColor = true;
-            this.buttonStep.Click += new System.EventHandler(this.buttonStep_Click);
-            // 
-            // comboBoxStrategy
-            // 
-            this.comboBoxStrategy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.comboBoxStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxStrategy.FormattingEnabled = true;
-            this.comboBoxStrategy.Items.AddRange(new object[] {
-            "Öåíòð ",
-            "Ïðàâûé íèæíèé"});
-            this.comboBoxStrategy.Location = new System.Drawing.Point(719, 12);
-            this.comboBoxStrategy.Name = "comboBoxStrategy";
-            this.comboBoxStrategy.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxStrategy.TabIndex = 8;
-            // 
             // FormTractor
             // 
-            this.ClientSize = new System.Drawing.Size(882, 453);
-            this.Controls.Add(this.comboBoxStrategy);
-            this.Controls.Add(this.buttonStep);
-            this.Controls.Add(this.buttonCreateBulldoserTractor);
+            this.ClientSize = new System.Drawing.Size(891, 490);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonTop);
-            this.Controls.Add(this.buttonCreateTractor);
+            this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxTractor);
             this.Name = "FormTractor";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTractor)).EndInit();
@@ -245,59 +192,5 @@ namespace ProjectTractor
 
         }
 
-        private void buttonCreateBulldoserTractor_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawningTractor = new DrawningBulldoser(random.Next(100, 300),
-            random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            pictureBoxTractor.Width, pictureBoxTractor.Height);
-            _drawningTractor.SetPosition(random.Next(10, 100), random.Next(10,
-            100));
-            Draw();
-
-        }
-
-        private void buttonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawningTractor == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new
-                DrawningObjectTractor(_drawningTractor), pictureBoxTractor.Width,
-                pictureBoxTractor.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
     }
 }

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/IMoveableObject.cs

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

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToBorder.cs

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

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/MoveToCenter.cs

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

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/ObjectParameters.cs

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

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Program.cs

@@ -1,4 +1,4 @@
-namespace ProjectTractor
+namespace RPP_FirstLaba_Tractor
 {
     internal static class Program
     {

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ProjectTractor.Properties {
+namespace RPP_FirstLaba_Tractor.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace ProjectTractor.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectTractor.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RPP_FirstLaba_Tractor.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Status.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectTractor.MovementStrategy
-{
-    /// <summary>
-    /// Статус выполнения операции перемещения
-    /// </summary>
-    public enum Status
-    {
-        NotInit,
-        InProgress,
-        Finish
-    }
-
-}

RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/Tractor.cs

@@ -4,11 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectTractor.Entities
+namespace RPP_FirstLaba_Tractor
 {
-    /// <summary>
-    /// Класс-сущность "Автомобиль"
-    /// </summary>
     public class EntityTractor
     {
         /// <summary>
@@ -23,17 +20,19 @@ namespace ProjectTractor.Entities
         /// Основной цвет
         /// </summary>
         public Color BodyColor { get; private set; }
-        /// <summary>
-        /// Шаг перемещения автомобиля
-        /// </summary>
+
         public double Step => (double)Speed * 100 / Weight;
         /// <summary>
-        /// Конструктор с параметрами
+        /// Инициализация полей объекта-класса спортивного автомобиля
         /// </summary>
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес автомобиля</param>
         /// <param name="bodyColor">Основной цвет</param>
-        public EntityTractor(int speed, double weight, Color bodyColor)
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public void Init(int speed, double weight, Color bodyColor)
         {
             Speed = speed;
             Weight = weight;