Sailboat/Sailboat/AbstractStrategy.cs

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

Sailboat/Sailboat/Direction.cs

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

Sailboat/Sailboat/DrawingBoat.cs

@@ -1,145 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.Entities;
-
-namespace Sailboat.DrawingObjects
-{
-    public class DrawingBoat
-    {
-        public EntityBoat? EntityBoat { get; protected set; }
-        private int _pictureWidth;
-        private int _pictureHeight;
-        protected int _startPosX;
-        protected int _startPosY;
-        private readonly int _boatWidth = 160;
-        private readonly int _boatHeight = 160;
-        public int GetPosX => _startPosX;
-        public int GetPosY => _startPosY;
-        public int GetWidth => _boatWidth;
-        public int GetHeight => _boatHeight;
-
-
-        public DrawingBoat(int speed, double weight, Color bodyColor, int width, int height)
-        {
-            if (width < _boatWidth || height < _boatHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            EntityBoat = new EntityBoat(speed, weight, bodyColor);
-        }
-
-        protected DrawingBoat(int speed, double weight, Color bodyColor, int width, int height, int boatWidth, int boatHeight)
-        {
-            if (width < _boatWidth || height < _boatHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            _boatWidth = boatWidth;
-            _boatHeight = boatHeight;
-            EntityBoat = new EntityBoat(speed, weight, bodyColor);
-        }
-        public void SetPosition(int x, int y)
-        {
-            if (x < 0 || x + _boatWidth > _pictureWidth)
-            {
-                x = 0;
-            }
-            if (y < 0 || y + _boatHeight > _pictureHeight)
-            {
-                y = 0;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        public bool CanMove(DirectionType direction)
-        {
-            if (EntityBoat == null)
-            {
-                return false;
-            }
-            return direction switch
-            {
-                //влево
-                DirectionType.Left => _startPosX - EntityBoat.Step > 0,
-                //вверх
-                DirectionType.Up => _startPosY - EntityBoat.Step > 0,
-                // вправо
-                DirectionType.Right => _startPosX + EntityBoat.Step < _pictureWidth,
-                //вниз
-                DirectionType.Down => _startPosY + EntityBoat.Step < _pictureHeight,
-            };
-        }
-        public void MoveTransport(DirectionType direction)
-        {
-            if (EntityBoat == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                case DirectionType.Left:
-                    if (_startPosX - EntityBoat.Step > 0)
-                    {
-                        _startPosX -= (int)EntityBoat.Step;
-                    }
-                    break;
-                case DirectionType.Up:
-                    if ((_startPosY - 15) - EntityBoat.Step > 0)
-                    {
-                        _startPosY -= (int)EntityBoat.Step;
-                    }
-                    break;
-                case DirectionType.Right:
-                    if (_startPosX + EntityBoat.Step + _boatWidth < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityBoat.Step;
-                    }
-                    break;
-                case DirectionType.Down:
-                    if (_startPosY + EntityBoat.Step + _boatHeight < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityBoat.Step;
-                    }
-                    break;
-            }
-        }
-        public virtual void DrawTransport(Graphics g)
-        {
-            if (EntityBoat == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-
-            //Основной корпус лодки
-            Brush Brush = new
-            SolidBrush(EntityBoat.BodyColor);
-
-            Point[] hull = new Point[]
-            {
-                new Point(_startPosX + 10, _startPosY + 90),
-                new Point(_startPosX + 110, _startPosY + 90),
-                new Point(_startPosX + 140, _startPosY + 120),
-                new Point(_startPosX + 110, _startPosY + 150),
-                new Point(_startPosX + 10, _startPosY + 150)
-            };
-            g.FillPolygon(Brush, hull);
-            g.DrawPolygon(pen, hull);
-
-            Brush addBrush = new
-            SolidBrush(Color.Aqua);
-
-            //Каюта лодки
-            g.FillEllipse(addBrush, _startPosX + 20, _startPosY + 100, 90, 40);
-            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 90, 40);
-        }
-    }
-}

Sailboat/Sailboat/DrawingObjectBoat.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.DrawingObjects;
-
-namespace Sailboat.MovementStrategy
-{
-    public class DrawingObjectBoat : IMoveableObject
-    {
-        private readonly DrawingBoat? _drawingBoat = null;
-        public DrawingObjectBoat(DrawingBoat drawingBoat)
-        {
-            _drawingBoat = drawingBoat;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawingBoat == null || _drawingBoat.EntityBoat ==
-                null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawingBoat.GetPosX, _drawingBoat.GetPosY, _drawingBoat.GetWidth, _drawingBoat.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawingBoat?.EntityBoat?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) =>
-        _drawingBoat?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) =>
-        _drawingBoat?.MoveTransport(direction);
-
-    }
-}

Sailboat/Sailboat/DrawingSailboat.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.Entities;
-
-namespace Sailboat.DrawingObjects
-{
-    public class DrawingSailboat : DrawingBoat
-    {
-        public DrawingSailboat(int speed, double weight, Color bodyColor, Color additionalColor, bool hull, bool sail, int width, int height) :
- base(speed, weight, bodyColor, width, height, 160, 160)
-        {
-            if (EntityBoat != null)
-            {
-                EntityBoat = new EntitySailboat(speed, weight, bodyColor,
-                additionalColor, hull, sail);
-            }
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (EntityBoat is not EntitySailboat sailboat)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(sailboat.AdditionalColor);
-
-            //усиленный корпус парусной лодки
-            if (sailboat.Hull)
-            {
-                Point[] hullCooler = new Point[]
-                {
-                    new Point(_startPosX, _startPosY + 80),
-                    new Point(_startPosX + 120, _startPosY + 80),
-                    new Point(_startPosX + 160, _startPosY + 120),
-                    new Point(_startPosX + 120, _startPosY + 160),
-                    new Point(_startPosX, _startPosY + 160)
-                };
-                g.FillPolygon(additionalBrush, hullCooler);
-                g.DrawPolygon(pen, hullCooler);
-            }
-            base.DrawTransport(g);
-
-            //Парус с флагом
-            if (sailboat.Sail)
-            {
-                Brush sailBrush = new
-                SolidBrush(sailboat.AdditionalColor);
-
-                Point[] sail = new Point[]
-                {
-                    new Point(_startPosX + 65, _startPosY),
-                    new Point(_startPosX + 130, _startPosY + 120),
-                    new Point(_startPosX + 15, _startPosY + 120)
-                };
-                g.FillPolygon(sailBrush, sail);
-                g.DrawPolygon(pen, sail);
-                //Флаг
-                Brush addBrush = new
-                SolidBrush(Color.Aqua);
-                Brush flagBrush = new
-                SolidBrush(sailboat.AdditionalColor);
-                Point[] flag = new Point[]
-               {
-                    new Point(_startPosX + 65, _startPosY - 15),
-                    new Point(_startPosX + 65, _startPosY + 10),
-                    new Point(_startPosX + 20, _startPosY + 10),
-                    new Point(_startPosX + 20, _startPosY - 15),
-               };
-                g.FillPolygon(addBrush, flag);
-                g.DrawPolygon(pen, flag);
-                g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 130), new Point(_startPosX + 65, _startPosY - 15));
-            }
-        }
-    }
-}

Sailboat/Sailboat/EntityBoat.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.Entities
-{
-    public class EntityBoat
-    {
-        public int Speed { get; private set; }
-        public double Weight { get; private set; }
-        public Color BodyColor { get; private set; }
-        public double Step => (double)Speed * 100 / Weight;
-        public EntityBoat(int speed, double weight, Color bodyColor)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

Sailboat/Sailboat/EntitySailboat.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.Entities
-{
-    public class EntitySailboat : EntityBoat
-    {
-        public Color AdditionalColor { get; private set; }
-        public bool Hull { get; private set; }
-        public bool Sail { get; private set; }
-        public EntitySailboat(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool hull, bool sail) : base (speed, weight, bodyColor)
-        {
-            AdditionalColor = additionalColor;
-            Hull = hull;
-            Sail = sail;
-        }
-    }
-}

Sailboat/Sailboat/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace Sailboat
+{
+    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
+    }
+}

Sailboat/Sailboat/Form1.cs

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

Sailboat/Sailboat/FormSailboat.Designer.cs

@@ -1,191 +0,0 @@
-namespace Sailboat
-{
-    partial class FormSailboat
-    {
-        /// <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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormSailboat));
-            pictureBoxSailboat = new PictureBox();
-            buttonCreateBoat = new Button();
-            buttonLeft = new Button();
-            buttonUp = new Button();
-            buttonRight = new Button();
-            buttonDown = new Button();
-            buttonCreateSailboat = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStep = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxSailboat).BeginInit();
-            SuspendLayout();
-            // 
-            // pictureBoxSailboat
-            // 
-            pictureBoxSailboat.Dock = DockStyle.Fill;
-            pictureBoxSailboat.Location = new Point(0, 0);
-            pictureBoxSailboat.Margin = new Padding(3, 2, 3, 2);
-            pictureBoxSailboat.Name = "pictureBoxSailboat";
-            pictureBoxSailboat.Size = new Size(834, 461);
-            pictureBoxSailboat.SizeMode = PictureBoxSizeMode.AutoSize;
-            pictureBoxSailboat.TabIndex = 0;
-            pictureBoxSailboat.TabStop = false;
-            // 
-            // buttonCreateBoat
-            // 
-            buttonCreateBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateBoat.Location = new Point(12, 408);
-            buttonCreateBoat.Margin = new Padding(3, 2, 3, 2);
-            buttonCreateBoat.Name = "buttonCreateBoat";
-            buttonCreateBoat.Size = new Size(111, 42);
-            buttonCreateBoat.TabIndex = 1;
-            buttonCreateBoat.Text = "Создать лодку";
-            buttonCreateBoat.UseVisualStyleBackColor = true;
-            buttonCreateBoat.Click += buttonCreateBoat_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
-            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.Location = new Point(673, 420);
-            buttonLeft.Margin = new Padding(3, 2, 3, 2);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(30, 30);
-            buttonLeft.TabIndex = 2;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += buttonMove_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage");
-            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.Location = new Point(716, 386);
-            buttonUp.Margin = new Padding(3, 2, 3, 2);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(30, 30);
-            buttonUp.TabIndex = 3;
-            buttonUp.UseVisualStyleBackColor = true;
-            buttonUp.Click += buttonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage");
-            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.Location = new Point(760, 420);
-            buttonRight.Margin = new Padding(3, 2, 3, 2);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(30, 30);
-            buttonRight.TabIndex = 4;
-            buttonRight.UseVisualStyleBackColor = true;
-            buttonRight.Click += buttonMove_Click;
-            // 
-            // buttonDown
-            // 
-            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage");
-            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.Location = new Point(716, 420);
-            buttonDown.Margin = new Padding(3, 2, 3, 2);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(30, 30);
-            buttonDown.TabIndex = 5;
-            buttonDown.UseVisualStyleBackColor = true;
-            buttonDown.Click += buttonMove_Click;
-            // 
-            // buttonCreateSailboat
-            //
-            buttonCreateSailboat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateSailboat.Location = new Point(145, 408);
-            buttonCreateSailboat.Margin = new Padding(3, 2, 3, 2);
-            buttonCreateSailboat.Name = "buttonCreateSailboat";
-            buttonCreateSailboat.Size = new Size(111, 42);
-            buttonCreateSailboat.TabIndex = 6;
-            buttonCreateSailboat.Text = "Создать парусник";
-            buttonCreateSailboat.UseVisualStyleBackColor = true;
-            buttonCreateSailboat.Click += buttonCreateSailboat_Click;
-            //
-            // comboBoxStrategy
-            //
-            comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "До центра", "До края" });
-            comboBoxStrategy.Location = new Point(701, 0);
-            comboBoxStrategy.Margin = new Padding(3, 2, 3, 2);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(133, 23);
-            comboBoxStrategy.TabIndex = 7;
-            //
-            // buttonStep
-            //
-            buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonStep.Location = new Point(701, 27);
-            buttonStep.Margin = new Padding(3, 2, 3, 2);
-            buttonStep.Name = "buttonStep";
-            buttonStep.Size = new Size(133, 23);
-            buttonStep.TabIndex = 8;
-            buttonStep.Text = "Шаг";
-            buttonStep.UseVisualStyleBackColor = true;
-            buttonStep.Click += buttonStep_Click;
-            //
-            // FormSailboat
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(834, 461);
-            Controls.Add(buttonStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateSailboat);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonRight);
-            Controls.Add(buttonUp);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateBoat);
-            Controls.Add(pictureBoxSailboat);
-            Margin = new Padding(3, 2, 3, 2);
-            Name = "FormSailboat";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "Парусник";
-            Load += FormSailboat_Load;
-            ((System.ComponentModel.ISupportInitialize)pictureBoxSailboat).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxSailboat;
-        private Button buttonCreateBoat;
-        private Button buttonLeft;
-        private Button buttonUp;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonCreateSailboat;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStep;
-    }
-}

Sailboat/Sailboat/FormSailboat.cs

@@ -1,109 +0,0 @@
-using Sailboat.Entities;
-using Sailboat.DrawingObjects;
-using Sailboat.MovementStrategy;
-
-namespace Sailboat
-{
-    public partial class FormSailboat : Form
-    {
-        private DrawingBoat? _drawingBoat;
-        private AbstractStrategy? _abstractStrategy;
-        public FormSailboat()
-        {
-            InitializeComponent();
-        }
-        private void Draw()
-        {
-            if (_drawingBoat == null)
-            {
-                return;
-            }
-            Bitmap bmp = new(pictureBoxSailboat.Width,
-            pictureBoxSailboat.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawingBoat.DrawTransport(gr);
-            pictureBoxSailboat.Image = bmp;
-        }
-        private void buttonCreateBoat_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawingBoat = new DrawingBoat(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), pictureBoxSailboat.Width, pictureBoxSailboat.Height);
-            _drawingBoat.SetPosition(random.Next(10, 100), random.Next(10,
-            100));
-            Draw();
-        }
-        private void buttonCreateSailboat_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawingBoat = new DrawingSailboat(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)), pictureBoxSailboat.Width, pictureBoxSailboat.Height);
-            _drawingBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawingBoat == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawingBoat.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawingBoat.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawingBoat.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawingBoat.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-        }
-        private void buttonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawingBoat == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new DrawingObjectBoat(_drawingBoat), pictureBoxSailboat.Width,
-                pictureBoxSailboat.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
-
-        private void FormSailboat_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

Sailboat/Sailboat/IMoveableObject.cs

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

Sailboat/Sailboat/MoveToBorder.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.MovementStrategy
-{
-    public class MoveToBorder : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.RightBorder <= FieldWidth &&
-                objParams.RightBorder + GetStep() >= FieldWidth &&
-                objParams.DownBorder <= 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();
-                }
-            }
-        }
-    }
-}

Sailboat/Sailboat/MoveToCenter.cs

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

Sailboat/Sailboat/ObjectParameters.cs

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

Sailboat/Sailboat/Program.cs

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

Sailboat/Sailboat/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Sailboat.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Sailboat.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

Sailboat/Sailboat/Sailboat.csproj

@@ -8,19 +8,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>

Sailboat/Sailboat/Status.cs

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