Добавление стратегии

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DirectionType.cs

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

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningArtillery.cs

@@ -0,0 +1,58 @@
+using SelfPropelledArtilleryUnit.Entities;
+
+namespace SelfPropelledArtilleryUnit.Drawnings;
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningArtillery : DrawningTank
+{
+    /// <summary>
+    /// конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="cannon">Признак наличия пушки</param>
+    /// <param name="rocket">Признак наличия залповой установки</param>
+
+    public DrawningArtillery(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket) : base(130,70)
+    {
+        EntityTank = new EntityArtillery(speed, weight, bodyColor, additionalColor, cannon, rocket);
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+
+        if (EntityTank == null || EntityTank is not EntityArtillery artillery || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+       
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(artillery.AdditionalColor);
+ 
+        //орудие 
+        if (artillery.Cannon)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value + 80, _startPosY.Value + 25, 50, 5);
+            g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 25, 50, 5);
+        }
+        //установка
+        if (artillery.Cannon)
+        {
+            //колонна
+            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 10, 5, 30);
+            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 10, 5, 30);
+            //контейнер
+            g.FillRectangle(additionalBrush, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13);
+            g.DrawRectangle(pen, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13);
+            //ракеты
+            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 5, 10, 3);
+            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 10, 10, 3);
+            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 15, 10, 3);
+        }
+        base.DrawTransport(g);
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningTank.cs

@@ -1,13 +1,18 @@
-namespace SelfPropelledArtilleryUnit;
+using SelfPropelledArtilleryUnit.Entities;
-/// <summary>
+using System;
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+using System.Collections.Generic;
-/// </summary>
+using System.Linq;
-public class DrawningArtillery
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit.Drawnings;
+
+public class DrawningTank
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityArtillery? EntityArtillery { get; private set; }
+    public EntityTank? EntityTank { get; protected set; }
     /// <summary>
     /// Ширина окна
     /// </summary>
@@ -19,39 +24,58 @@ public class DrawningArtillery
     /// <summary>
     /// Левая координата прорисовки автомобиля
     /// </summary>
-    private int? _startPosX;
+    protected private int? _startPosX;
     /// <summary>
     /// Верхняя кооридната прорисовки автомобиля
     /// </summary>
-    private int? _startPosY;
+    protected private int? _startPosY;
     /// <summary>
     /// Ширина прорисовки автомобиля
     /// </summary>
-    private readonly int _drawningArtilleryWidth = 130;
+    private readonly int _drawningTankWidth = 130;
     /// <summary>
     /// Высота прорисовки автомобиля
     /// </summary>
-    private readonly int _drawningArtilleryHeight = 70;
+    private readonly int _drawningTankHeight = 70;
     /// <summary>
-    /// Инициализация свойств
+    /// Пустой конструктор
     /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="cannon">Признак наличия пушки</param>
-    /// <param name="rocket">Признак наличия залповой установки</param>
 
-    public void Init(int speed, double weight, Color bodyColor, Color
+    /// <summary>
-    additionalColor, bool cannon, bool rocket)
+    /// Координата X объекта
+    /// </summary>
+    public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningTankWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningTankHeight;
+    private DrawningTank()
     {
-        EntityArtillery = new EntityArtillery();
-        EntityArtillery.Init(speed, weight, bodyColor, additionalColor, cannon, rocket);
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
     }
+    public DrawningTank(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityTank = new EntityTank(speed, weight, bodyColor);
+    }
+    protected DrawningTank(int drawningTankWidth, int drawningTankHeight) : this()
+    {
+        _drawningTankWidth = drawningTankWidth;
+        _pictureHeight = drawningTankHeight;
+    }
     /// <summary>
     /// Установка границ поля
     /// </summary>
@@ -60,7 +84,7 @@ public class DrawningArtillery
     /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
     public bool SetPictureSize(int width, int height)
     {
-        if (_drawningArtilleryHeight > height || _drawningArtilleryWidth > width)
+        if (_drawningTankHeight > height || _drawningTankWidth > width)
         {
             return false;
         }
@@ -88,18 +112,18 @@ public class DrawningArtillery
         }
         // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы
         // то надо изменить координаты, чтобы он оставался в этих границах
-        if (x < 0 || x + _drawningArtilleryWidth > _pictureWidth)
+        if (x < 0 || x + _drawningTankWidth > _pictureWidth)
         {
-            _startPosX = _pictureWidth - _drawningArtilleryWidth;
+            _startPosX = _pictureWidth - _drawningTankWidth;
         }
         else
         {
             _startPosX = x;
         }
 
-        if (y < 0 || y + _drawningArtilleryHeight > _pictureHeight)
+        if (y < 0 || y + _drawningTankHeight > _pictureHeight)
         {
-            _startPosY = _pictureHeight - _drawningArtilleryHeight;
+            _startPosY = _pictureHeight - _drawningTankHeight;
         }
         else
         {
@@ -113,7 +137,7 @@ public class DrawningArtillery
     /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
     public bool MoveTransport(DirectionType direction)
     {
-        if (EntityArtillery == null || !_startPosX.HasValue ||
+        if (EntityTank == null || !_startPosX.HasValue ||
         !_startPosY.HasValue)
         {
             return false;
@@ -122,31 +146,31 @@ public class DrawningArtillery
         {
             //влево
             case DirectionType.Left:
-                if (_startPosX.Value - EntityArtillery.Step > 0)
+                if (_startPosX.Value - EntityTank.Step > 0)
                 {
-                    _startPosX -= (int)EntityArtillery.Step;
+                    _startPosX -= (int)EntityTank.Step;
                 }
                 return true;
             //вверх
             case DirectionType.Up:
-                if (_startPosY.Value - EntityArtillery.Step > 0)
+                if (_startPosY.Value - EntityTank.Step > 0)
                 {
-                    _startPosY -= (int)EntityArtillery.Step;
+                    _startPosY -= (int)EntityTank.Step;
                 }
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + EntityArtillery.Step + _drawningArtilleryWidth < _pictureWidth)
+                if (_startPosX.Value + EntityTank.Step + _drawningTankWidth < _pictureWidth)
                 {
-                    _startPosX += (int)EntityArtillery.Step;
+                    _startPosX += (int)EntityTank.Step;
                 }
 
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + EntityArtillery.Step + _drawningArtilleryHeight < _pictureHeight)
+                if (_startPosY.Value + EntityTank.Step + _drawningTankHeight < _pictureHeight)
                 {
-                    _startPosY += (int)EntityArtillery.Step;
+                    _startPosY += (int)EntityTank.Step;
                 }
                 return true;
             default:
@@ -157,18 +181,16 @@ public class DrawningArtillery
     /// Прорисовка объекта
     /// </summary>
     /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g)
     {
-        if (EntityArtillery == null || !_startPosX.HasValue ||
+        if (EntityTank == null || !_startPosX.HasValue ||
         !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new
+        Brush brush = new SolidBrush(EntityTank.BodyColor);
-        SolidBrush(EntityArtillery.AdditionalColor);
-        Brush brush = new SolidBrush(EntityArtillery.BodyColor);
         Brush grayBrush = new SolidBrush(Color.Gray);
         Brush blackBrush = new SolidBrush(Color.Black);
         //тело
@@ -176,8 +198,8 @@ public class DrawningArtillery
         g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 40, 110, 20);
 
         //башня
-        g.FillRectangle(brush, _startPosX.Value+30, _startPosY.Value+20,50,20);
+        g.FillRectangle(brush, _startPosX.Value + 30, _startPosY.Value + 20, 50, 20);
-        g.DrawRectangle(pen, _startPosX.Value+30, _startPosY.Value + 20, 50, 20);
+        g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 20, 50, 20);
         //ходовая
         //основа
         g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 50, 110, 20);
@@ -205,25 +227,7 @@ public class DrawningArtillery
         //6-ПравБол 
         g.DrawEllipse(pen, _startPosX.Value + 7, _startPosY.Value + 52, 15, 15);
         g.FillEllipse(blackBrush, _startPosX.Value + 7, _startPosY.Value + 52, 15, 15);
-        //орудие 
+        
-        if (EntityArtillery.Cannon)
-        {
-            g.FillRectangle(additionalBrush, _startPosX.Value+80, _startPosY.Value + 25, 50, 5);
-            g.DrawRectangle(pen, _startPosX.Value+80, _startPosY.Value + 25, 50, 5);
-        }
-        //установка
-        if (EntityArtillery.Cannon)
-        {
-            //колонна
-            g.FillRectangle(additionalBrush, _startPosX.Value +5, _startPosY.Value + 10, 5, 30);
-            g.DrawRectangle(pen, _startPosX.Value +5, _startPosY.Value + 10, 5, 30);
-            //контейнер
-            g.FillRectangle(additionalBrush, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13);
-            g.DrawRectangle(pen, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13);
-            //ракеты
-            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 5, 10, 3);
-            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 10, 10, 3);
-            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 15, 10, 3);
-        }
     }
 }
+

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs

@@ -0,0 +1,39 @@
+namespace SelfPropelledArtilleryUnit.Entities;
+/// <summary>
+/// Класс-сущность "САУ"
+/// </summary>
+
+public class EntityArtillery : EntityTank
+{
+    /// <summary>
+    /// Дополнительный цвет (для опциональных элементов)
+    /// </summary>
+    public Color AdditionalColor { get; private set; }
+    /// <summary>
+    /// Признак (опция) наличия пушки
+    /// </summary>
+    public bool Cannon { get; private set; }
+    /// <summary>
+    /// Признак (опция) наличия залповой установки
+    /// </summary>
+    public bool Rocket { get; private set; }
+
+  
+    /// <summary>
+    /// Инициализация полей объекта-класса спортивного автомобиля
+    /// </summary>
+ 
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="cannon">Признак наличия пушки</param>
+    /// <param name="rocket">Признак наличия залповой установки</param>
+
+    public EntityArtillery(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket) : base(speed, weight, bodyColor)
+    {
+       
+        AdditionalColor = additionalColor;
+        Cannon = cannon;
+        Rocket = rocket;
+    }
+
+}
+

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs

@@ -0,0 +1,36 @@
+namespace SelfPropelledArtilleryUnit.Entities;
+/// <summary>
+/// Класс-сущность "танк"
+/// </summary>
+public class EntityTank
+{
+    
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get;  set; }
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get;  set; }
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get;  set; }
+
+    /// <summary>
+    /// Шаг перемещения автомобиля
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    public EntityTank(int speed, double weight, Color bodyColor) 
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+
+    }
+
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntityArtillery.cs

@@ -1,60 +0,0 @@
-namespace SelfPropelledArtilleryUnit;
-/// <summary>
-/// Класс-сущность "САУ"
-/// </summary>
-
-
-public class EntityArtillery
-    {
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public double Weight { get; private set; }
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-        /// <summary>
-        /// Дополнительный цвет (для опциональных элементов)
-        /// </summary>
-        public Color AdditionalColor { get; private set; }
-        /// <summary>
-        /// Признак (опция) наличия пушки
-        /// </summary>
-        public bool Cannon { get; private set; }
-        /// <summary>
-        /// Признак (опция) наличия залповой установки
-        /// </summary>
-         public bool Rocket { 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="cannon">Признак наличия пушки</param>
-        /// <param name="rocket">Признак наличия залповой установки</param>
-
-        public void Init(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool cannon, bool rocket)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalColor = additionalColor;
-            Cannon = cannon;
-            Rocket = rocket;
-        }
-
-    }
-

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs

@@ -35,6 +35,9 @@
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
+            buttonCreateTank = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxArtillery).BeginInit();
             SuspendLayout();
             // 
@@ -52,9 +55,9 @@
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreate.Location = new Point(12, 417);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(75, 23);
+            buttonCreate.Size = new Size(90, 23);
             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;
             // 
+            // buttonCreateTank
+            // 
+            buttonCreateTank.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateTank.Location = new Point(117, 417);
+            buttonCreateTank.Name = "buttonCreateTank";
+            buttonCreateTank.Size = new Size(138, 23);
+            buttonCreateTank.TabIndex = 6;
+            buttonCreateTank.Text = "Создать самоходку";
+            buttonCreateTank.UseVisualStyleBackColor = true;
+            buttonCreateTank.Click += ButtonCreateTank_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(679, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(719, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(75, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormArtillery
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 461);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonCreateTank);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
@@ -131,5 +168,8 @@
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonRight;
+        private Button buttonCreateTank;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.cs

@@ -7,51 +7,82 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SelfPropelledArtilleryUnit.Drawnings;
+using SelfPropelledArtilleryUnit.MovementStrategy;
 
 namespace SelfPropelledArtilleryUnit
 {
     public partial class FormArtillery : Form
     {
-        private DrawningArtillery? _drawningArtillery;
+        /// <summary>
-
+        /// Поле-объект для прорисовки объекта
+        /// </summary>
+        private DrawningTank? _drawningTank;
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
         public FormArtillery()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
 
         private void Draw()
         {
-            if (_drawningArtillery == null)
+            if (_drawningTank == null)
             {
                 return;
             }
 
             Bitmap bmp = new(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningArtillery.DrawTransport(gr);
+            _drawningTank.DrawTransport(gr);
             pictureBoxArtillery.Image = bmp;
         }
-
+        private void CreateObject(string type)
-        private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
-            _drawningArtillery = new DrawningArtillery();
+            switch (type)
-            _drawningArtillery.Init(random.Next(100, 300), random.Next(1000, 3000),
+            {
-
+                case nameof(DrawningTank):
+                    _drawningTank = new DrawningTank(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(DrawningArtillery):
+                    _drawningTank = new DrawningArtillery(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)));
-
+                    break;
-            _drawningArtillery.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
+                default:
-            _drawningArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100));
+                    return;
+            }
+            _drawningTank.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
+            _drawningTank.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) => CreateObject(nameof(DrawningArtillery));
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать самоходку"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateTank_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank));
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningArtillery == null)
+            if (_drawningTank == null)
             {
                 return;
             }
@@ -61,16 +92,16 @@ namespace SelfPropelledArtilleryUnit
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningArtillery.MoveTransport(DirectionType.Up);
+                    result = _drawningTank.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningArtillery.MoveTransport(DirectionType.Down);
+                    result = _drawningTank.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningArtillery.MoveTransport(DirectionType.Left);
+                    result = _drawningTank.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningArtillery.MoveTransport(DirectionType.Right);
+                    result = _drawningTank.MoveTransport(DirectionType.Right);
                     break;
             }
 
@@ -79,5 +110,47 @@ namespace SelfPropelledArtilleryUnit
                 Draw();
             }
         }
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningTank == null)
+            {
+                return;
+            }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableTank(_drawningTank), pictureBoxArtillery.Width, pictureBoxArtillery.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/AbstractStrategy.cs

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

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/IMoveableObjectcs.cs

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

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit.MovementStrategy;
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.LeftBorder - GetStep() <= 0 || objParams.RightBorder + GetStep() >= FieldWidth ||
+            objParams.TopBorder - GetStep() <= 0 || objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int x = objParams.RightBorder;
+        if (x + GetStep() < FieldWidth) MoveRight();
+        int y = objParams.DownBorder;
+        if (y + GetStep() < FieldHeight) MoveDown();
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit.MovementStrategy;
+
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/MoveableTank.cs

@@ -0,0 +1,56 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit.MovementStrategy;
+
+public class MoveableTank : IMoveableObject
+{
+    private readonly DrawningTank? _tank;
+    public MoveableTank(DrawningTank tank)
+    {
+        _tank = tank;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_tank == null || _tank.EntityTank == null || !_tank.GetPosX.HasValue || !_tank.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_tank.GetPosX.Value, _tank.GetPosY.Value, _tank.GetWidth, _tank.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_tank?.EntityTank?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_tank == null || _tank.EntityTank == null)
+        {
+            return false;
+        }
+
+        return _tank.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,
+        };
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/MovementDirection.cs

@@ -4,13 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SelfPropelledArtilleryUnit;
+namespace SelfPropelledArtilleryUnit.MovementStrategy;
 
-    public enum DirectionType
+public enum MovementDirection
-    {
+{
     Up = 1,
     Down = 2,
     Left = 3,
     Right = 4
 }
-

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/ObjectsParameters.cs

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

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/MovementStrategy/StrategyStatus.cs

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