create

CarRepairShop/CarRepairShop/CarRepairShop.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34525.116
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopView", "CarRepairShopView\CarRepairShopView.csproj", "{5CC03CDD-1895-4F1F-858F-52713F693403}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5CC03CDD-1895-4F1F-858F-52713F693403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CC03CDD-1895-4F1F-858F-52713F693403}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CC03CDD-1895-4F1F-858F-52713F693403}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CC03CDD-1895-4F1F-858F-52713F693403}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F3F1A98D-8A28-4388-85A4-17B0C31F0B66}
+	EndGlobalSection
+EndGlobal

CarRepairShop/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>

CarRepairShop/CarRepairShop/CarRepairShopView/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace CarRepairShopView
+{
+    partial class Form1
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

CarRepairShop/CarRepairShop/CarRepairShopView/Form1.cs

@@ -0,0 +1,10 @@
+namespace CarRepairShopView
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

CarRepairShop/CarRepairShop/CarRepairShopView/Form1.resx

@@ -0,0 +1,120 @@
+<?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="Color1" 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>

CarRepairShop/CarRepairShop/CarRepairShopView/Program.cs

@@ -0,0 +1,17 @@
+namespace CarRepairShopView
+{
+    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,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new Form1());
+        }
+    }
+}

DumpTruck/DumpTruck/AbstractStrategy.cs

@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DumpTruck.MovementStrategy
-{
-    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;
-        }
-    }
-}

DumpTruck/DumpTruck/DirectionType.cs

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

DumpTruck/DumpTruck/DrawningDumpTruck.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DumpTruck.Entities;
-
-namespace DumpTruck.DrawningObjects
-{
-    internal class DrawningDumpTruck : DrawningTruck
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        /// <returns>true - объект создан, false - проверка не пройдена,        
-        public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool trailer, int width, int height) :
-        base (speed, weight, bodyColor, additionalColor, width, height,110, 85)
-        {    
-                if (EntityTruck != null)
-                {
-                    EntityTruck = new EntityDumpTruck(speed, weight, bodyColor, additionalColor, trailer);
-                }           
-        }
- 
-        public override void DrawTransport(Graphics g)
-        {
-            if (EntityTruck is not EntityDumpTruck dumpTruck
-               )
-            {
-                return;
-            }
-            base.DrawTransport(g);
-            if (dumpTruck.Trailer)
-            {
-                //прицеп
-                Brush trailer = new SolidBrush(Color.Black);
-                g.FillRectangle(trailer, _startPosX, _startPosY, 5, 38);
-                g.FillRectangle(trailer, _startPosX + 5, _startPosY + 33, 70, 5);
-                g.FillRectangle(trailer, _startPosX + 70, _startPosY, 5, 38);
-            }
-        }
-    }
-}

DumpTruck/DumpTruck/DrawningObjectTruck.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DumpTruck.DrawningObjects;
-
-
-namespace DumpTruck.MovementStrategy
-{
-    internal class DrawningObjectTruck : IMoveableObject
-   
-        {
-        private readonly DrawningTruck? _drawningTruck = null;
-        public DrawningObjectTruck(DrawningTruck drawningTruck)
-        {
-            _drawningTruck = drawningTruck;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawningTruck == null || _drawningTruck.EntityTruck == null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawningTruck.GetPosX, _drawningTruck.GetPosY, _drawningTruck.GetWidth, _drawningTruck.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawningTruck?.EntityTruck?.Step ?? 0);
-
-        public bool CheckCanMove(DirectionType direction) => _drawningTruck?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) => _drawningTruck?.MoveTransport(direction);
-    }
-}

DumpTruck/DumpTruck/DrawningTruck.cs

@@ -1,205 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DumpTruck.Entities;
-
-namespace DumpTruck.DrawningObjects
-{
-    /// <summary>
-    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-    /// </summary>
-    public class DrawningTruck
-    {
-        /// <summary>
-        /// Класс-сущность
-        /// </summary>
-        public EntityTruck? EntityTruck { get; protected set; }
-        /// <summary>
-        /// Ширина окна
-        /// </summary>
-        public int _pictureWidth;
-        /// <summary>
-        /// Высота окна
-        /// </summary>
-        public int _pictureHeight;
-        /// <summary>
-        /// Левая координата прорисовки автомобиля
-        /// </summary>
-        protected int _startPosX;
-        /// <summary>
-        /// Верхняя кооридната прорисовки автомобиля
-        /// </summary>
-        protected int _startPosY;
-        /// <summary>
-        /// Ширина прорисовки автомобиля
-        /// </summary>
-        protected readonly int _truckWidth = 110;
-        /// <summary>
-        /// Высота прорисовки автомобиля
-        /// </summary>
-        protected readonly int _truckHeight = 85;
-        /// <summary>
-        /// Координата X объекта
-        /// </summary>
-        public int GetPosX => _startPosX;
-        /// <summary>
-        /// Координата Y объекта
-        /// </summary>
-        public int GetPosY => _startPosY;
-        /// <summary>
-        /// Ширина объекта
-        /// </summary>
-        public int GetWidth => _truckWidth;
-        /// <summary>
-        /// Высота объекта
-        /// </summary>
-        public int GetHeight => _truckHeight;
-
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public DrawningTruck(int speed, double weight, Color bodyColor,Color additionalColor, int width, int height)
-        {
-            // TODO: Продумать проверки
-            if (width < _truckWidth || height < _truckHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            EntityTruck = new EntityTruck(speed, weight, bodyColor, additionalColor);
-        }
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        /// <param name="truckWidth">Ширина прорисовки автомобиля</param>
-        /// <param name="truckHeight">Высота прорисовки автомобиля</param>
-        protected DrawningTruck(int speed, double weight, Color bodyColor, Color additionalColor, int width, int height, int truckWidth, int truckHeight)
-        {
-            // TODO: Продумать проверки
-            _pictureWidth = width;
-            _pictureHeight = height;
-            _truckWidth = truckWidth;
-            _truckHeight = truckHeight;
-            EntityTruck = new EntityTruck(speed, weight, bodyColor, additionalColor);
-        }
-        /// <summary>
-        /// Установка позиции
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        public void SetPosition(int x, int y)
-        {
-            if (x < 0 || x + _truckWidth > _pictureWidth)
-            {
-                x = Math.Max(0, _pictureWidth - _truckWidth);
-            }
-            if (y < 0 || y + _truckHeight > _pictureHeight)
-            {
-                y = Math.Max(0, _pictureHeight - _truckHeight);
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        /// <summary>
-        /// Проверка, что объект может переместится по указанному направлению
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        /// <returns>true - можно переместится по указанному направлению</returns>
-        public bool CanMove(DirectionType direction)
-        {
-            if (EntityTruck == null)
-            {
-                return false;
-            }
-            return direction switch
-            {
-                //влево
-                DirectionType.Left => _startPosX - EntityTruck.Step > 0,
-                //вверх
-                DirectionType.Up => _startPosY - EntityTruck.Step > 0,
-                // вправо
-                DirectionType.Right => _startPosX + _truckWidth + EntityTruck.Step < _pictureWidth,
-                //вниз
-                DirectionType.Down => _startPosY + _truckHeight + EntityTruck.Step < _pictureHeight,
-                _ => false,
-            };
-        }
-
-        /// <summary>
-        /// Изменение направления перемещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityTruck == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                //влево
-                case DirectionType.Left:
-                    if (_startPosX - EntityTruck.Step > 0)
-                    {
-                        _startPosX -= (int)EntityTruck.Step;
-                    }
-                    break;
-                //вверх
-                case DirectionType.Up:
-                    if (_startPosY - EntityTruck.Step > 0)
-                    {
-                        _startPosY -= (int)EntityTruck.Step;
-                    }
-                    break;
-                // вправо
-                case DirectionType.Right:
-                    if (_startPosX + _truckWidth + EntityTruck.Step < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityTruck.Step;
-                    }
-                    break;
-                //вниз
-                case DirectionType.Down:
-                    if (_startPosY + _truckHeight + EntityTruck.Step < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityTruck.Step;
-                    }
-                    break;
-            }
-        }
-        public virtual void DrawTransport(Graphics g)
-        {
-            if (EntityTruck == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            //грани
-            g.DrawRectangle(pen, _startPosX + 80, _startPosY, 30, 40);
-            g.DrawRectangle(pen, _startPosX, _startPosY + 40, 110, 20);
-            //кузов
-            Brush br = new SolidBrush(EntityTruck.BodyColor);
-            g.FillRectangle(br, _startPosX + 81, _startPosY + 1, 29, 40);
-            Brush br1 = new SolidBrush(EntityTruck.AdditionalColor);
-            g.FillRectangle(br1, _startPosX + 1, _startPosY + 41, 109, 19);
-            //колеса
-            Brush wheels = new SolidBrush(Color.Black);
-            g.FillEllipse(wheels, _startPosX, _startPosY + 63, 25, 25);
-            g.FillEllipse(wheels, _startPosX + 25, _startPosY + 63, 25, 25);
-            g.FillEllipse(wheels, _startPosX + 85, _startPosY + 63, 25, 25);
-        }
-    }
-}

DumpTruck/DumpTruck/EntityDumpTruck.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DumpTruck.Entities
-{
-    public class EntityDumpTruck : EntityTruck
-    {
-        /// <summary>
-        /// Признак (опция) наличия антикрыла
-        /// </summary>
-        public bool Trailer { get; private set; }
-        
-        /// Инициализация полей объекта-класса 
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        public EntityDumpTruck(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool trailer) : base (speed,weight, bodyColor,additionalColor)
-        {         
-            Trailer = trailer;
-        }
-    }
-}

DumpTruck/DumpTruck/EntityTruck.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DumpTruck.Entities
-{
-    /// <summary>
-    /// Класс-сущность "Автомобиль"
-    /// </summary>
-    public class EntityTruck
-    {
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public double Weight { get; private set; }
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-
-
-        public Color AdditionalColor { get; private set; }
-        /// <summary>
-        /// Шаг перемещения автомобиля
-        /// </summary>
-        public double Step => (double)Speed * 100 / Weight;
-        /// <summary>
-        /// Конструктор с параметрами
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        public EntityTruck(int speed, double weight, Color bodyColor,Color additionalColor)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalColor = additionalColor;
-        }
-    }
-}
-

DumpTruck/DumpTruck/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace DumpTruck
+{
+    partial class Form1
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

DumpTruck/DumpTruck/Form1.cs

@@ -0,0 +1,10 @@
+namespace DumpTruck
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

DumpTruck/DumpTruck/Form1.resx

@@ -0,0 +1,120 @@
+<?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="Color1" 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>

DumpTruck/DumpTruck/FormDumpTruck.Designer.cs

@@ -1,172 +0,0 @@
-namespace DumpTruck
-{
-    partial class FormDumpTruck
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.pictureBoxDumpTruck = new System.Windows.Forms.PictureBox();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.Create_Truck_Button = new System.Windows.Forms.Button();
-            this.CreateDumpTruckButton = new System.Windows.Forms.Button();
-            this.comboBoxStrategy = new System.Windows.Forms.ComboBox();
-            this.Step_Button = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxDumpTruck)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pictureBoxDumpTruck
-            // 
-            this.pictureBoxDumpTruck.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxDumpTruck.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxDumpTruck.Name = "pictureBoxDumpTruck";
-            this.pictureBoxDumpTruck.Size = new System.Drawing.Size(884, 461);
-            this.pictureBoxDumpTruck.TabIndex = 0;
-            this.pictureBoxDumpTruck.TabStop = false;
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(795, 374);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(24, 26);
-            this.buttonUp.TabIndex = 2;
-            this.buttonUp.Text = "1";
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.BackColor = System.Drawing.SystemColors.ControlDark;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(765, 406);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(24, 26);
-            this.buttonLeft.TabIndex = 3;
-            this.buttonLeft.Text = "3";
-            this.buttonLeft.UseVisualStyleBackColor = false;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(825, 407);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(24, 26);
-            this.buttonRight.TabIndex = 4;
-            this.buttonRight.Text = "4";
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(795, 406);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(24, 26);
-            this.buttonDown.TabIndex = 5;
-            this.buttonDown.Text = "2";
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // Create_Truck_Button
-            // 
-            this.Create_Truck_Button.Location = new System.Drawing.Point(12, 392);
-            this.Create_Truck_Button.Name = "Create_Truck_Button";
-            this.Create_Truck_Button.Size = new System.Drawing.Size(123, 23);
-            this.Create_Truck_Button.TabIndex = 6;
-            this.Create_Truck_Button.Text = "Create Truck";
-            this.Create_Truck_Button.UseVisualStyleBackColor = true;
-            this.Create_Truck_Button.Click += new System.EventHandler(this.Create_Truck_Button_Click);
-            // 
-            // CreateDumpTruckButton
-            // 
-            this.CreateDumpTruckButton.Location = new System.Drawing.Point(166, 392);
-            this.CreateDumpTruckButton.Name = "CreateDumpTruckButton";
-            this.CreateDumpTruckButton.Size = new System.Drawing.Size(168, 23);
-            this.CreateDumpTruckButton.TabIndex = 7;
-            this.CreateDumpTruckButton.Text = "Create DumpTruck";
-            this.CreateDumpTruckButton.UseVisualStyleBackColor = true;
-            this.CreateDumpTruckButton.Click += new System.EventHandler(this.CreateDumpTruckButton_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[] {
-            "MoveToCenter",
-            "MoveToBorder"});
-            this.comboBoxStrategy.Location = new System.Drawing.Point(751, 12);
-            this.comboBoxStrategy.Name = "comboBoxStrategy";
-            this.comboBoxStrategy.Size = new System.Drawing.Size(121, 23);
-            this.comboBoxStrategy.TabIndex = 8;
-            // 
-            // Step_Button
-            // 
-            this.Step_Button.Location = new System.Drawing.Point(797, 41);
-            this.Step_Button.Name = "Step_Button";
-            this.Step_Button.Size = new System.Drawing.Size(75, 23);
-            this.Step_Button.TabIndex = 9;
-            this.Step_Button.Text = "Step";
-            this.Step_Button.UseVisualStyleBackColor = true;
-            this.Step_Button.Click += new System.EventHandler(this.Step_Button_Click);
-            // 
-            // FormDumpTruck
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(884, 461);
-            this.Controls.Add(this.Step_Button);
-            this.Controls.Add(this.comboBoxStrategy);
-            this.Controls.Add(this.CreateDumpTruckButton);
-            this.Controls.Add(this.Create_Truck_Button);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.pictureBoxDumpTruck);
-            this.Name = "FormDumpTruck";
-            this.Text = "FormDumpTruck";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxDumpTruck)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxDumpTruck;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button Create_Truck_Button;
-        private Button CreateDumpTruckButton;
-        private ComboBox comboBoxStrategy;
-        private Button Step_Button;
-    }
-}

DumpTruck/DumpTruck/FormDumpTruck.cs

@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DumpTruck.DrawningObjects;
-using DumpTruck.MovementStrategy;
-
-
-namespace DumpTruck
-{
-    public partial class FormDumpTruck : Form
-    {
-        private DrawningTruck? _drawningTruck;
-
-        private AbstractStrategy? _abstractStrategy;
-
-        public FormDumpTruck()
-        {
-            InitializeComponent();
-        }
-        private void Draw()
-        {
-            if (_drawningTruck == null)
-            {
-                return;
-            }
-            Bitmap bmp = new(pictureBoxDumpTruck.Width,
-            pictureBoxDumpTruck.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningTruck.DrawTransport(gr);
-            pictureBoxDumpTruck.Image = bmp;
-        }
-        private void Create_Truck_Button_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawningTruck = new DrawningTruck(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)),
-                pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height);
-            _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-        private void CreateDumpTruckButton_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawningTruck = new DrawningDumpTruck(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(1), pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height);
-            _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>       
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawningTruck == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawningTruck.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawningTruck.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawningTruck.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawningTruck.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-        }     
-       
-        private void Step_Button_Click(object sender, EventArgs e)
-        {
-            if (_drawningTruck == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new
-                DrawningObjectTruck(_drawningTruck), pictureBoxDumpTruck.Width,
-                pictureBoxDumpTruck.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }      
-    }
-}

DumpTruck/DumpTruck/FormDumpTruck.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

DumpTruck/DumpTruck/IMoveableObject.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-namespace DumpTruck.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);
-    }
-}
-

DumpTruck/DumpTruck/MoveToBorder.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DumpTruck.DrawningObjects;
-
-namespace DumpTruck.MovementStrategy
-{
-    internal 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 <= FieldHeight &&
-            objParams.DownBorder + GetStep() >= FieldHeight;
-        }
-
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.RightBorder - FieldWidth;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.DownBorder - FieldHeight;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

DumpTruck/DumpTruck/MoveToCenter.cs

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

DumpTruck/DumpTruck/ObjectParameters.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DumpTruck.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;
-        }
-    }
-}
-

DumpTruck/DumpTruck/Program.cs

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

DumpTruck/DumpTruck/Status.cs

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

test.txt

@@ -0,0 +1,2 @@
+TruckStorage
+test|100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:White;100:100:Lime;100:100:Blue:Black:True;100:100:White:Black:True;100:100:White:Black:False;100:100:White;