Добавлена стратегия на перемещение к центру и к краю

ProjectLiner/ProjectLiner/Drawnings/DirectionType.cs

@@ -0,0 +1,32 @@
+namespace ProjectLiner.Drawnings;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum DirectionType
+{
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
+
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

ProjectLiner/ProjectLiner/Drawnings/DrawningCommonLiner.cs

@@ -1,14 +1,17 @@
-namespace ProjectLiner;
+using ProjectLiner.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-/// <summary>
+namespace ProjectLiner.Drawnings;
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+public class DrawningCommonLiner
-/// </summary>
-public class DrawningLiner
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityLiner? EntityLiner { get; private set; }
+    public EntityCommonLiner? EntityCommonLiner { get; protected set; }
 
     /// <summary>
     /// Ширина окна
@@ -23,12 +26,12 @@ public class DrawningLiner
     /// <summary>
     /// Левая координата прорисовки лайнера
     /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;
 
     /// <summary>
     /// Верхняя кооридната прорисовки лайнера
     /// </summary>
-    private int? _startPosY;
+    protected int? _startPosY;
 
     /// <summary>
     /// Ширина прорисовки лайнера
@@ -38,27 +41,64 @@ public class DrawningLiner
     /// <summary>
     /// Высота прорисовки лайнера
     /// </summary>
-    private readonly int _drawningLinerHeight = 125;
+    private readonly int _drawningLinerHeight = 90;
 
     /// <summary>
-    /// Инициализация свойств
+    /// Координата X объекта
     /// </summary>
-    /// <param name="speed">Скорость</param>
+    public int? GetPosX => _startPosX;
-    /// <param name="weight">Вес</param>
+
-    /// <param name="bodyColor">Основной цвет</param>
+    /// <summary>
-    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// Координата Y объекта
-    /// <param name="anchor">Признак наличия якоря</param>
+    /// </summary>
-    /// <param name="boats">Признак наличия шлюпок</param>
+    public int? GetPosY => _startPosY;
-    /// <param name="pipe">Признак наличия трубы</param>
+
-    public void Init(EntityLiner liner)
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningLinerWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningLinerHeight;
+
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+
+    public DrawningCommonLiner()
     {
-        EntityLiner = liner;
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
     }
 
+    /// <summary>
+    /// конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+
+    public DrawningCommonLiner(int speed, double weight, Color bodycolor) : this()
+    {
+        EntityCommonLiner = new EntityCommonLiner(speed, weight, bodycolor);
+    }
+
+    /// <summary>
+    /// конструктор для наследников
+    /// </summary>
+    /// <param name="drawningLinerHeight">Высота</param>
+    /// <param name="drawningLinerWight">Длина</param>
+
+    protected DrawningCommonLiner(int drawningLinerWight, int drawningLinerHeight) : this()
+    {
+        _drawningLinerHeight = drawningLinerHeight;
+        _drawningLinerWidth = drawningLinerWight;
+    }
+
     /// <summary>
     /// Установка границ поля
     /// </summary>
@@ -73,7 +113,7 @@ public class DrawningLiner
             _pictureHeight = height;
             if (_startPosX != null && _startPosY != null)
             {
-                if (_startPosX.Value < 0) 
+                if (_startPosX.Value < 0)
                     _startPosX = 0;
                 if (_startPosY.Value < 0)
                     _startPosY = 0;
@@ -129,7 +169,7 @@ public class DrawningLiner
 	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
 	public bool MoveTransport(DirectionType direction)
     {
-        if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityCommonLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return false;
         }
@@ -138,30 +178,30 @@ public class DrawningLiner
         {
             //влево
             case DirectionType.Left:
-                if (_startPosX.Value - EntityLiner.Step > 0)
+                if (_startPosX.Value - EntityCommonLiner.Step > 0)
                 {
-                    _startPosX -= (int)EntityLiner.Step;
+                    _startPosX -= (int)EntityCommonLiner.Step;
                 }
                 return true;
             //вверх
             case DirectionType.Up:
-                if (_startPosY.Value - EntityLiner.Step > 0)
+                if (_startPosY.Value - EntityCommonLiner.Step > 0)
                 {
-                    _startPosY -= (int)EntityLiner.Step;
+                    _startPosY -= (int)EntityCommonLiner.Step;
                 }
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + EntityLiner.Step < _pictureWidth-_drawningLinerWidth)
+                if (_startPosX.Value + EntityCommonLiner.Step < _pictureWidth - _drawningLinerWidth)
                 {
-                    _startPosX += (int)EntityLiner.Step;
+                    _startPosX += (int)EntityCommonLiner.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + EntityLiner.Step < _pictureHeight-_drawningLinerHeight)
+                if (_startPosY.Value + EntityCommonLiner.Step < _pictureHeight - _drawningLinerHeight)
                 {
-                    _startPosY += (int)EntityLiner.Step;
+                    _startPosY += (int)EntityCommonLiner.Step;
                 }
                 return true;
             default:
@@ -173,61 +213,33 @@ public class DrawningLiner
     /// Прорисовка объекта
     /// </summary>
     /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g)
     {
-        if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityCommonLiner == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(EntityLiner.AdditionalColor);
+        Brush br = new SolidBrush(EntityCommonLiner.BodyColor);
-        Brush br = new SolidBrush(EntityLiner.BodyColor);
 
-        // якорь
-        if (EntityLiner.Anchor)
-        {
-            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115);
-            g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95);
-            g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115);
-            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100);
-        }
 
         // кузов лайнера
-        Point point1 = new Point(_startPosX.Value, _startPosY.Value + 80);
+        Point point1 = new Point(_startPosX.Value, _startPosY.Value + 40);
-        Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 130);
+        Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 90);
-        Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 130);
+        Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 90);
-        Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 80);
+        Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 40);
         Point[] curvePoints = { point1, point2, point3, point4 };
         g.FillPolygon(br, curvePoints);
 
 
         // борт лайнера
-        Point point5 = new Point(_startPosX.Value+40, _startPosY.Value + 40);
+        Point point5 = new Point(_startPosX.Value + 40, _startPosY.Value);
-        Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value + 40);
+        Point point6 = new Point(_startPosX.Value + 140, _startPosY.Value);
-        Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 80);
+        Point point7 = new Point(_startPosX.Value + 140, _startPosY.Value + 40);
-        Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 80);
+        Point point8 = new Point(_startPosX.Value + 40, _startPosY.Value + 40);
         Point[] curvePoints2 = { point5, point6, point7, point8 };
-        g.FillPolygon(additionalBrush, curvePoints2);
+        g.FillPolygon(br, curvePoints2);
 
-        // шлюпки
-        if (EntityLiner.Boats)
-        {
-            g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15);
-        }
-
-        // труба
-        if (EntityLiner.Pipe)
-        {
-
-            Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10);
-            Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40);
-            Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
-            Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10);
-            Point[] curvePoints3 = { point9, point10, point11, point12 };
-            g.FillPolygon(br, curvePoints3);
-        }
     }
 }

ProjectLiner/ProjectLiner/Drawnings/DrawningLiner.cs

@@ -0,0 +1,72 @@
+using ProjectLiner.Entities;
+
+namespace ProjectLiner.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningLiner : DrawningCommonLiner
+{ 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodycolor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="anchor">Признак наличия якоря</param>
+    /// <param name="boats">Признак наличия шлюпок</param>
+    /// <param name="pipe">Признак наличия трубы</param>
+    public DrawningLiner(int speed, double weight, Color bodycolor, Color additionalColor, bool anchor, bool boats, bool pipe) : base(150, 125)
+    {
+        EntityCommonLiner = new EntityLiner(speed, weight, bodycolor, additionalColor, anchor, boats, pipe);
+
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityCommonLiner == null || EntityCommonLiner is not EntityLiner liner || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(liner.AdditionalColor);
+        Brush br = new SolidBrush(liner.BodyColor);
+
+        _startPosY += 40;
+        base.DrawTransport(g);
+        _startPosY -= 40;
+
+
+        // якорь
+        if (liner.Anchor)
+        {
+            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 85, _startPosX.Value + 45, _startPosY.Value + 115);
+            g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 95, _startPosX.Value + 60, _startPosY.Value + 95);
+            g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 100, _startPosX.Value + 45, _startPosY.Value + 115);
+            g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 115, _startPosX.Value + 65, _startPosY.Value + 100);
+        }
+
+        // шлюпки
+        if (liner.Boats)
+        {
+            g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15);
+        }
+
+        // труба
+        if (liner.Pipe)
+        {
+
+            Point point9 = new Point(_startPosX.Value + 90, _startPosY.Value + 10);
+            Point point10 = new Point(_startPosX.Value + 90, _startPosY.Value + 40);
+            Point point11 = new Point(_startPosX.Value + 115, _startPosY.Value + 40);
+            Point point12 = new Point(_startPosX.Value + 115, _startPosY.Value + 10);
+            Point[] curvePoints3 = { point9, point10, point11, point12 };
+            g.FillPolygon(additionalBrush, curvePoints3);
+        }
+    }
+
+}

ProjectLiner/ProjectLiner/Entities/EntityCommonLiner.cs

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

ProjectLiner/ProjectLiner/Entities/EntityLiner.cs

@@ -1,24 +1,10 @@
-namespace ProjectLiner;
+namespace ProjectLiner.Entities;
 
 /// <summary>
 /// Класс-сущность "Лайнер"
 /// </summary>
-public class EntityLiner
+public class EntityLiner: EntityCommonLiner
 {
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
 
     /// <summary>
     /// Дополнительный цвет (для опциональных элементов)
@@ -40,26 +26,17 @@ public class EntityLiner
     /// </summary>
     public bool Pipe { get; private set; }
 
-    /// <summary>
-    /// Шаг перемещения автомобиля
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
 
     /// <summary>
     /// Инициализация полей объекта-класса спортивного автомобиля
     /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес автомобиля</param>
-    /// <param name="bodyColor">Основной цвет</param>
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="anchor">Признак наличия якоря</param>
     /// <param name="boats">Признак наличия шлюпок</param>
     /// <param name="pipe">Признак наличия трубы</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe)
+    public EntityLiner(int speed, double weight, Color bodyColor, Color additionalColor, bool anchor, bool boats, bool pipe) : base(speed, weight, bodyColor)
     {
-        Speed = speed;
+        new EntityCommonLiner(speed, weight, bodyColor);
-        Weight = weight;
-        BodyColor = bodyColor;
         AdditionalColor = additionalColor;
         Anchor = anchor;
         Boats = boats;

ProjectLiner/ProjectLiner/FormLiner.Designer.cs

@@ -34,6 +34,9 @@
             buttonUp = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
+            buttonCreateCommonLiner = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit();
             SuspendLayout();
             // 
@@ -50,11 +53,11 @@
             // buttonCreate
             // 
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 520);
+            buttonCreate.Location = new Point(12, 544);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(150, 82);
+            buttonCreate.Size = new Size(203, 58);
             buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
+            buttonCreate.Text = "Создать Лайнер";
             buttonCreate.UseVisualStyleBackColor = true;
             buttonCreate.Click += buttonCreate_Click;
             // 
@@ -106,11 +109,45 @@
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
+            // buttonCreateCommonLiner
+            // 
+            buttonCreateCommonLiner.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateCommonLiner.Location = new Point(221, 544);
+            buttonCreateCommonLiner.Name = "buttonCreateCommonLiner";
+            buttonCreateCommonLiner.Size = new Size(240, 58);
+            buttonCreateCommonLiner.TabIndex = 6;
+            buttonCreateCommonLiner.Text = "Создать Обычный Лайнер";
+            buttonCreateCommonLiner.UseVisualStyleBackColor = true;
+            buttonCreateCommonLiner.Click += buttonCreateCommonLiner_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(742, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(194, 33);
+            comboBoxStrategy.TabIndex = 11;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(816, 51);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(120, 37);
+            buttonStrategyStep.TabIndex = 12;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormLiner
             // 
             AutoScaleDimensions = new SizeF(11F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(948, 614);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonCreateCommonLiner);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
@@ -131,5 +168,8 @@
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonRight;
+        private Button buttonCreateCommonLiner;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectLiner/ProjectLiner/FormLiner.cs

@@ -7,15 +7,20 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using ProjectLiner.Drawnings;
+using ProjectLiner.MovementStrategy;
 
 namespace ProjectLiner
 {
     public partial class FormLiner : Form
     {
-        private DrawningLiner? _drawningLiner;
+        private DrawningCommonLiner? _drawningCommonLiner;
+
+        private AbstractStrategy? _strategy;
         public FormLiner()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
         /// <summary>
@@ -23,35 +28,67 @@ namespace ProjectLiner
         /// </summary>
         private void Draw()
         {
-            if (_drawningLiner == null)
+            if (_drawningCommonLiner == null)
             {
                 return;
             }
 
             Bitmap bmp = new(pictureBoxLiner.Width, pictureBoxLiner.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningLiner.DrawTransport(gr);
+            _drawningCommonLiner.DrawTransport(gr);
             pictureBoxLiner.Image = bmp;
         }
 
         /// <summary>
-        /// Обработка нажатия кнопки "Создать"
+        /// Создание объекта класса-перемещения
+        /// </summary>
+        /// <param name="type">Тип создаваемого объекта</param>
+        private void CreateObject(string type)
+        {
+            Random random = new();
+            switch (type)
+            {
+                case nameof(DrawningCommonLiner):
+                    _drawningCommonLiner = new DrawningCommonLiner(random.Next(100, 300), random.Next(1000, 3000),
+                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+                    break;
+                case nameof(DrawningLiner):
+                    _drawningCommonLiner = new DrawningLiner(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)), Convert.ToBoolean(random.Next(0, 2)));
+                    break;
+                default:
+                    return;
+
+            }
+
+            _drawningCommonLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
+            _drawningCommonLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
+            Draw();
+        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать Лайнер"
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            Random random = new();
+            CreateObject(nameof(DrawningLiner));
-            EntityLiner liner = new EntityLiner();
+        }
-            liner.Init(random.Next(100, 300), random.Next(1000, 3000),
+
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+        /// <summary>
-                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)), Convert.ToBoolean(random.Next(0, 2)));
+        /// </summary>
-            _drawningLiner = new DrawningLiner();
+        /// <param name="sender"></param>
-            _drawningLiner.Init(liner);
+        /// <param name="e"></param>
-            _drawningLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height);
+
-            _drawningLiner.SetPosition(random.Next(10, 100), random.Next(10, 100));
+        private void buttonCreateCommonLiner_Click(object sender, EventArgs e)
-            Draw();
+        {
+            CreateObject(nameof(DrawningCommonLiner));
         }
 
         /// <summary>
@@ -61,7 +98,7 @@ namespace ProjectLiner
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningLiner == null)
+            if (_drawningCommonLiner == null)
             {
                 return;
             }
@@ -71,16 +108,16 @@ namespace ProjectLiner
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningLiner.MoveTransport(DirectionType.Up);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningLiner.MoveTransport(DirectionType.Down);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningLiner.MoveTransport(DirectionType.Left);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningLiner.MoveTransport(DirectionType.Right);
+                    result = _drawningCommonLiner.MoveTransport(DirectionType.Right);
                     break;
             }
 
@@ -89,5 +126,48 @@ namespace ProjectLiner
                 Draw();
             }
         }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningCommonLiner == null)
+            {
+                return;
+            }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableLiner(_drawningCommonLiner), pictureBoxLiner.Width, pictureBoxLiner.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }

ProjectLiner/ProjectLiner/MovementStrategy/AbstractStrategy.cs

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

ProjectLiner/ProjectLiner/MovementStrategy/IMoveableObjectcs.cs

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

ProjectLiner/ProjectLiner/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.MovementStrategy;
+
+/// <summary>
+/// Стратегия перемещения объекта к правой нижней границы
+/// </summary>
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestination()
+    {
+        ObjectParameters? 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()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.RightBorder - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.DownBorder - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

ProjectLiner/ProjectLiner/MovementStrategy/MoveToCenter.cs

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

ProjectLiner/ProjectLiner/MovementStrategy/MoveableLiner.cs

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

ProjectLiner/ProjectLiner/MovementStrategy/MovementDirection.cs

@@ -1,9 +1,11 @@
-namespace ProjectLiner;
+namespace ProjectLiner.MovementStrategy;
+
+
 
 /// <summary>
 /// Направление перемещения
 /// </summary>
-public enum DirectionType
+public enum MovementDirection
 {
     /// <summary>
     /// Вверх
@@ -24,4 +26,5 @@ public enum DirectionType
     /// Вправо
     /// </summary>
     Right = 4
-}
+}
+

ProjectLiner/ProjectLiner/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.MovementStrategy;
+
+/// <summary>
+/// Параметры-координаты объекта
+/// </summary>
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата X
+    /// </summary>
+    private readonly int _x;
+
+    /// <summary>
+    /// Координата Y
+    /// </summary>
+    private readonly int _y;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    private readonly int _width;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    private readonly int _height;
+
+    /// <summary>
+    /// Левая граница
+    /// </summary>
+    public int LeftBorder => _x;
+
+    /// <summary>
+    /// Верхняя граница
+    /// </summary>
+    public int TopBorder => _y;
+
+    /// <summary>
+    /// Правая граница
+    /// </summary>
+    public int RightBorder => _x + _width;
+
+    /// <summary>
+    /// Нижняя граница
+    /// </summary>
+    public int 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;
+    }
+}

ProjectLiner/ProjectLiner/MovementStrategy/StrategyStatus.cs

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