ProjectPlane/ProjectPlane/CollectionGenericObjects/AbstractCompany.cs

@@ -1,60 +0,0 @@
-using ProjectPlane.Drawnings;
-
-namespace ProjectPlane.CollectionGenericObjects;
-
-public abstract class AbstractCompany
-{
-    protected readonly int _placeSizeWidth = 320;
-   
-    protected readonly int _placeSizeHeight = 120;
-    
-    protected readonly int _pictureWidth;
-    
-    protected readonly int _pictureHeight;
-    
-    protected ICollectionGenericObjects<DrawningShip>? _collection = null;
-    
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
-
-    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningShip> collection)
-    {
-        _pictureWidth = picWidth;
-        _pictureHeight = picHeight;
-        _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
-    }
-    
-    public static int operator +(AbstractCompany company, DrawningShip ship)
-    {
-        return company._collection.Insert(ship);
-    }
-    
-    public static DrawningShip? operator -(AbstractCompany company, int position)
-    {
-        return company._collection?.Remove(position);
-    }
-    
-    public DrawningShip? GetRandomObject()
-    {
-        Random rnd = new();
-        return _collection?.Get(rnd.Next(GetMaxCount));
-    }
-    
-    public Bitmap? Show()
-    {
-        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
-        Graphics graphics = Graphics.FromImage(bitmap);
-        DrawBackgound(graphics);
-        SetObjectsPosition();
-        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
-        {
-            DrawningShip? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
-        }
-        return bitmap;
-    }
-
-    protected abstract void DrawBackgound(Graphics g);
- 
-    protected abstract void SetObjectsPosition();
-}

ProjectPlane/ProjectPlane/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,19 +0,0 @@
-
-namespace ProjectPlane.CollectionGenericObjects;
-
-public interface ICollectionGenericObjects<T>
-    where T : class
-{
-    int Count { get; }
-
-    int SetMaxCount { set; }
-    
-    int Insert(T obj);
-    
-    int Insert(T obj, int position);
-
-    T? Remove(int position);
-
-    T? Get(int position);
-}
-

ProjectPlane/ProjectPlane/CollectionGenericObjects/Marina.cs

@@ -1,57 +0,0 @@
-using ProjectPlane.Drawnings;
-
-namespace ProjectPlane.CollectionGenericObjects;
-
-public class Marina : AbstractCompany
-{
-    public Marina(int picWidth, int picHeight, ICollectionGenericObjects<DrawningShip> collection) : base(picWidth, picHeight, collection)
-    {
-    }
-
-    protected override void DrawBackgound(Graphics g)
-    {
-        Pen pen = new(Color.Black, 2);
-
-        for (int i = 0; i < _pictureHeight / _placeSizeHeight; i++)
-        {
-            int y = _placeSizeHeight;
-            y *= i;
-
-            for (int j = 0; j <= _pictureWidth / _placeSizeWidth; j++)
-            {
-                int x = _placeSizeWidth;
-                x *= j;
-
-                g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y);
-                g.DrawLine(pen, x, y + _placeSizeHeight - 10, x + _placeSizeWidth / 2, y + _placeSizeHeight - 10);
-            }
-
-        }
-    }
-
-    protected override void SetObjectsPosition()
-    {
-        int n = _pictureWidth / _placeSizeWidth;
-        int m = 0;
-
-        for (int i = 0; i < (_collection?.Count ?? 0); i++)
-        {
-            if (_collection?.Get(i) != null)
-            {
-                int x = _placeSizeWidth * n;
-                int y = (10 + _placeSizeHeight * (_pictureHeight / _placeSizeHeight - 1)) - _placeSizeHeight * m;
-
-                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-                _collection?.Get(i)?.SetPosition(x, y);
-            }
-
-            if (n > 0)
-                n--;
-            else
-            {
-                n = _pictureWidth / _placeSizeWidth;
-                m++;
-            }
-        }
-    }
-}

ProjectPlane/ProjectPlane/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,96 +0,0 @@
-namespace ProjectPlane.CollectionGenericObjects;
-
-public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
-    where T : class
-{
-    private T?[] _collection;
-    public int Count => _collection.Length;
-    public int SetMaxCount
-    {
-        set
-        {
-            if (value > 0)
-            {
-                if (_collection.Length > 0)
-                {
-                    Array.Resize(ref _collection, value);
-                }
-                else
-                {
-                    _collection = new T?[value];
-                }
-            }
-        }
-    }
-
-    public MassiveGenericObjects()
-    {
-        _collection = Array.Empty<T?>();
-    }
-    public T? Get(int position)
-    {
-        if (position < 0 || position > Count)
-        {
-            return null;
-        }
-        return _collection[position];
-    }
-
-    public int Insert(T obj)
-    {
-        for (int i = 0; i < Count; i++)
-        {
-            if (_collection[i] == null)
-            {
-                _collection[i] = obj;
-                return i;
-            }
-        }
-        return -1;
-    }
-    public int Insert(T obj, int position)
-    {
-        if (position < 0 || position > Count)
-        {
-            return -1;
-        }
-
-        if (_collection[position] == null)
-        {
-            _collection[position] = obj;
-            return position;
-        }
-
-        for (int i = position + 1; i < Count; i++)
-        {
-            if (_collection[i] == null)
-            {
-                _collection[i] = obj;
-                return position;
-            }
-        }
-
-        for (int i = position - 1; i >= 0; i--)
-        {
-            if (_collection[i] == null)
-            {
-                _collection[i] = obj;
-                return position;
-            }
-        }
-
-        return -1;
-    }
-    public T? Remove(int position)
-    {
-        if (position < 0 || position > Count || _collection[position] == null)
-        {
-            return null;
-        }
-
-        T? obj = _collection[position];
-        _collection[position] = null;
-        return obj;
-    }
-
-}

ProjectPlane/ProjectPlane/Drawnings/DirectionType.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectPlane.Drawnings;
-
-public enum DirectionType
-{
-    Unknow = -1,
-
-    Up = 1, 
-
-    Down = 2,
-    
-    Left = 3,
-
-    Right = 4
-}

ProjectPlane/ProjectPlane/Drawnings/DrawCont.cs

@@ -1,41 +0,0 @@
-using ProjectPlane.Entities;
-
-namespace ProjectPlane.Drawnings;
-
-public class DrawCont : DrawningShip
-{
-    public DrawCont(int speed, double weight, Color shipColor, Color containerColor, bool container, bool crane) : base(160, 90)
-    {
-        EntityShip = new EntityContainer(speed, weight, shipColor, containerColor, container, crane);
-    }
-
-    public override void DrawTransport(Graphics g)
-    {
-        if (EntityShip == null || !_StartPosX.HasValue || !_StartPosY.HasValue || EntityShip is not EntityContainer container)
-        {
-            return;
-        }
-
-        Pen pen = new(Color.Black);
-        Brush ContainerBrush = new SolidBrush(container.ContainerColor);
-
-        // отрисовка контейнера
-        if (container.Container)
-        {
-            g.DrawRectangle(pen, _StartPosX.Value + 80, _StartPosY.Value, 60, 40);
-            g.FillRectangle(ContainerBrush, _StartPosX.Value + 81, _StartPosY.Value + 1, 59, 39);
-        }
-
-        _StartPosY += 40;
-        base.DrawTransport(g);
-        _StartPosY -= 40;
-
-        //отрисовка крана
-        if (container.Crane)
-        {
-            g.DrawLine(pen, _StartPosX.Value + 30, _StartPosY.Value + 50, _StartPosX.Value + 30, _StartPosY.Value + 70);
-            g.DrawLine(pen, _StartPosX.Value + 20, _StartPosY.Value + 60, _StartPosX.Value + 40, _StartPosY.Value + 60);
-        }
-    }
-
-}

ProjectPlane/ProjectPlane/Drawnings/DrawningShip.cs

@@ -1,175 +0,0 @@
-using ProjectPlane.Entities;
-
-namespace ProjectPlane.Drawnings;
-
-public class DrawningShip
-{
-    public EntityShip? EntityShip { get; protected set; }
-
-    private int? _PictureWidth;
-
-    private int? _PictureHeight;
-
-    protected int? _StartPosX;
-
-    protected int? _StartPosY;
-
-    private readonly int _drawingContWidth = 160;
-
-    private readonly int _drawingContHeight = 50;
-
-    public int? GetPosX => _StartPosX;
-
-    public int? GetPosY => _StartPosY;
-
-    public int GetWidth => _drawingContWidth;
-
-    public int GetHeight => _drawingContHeight;
-
-    private DrawningShip()
-    {
-        _PictureWidth = null;
-        _PictureHeight = null;
-        _StartPosX = null;
-        _StartPosY = null;
-    }
-
-    public DrawningShip(int speed, double weight, Color shipColor) : this()
-    {
-        EntityShip = new EntityShip(speed, weight, shipColor);
-    }
-
-    protected DrawningShip(int drawingShipWidth, int drawingShipHeight) : this() 
-    {
-        _drawingContWidth = drawingShipWidth;
-        _drawingContHeight = drawingShipHeight;
-    }
-
-    public bool SetPictureSize(int width, int height)
-    {
-        if (EntityShip == null)
-        {
-            return false;
-        }
-
-        if (width >= _drawingContWidth && height >= _drawingContHeight)
-        {
-            _PictureWidth = width;
-            _PictureHeight = height;
-
-            if (_StartPosX.HasValue && _StartPosY.HasValue)
-            {
-                if (_StartPosX.Value + _drawingContWidth > width)
-                {
-                    _StartPosX = width - _drawingContWidth;
-                }
-                if (_StartPosY.Value + _drawingContHeight > height)
-                {
-                    _StartPosY = _PictureHeight - height;
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    public void SetPosition(int x, int y)
-    {
-        if (!_PictureHeight.HasValue || !_PictureWidth.HasValue)
-        {
-            return;
-        }
-
-        if (x < 0)
-        {
-            x = 0;
-        }
-        else if (x + _drawingContWidth > _PictureWidth)
-        {
-            x = _PictureWidth.Value - _drawingContWidth;
-        }
-
-        if (y < 0)
-        {
-            y = 0;
-        }
-        else if (y + _drawingContHeight > _PictureHeight)
-        {
-            y = _PictureHeight.Value - _drawingContHeight;
-        }
-
-        _StartPosX = x;
-        _StartPosY = y;
-    }
-
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntityShip == null || !_StartPosX.HasValue || !_StartPosY.HasValue)
-        {
-            return false;
-        }
-
-        switch (direction)
-        {
-            case DirectionType.Left:
-                if (_StartPosX.Value - EntityShip.Step > 0)
-                {
-                    _StartPosX -= (int)EntityShip.Step;
-                }
-                return true;
-
-            case DirectionType.Right:
-                if (_StartPosX.Value + EntityShip.Step < _PictureWidth - _drawingContWidth)
-                {
-                    _StartPosX += (int)EntityShip.Step;
-                }
-                return true;
-
-            case DirectionType.Up:
-
-                if (_StartPosY.Value - EntityShip.Step > 0)
-                {
-                    _StartPosY -= (int)EntityShip.Step;
-                }
-                return true;
-
-            case DirectionType.Down:
-                if (_StartPosY.Value + EntityShip.Step < _PictureHeight - _drawingContHeight)
-                {
-                    _StartPosY += (int)EntityShip.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-
-    }
-
-    public virtual void DrawTransport(Graphics g)
-    {
-        if (EntityShip == null || !_StartPosX.HasValue || !_StartPosY.HasValue)
-        {
-            return;
-        }
-
-        Pen pen = new(Color.Black);
-        
-
-        Brush ShipBrush = new SolidBrush(EntityShip.ShipColor);
-
-        //отрисовка корабля
-        Point[] points =
-        {
-            new Point(_StartPosX.Value, _StartPosY.Value),
-            new Point(_StartPosX.Value + 160, _StartPosY.Value),
-            new Point(_StartPosX.Value + 150, _StartPosY.Value + 50),
-            new Point(_StartPosX.Value + 10, _StartPosY.Value + 50),
-        };
-
-        g.DrawPolygon(pen, points);
-        g.FillPolygon(ShipBrush, points);
-
-
-    }
-}

ProjectPlane/ProjectPlane/Entities/EntityContainer.cs

@@ -1,28 +0,0 @@
-namespace ProjectPlane.Entities;
-/// <summary>
-///  Класс-сущность "Контейнеровоз"
-/// </summary>
-public class EntityContainer : EntityShip 
-{   
-    /// <summary>
-    /// Цвет контейнера
-    /// </summary>
-    public Color ContainerColor { get; private set; }
-
-    /// <summary>
-    /// Признак наличия контейнера
-    /// </summary>
-    public bool Container { get; private set; }
-
-    /// <summary>
-    /// Признак наличия крана
-    /// </summary>
-    public bool Crane { get; private set; }
-
-    public EntityContainer(int speed, double weight, Color shipColor, Color containerColor, bool container, bool crane) : base(speed, weight, shipColor)
-    {
-        ContainerColor = containerColor;
-        Container = container;
-        Crane = crane;
-    }
-}

ProjectPlane/ProjectPlane/Entities/EntityShip.cs

@@ -1,24 +0,0 @@
-namespace ProjectPlane.Entities;
-public class EntityShip
-{
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Цвет контейнеровоза
-    /// </summary>
-    public Color ShipColor { get; private set; }
-
-    public double Step => Speed * 100 / Weight;
-
-    public EntityShip(int speed, double weight, Color shipColor)
-    {
-        Speed = speed;
-        Weight = weight;
-        ShipColor = shipColor;
-    }
-}

ProjectPlane/ProjectPlane/Form1.Designer.cs

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

ProjectPlane/ProjectPlane/Form1.cs

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

ProjectPlane/ProjectPlane/FormContainer.Designer.cs

@@ -1,146 +0,0 @@
-namespace ProjectPlane
-{
-    partial class FormContainer
-    {
-        /// <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()
-        {
-            pictureBoxCont = new PictureBox();
-            buttonLeft = new Button();
-            buttonRight = new Button();
-            buttonUp = new Button();
-            buttonDown = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStrategyStep = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxCont).BeginInit();
-            SuspendLayout();
-            // 
-            // pictureBoxCont
-            // 
-            pictureBoxCont.Dock = DockStyle.Fill;
-            pictureBoxCont.Location = new Point(0, 0);
-            pictureBoxCont.Name = "pictureBoxCont";
-            pictureBoxCont.Size = new Size(898, 554);
-            pictureBoxCont.TabIndex = 0;
-            pictureBoxCont.TabStop = false;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackgroundImage = Properties.Resources.влево;
-            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(748, 507);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(34, 35);
-            buttonLeft.TabIndex = 2;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += ButtonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRight.BackgroundImage = Properties.Resources.вправо;
-            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(828, 507);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(34, 35);
-            buttonRight.TabIndex = 3;
-            buttonRight.UseVisualStyleBackColor = true;
-            buttonRight.Click += ButtonMove_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackgroundImage = Properties.Resources.вверх;
-            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(788, 466);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(34, 35);
-            buttonUp.TabIndex = 4;
-            buttonUp.UseVisualStyleBackColor = true;
-            buttonUp.Click += ButtonMove_Click;
-            // 
-            // buttonDown
-            // 
-            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonDown.BackgroundImage = Properties.Resources.вниз;
-            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(788, 507);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(34, 35);
-            buttonDown.TabIndex = 5;
-            buttonDown.UseVisualStyleBackColor = true;
-            buttonDown.Click += ButtonMove_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(765, 12);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(121, 23);
-            comboBoxStrategy.TabIndex = 7;
-            // 
-            // buttonStrategyStep
-            // 
-            buttonStrategyStep.Location = new Point(811, 41);
-            buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(75, 23);
-            buttonStrategyStep.TabIndex = 8;
-            buttonStrategyStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += ButtonStrategyStep_Click;
-            // 
-            // FormContainer
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(898, 554);
-            Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonUp);
-            Controls.Add(buttonRight);
-            Controls.Add(buttonLeft);
-            Controls.Add(pictureBoxCont);
-            Name = "FormContainer";
-            Text = "Контейнеровоз";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxCont).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxCont;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonUp;
-        private Button buttonDown;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStrategyStep;
-    }
-}

ProjectPlane/ProjectPlane/FormContainer.cs

@@ -1,114 +0,0 @@
-using ProjectPlane.Drawnings;
-using ProjectPlane.MovementStrategy;
-
-namespace ProjectPlane;
-
-public partial class FormContainer : Form
-{
-
-    private DrawningShip? _drawShip;
-
-    private AbstractStrategy? _strategy;
-
-    public DrawningShip SetShip
-    {
-        set
-        {
-            _drawShip = value;
-            _drawShip.SetPictureSize(pictureBoxCont.Width, pictureBoxCont.Height);
-            comboBoxStrategy.Enabled = true;
-            _strategy = null;
-            Draw();
-        }
-    }
-
-    public FormContainer()
-    {
-        InitializeComponent();
-        _strategy = null;
-    }
-
-    private void Draw()
-    {
-        if (_drawShip == null)
-        {
-            return;
-        }
-
-        Bitmap bmp = new(pictureBoxCont.Width, pictureBoxCont.Height);
-        Graphics gr = Graphics.FromImage(bmp);
-        _drawShip.DrawTransport(gr);
-        pictureBoxCont.Image = bmp;
-    }
-
-    private void ButtonMove_Click(object sender, EventArgs e)
-    {
-        if (_drawShip == null)
-        {
-            return;
-        }
-
-        string name = ((Button)sender)?.Name ?? string.Empty;
-        bool result = false;
-        switch (name)
-        {
-            case "buttonUp":
-                result = _drawShip.MoveTransport(DirectionType.Up);
-                break;
-            case "buttonDown":
-                result = _drawShip.MoveTransport(DirectionType.Down);
-                break;
-            case "buttonLeft":
-                result = _drawShip.MoveTransport(DirectionType.Left);
-                break;
-            case "buttonRight":
-                result = _drawShip.MoveTransport(DirectionType.Right);
-                break;
-        }
-
-        if (result)
-        {
-            Draw();
-        }
-    }
-
-    private void ButtonStrategyStep_Click(object sender, EventArgs e)
-    {
-        if (_drawShip == null)
-        {
-            return;
-        }
-
-        if (comboBoxStrategy.Enabled)
-        {
-            _strategy = comboBoxStrategy.SelectedIndex switch
-            {
-                0 => new MoveToCenter(),
-                1 => new MoveToBorder(),
-                _ => null,
-            };
-            if (_strategy == null)
-            {
-                return;
-            }
-            _strategy.SetData(new MoveableShip(_drawShip), pictureBoxCont.Width, pictureBoxCont.Height);
-        }
-
-        if (_strategy == null)
-        {
-            return;
-        }
-
-        comboBoxStrategy.Enabled = false;
-        _strategy.MakeStep();
-        Draw();
-
-        if (_strategy.GetStatus() == StrategyStatus.Finish)
-        {
-            comboBoxStrategy.Enabled = true;
-            _strategy = null;
-        }
-
-    }
-
-}

ProjectPlane/ProjectPlane/FormContainer.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectPlane/ProjectPlane/FormShipCollection.Designer.cs

@@ -1,173 +0,0 @@
-namespace ProjectPlane
-{
-    partial class FormShipCollection
-    {
-        /// <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()
-        {
-            groupBoxTools = new GroupBox();
-            ButtonRefresh = new Button();
-            ButtonGoToCheck = new Button();
-            ButtonDel = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            ButtonAddCont = new Button();
-            ButtonAddShip = new Button();
-            ComboBoxSelectorCompany = new ComboBox();
-            pictureBox = new PictureBox();
-            groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            groupBoxTools.Controls.Add(ButtonRefresh);
-            groupBoxTools.Controls.Add(ButtonGoToCheck);
-            groupBoxTools.Controls.Add(ButtonDel);
-            groupBoxTools.Controls.Add(maskedTextBoxPosition);
-            groupBoxTools.Controls.Add(ButtonAddCont);
-            groupBoxTools.Controls.Add(ButtonAddShip);
-            groupBoxTools.Controls.Add(ComboBoxSelectorCompany);
-            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(785, 0);
-            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(200, 678);
-            groupBoxTools.TabIndex = 0;
-            groupBoxTools.TabStop = false;
-            groupBoxTools.Text = "Инструменты";
-            // 
-            // ButtonRefresh
-            // 
-            ButtonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonRefresh.Location = new Point(6, 425);
-            ButtonRefresh.Name = "ButtonRefresh";
-            ButtonRefresh.Size = new Size(188, 39);
-            ButtonRefresh.TabIndex = 6;
-            ButtonRefresh.Text = "Обновить";
-            ButtonRefresh.UseVisualStyleBackColor = true;
-            ButtonRefresh.Click += ButtonRefresh_Click;
-            // 
-            // ButtonGoToCheck
-            // 
-            ButtonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonGoToCheck.Location = new Point(6, 320);
-            ButtonGoToCheck.Name = "ButtonGoToCheck";
-            ButtonGoToCheck.Size = new Size(188, 39);
-            ButtonGoToCheck.TabIndex = 5;
-            ButtonGoToCheck.Text = "Передать на тесты";
-            ButtonGoToCheck.UseVisualStyleBackColor = true;
-            ButtonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // ButtonDel
-            // 
-            ButtonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonDel.Location = new Point(6, 237);
-            ButtonDel.Name = "ButtonDel";
-            ButtonDel.Size = new Size(188, 39);
-            ButtonDel.TabIndex = 4;
-            ButtonDel.Text = "Удплить контейнеровоз";
-            ButtonDel.UseVisualStyleBackColor = true;
-            ButtonDel.Click += ButtonDel_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Location = new Point(6, 198);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(188, 23);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // ButtonAddCont
-            // 
-            ButtonAddCont.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddCont.Location = new Point(6, 138);
-            ButtonAddCont.Name = "ButtonAddCont";
-            ButtonAddCont.Size = new Size(188, 39);
-            ButtonAddCont.TabIndex = 2;
-            ButtonAddCont.Text = "Добавление контейнеровоза";
-            ButtonAddCont.UseVisualStyleBackColor = true;
-            ButtonAddCont.Click += ButtonAddCont_Click;
-            // 
-            // ButtonAddShip
-            // 
-            ButtonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddShip.Location = new Point(6, 81);
-            ButtonAddShip.Name = "ButtonAddShip";
-            ButtonAddShip.Size = new Size(188, 40);
-            ButtonAddShip.TabIndex = 1;
-            ButtonAddShip.Text = "Добавление корабля";
-            ButtonAddShip.UseVisualStyleBackColor = true;
-            ButtonAddShip.Click += ButtonAddShip_Click;
-            // 
-            // ComboBoxSelectorCompany
-            // 
-            ComboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ComboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
-            ComboBoxSelectorCompany.FormattingEnabled = true;
-            ComboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            ComboBoxSelectorCompany.Location = new Point(6, 22);
-            ComboBoxSelectorCompany.Name = "ComboBoxSelectorCompany";
-            ComboBoxSelectorCompany.Size = new Size(188, 23);
-            ComboBoxSelectorCompany.TabIndex = 0;
-            ComboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
-            // 
-            // pictureBox
-            // 
-            pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
-            pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(785, 678);
-            pictureBox.TabIndex = 1;
-            pictureBox.TabStop = false;
-            // 
-            // FormShipCollection
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(985, 678);
-            Controls.Add(pictureBox);
-            Controls.Add(groupBoxTools);
-            Name = "FormShipCollection";
-            Text = "Коллекция кораблей";
-            groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private GroupBox groupBoxTools;
-        private ComboBox ComboBoxSelectorCompany;
-        private Button ButtonAddCont;
-        private Button ButtonAddShip;
-        private PictureBox pictureBox;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button ButtonDel;
-        private Button ButtonGoToCheck;
-        private Button ButtonRefresh;
-    }
-}

ProjectPlane/ProjectPlane/FormShipCollection.cs

@@ -1,141 +0,0 @@
-
-using ProjectPlane.CollectionGenericObjects;
-using ProjectPlane.Drawnings;
-
-namespace ProjectPlane;
-
-public partial class FormShipCollection : Form
-{
-    private AbstractCompany? _company = null;
-
-    public FormShipCollection()
-    {
-        InitializeComponent();
-    }
-
-    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
-    {
-        switch (ComboBoxSelectorCompany.Text)
-        {
-            case "Хранилище":
-                _company = new Marina(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
-                break;
-        }
-    }
-
-    private void CreateObject(string type)
-    {
-        if (_company == null)
-        {
-            return;
-        }
-
-
-        Random random = new Random();
-        DrawningShip drawShip;
-        switch (type)
-        {
-            case nameof(DrawningShip):
-                drawShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                break;
-            case nameof(DrawCont):
-                drawShip = new DrawCont(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random), GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-
-        if (_company + drawShip != -1)
-        {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("Не удалось добавить объект");
-        }
-    }
-
-    private static Color GetColor(Random random)
-    {
-        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-        ColorDialog dialog = new();
-        if (dialog.ShowDialog() == DialogResult.OK)
-        {
-            color = dialog.Color;
-        }
-        return color;
-    }
-
-    private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
-
-    private void ButtonAddCont_Click(object sender, EventArgs e) => CreateObject(nameof(DrawCont));
-
-    private void ButtonDel_Click(object sender, EventArgs e)
-    {
-
-        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if (_company - pos != null)
-        {
-            MessageBox.Show("Объект удалён");
-            pictureBox.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("Не удалось удалить объект");
-        }
-    }
-
-    private void ButtonGoToCheck_Click(object sender, EventArgs e)
-    {
-        if (_company == null)
-        {
-            return;
-        }
-
-        DrawningShip? ship = null;
-        int counter = 100;
-        while (ship == null)
-        {
-            ship = _company.GetRandomObject();
-            counter--;
-            if (counter <= 0)
-            {
-                break;
-            }
-        }
-
-        if (ship == null)
-        {
-            return;
-        }
-
-        FormContainer form = new()
-        {
-            SetShip = ship
-        };
-        form.ShowDialog();
-
-    }
-
-    private void ButtonRefresh_Click(object sender, EventArgs e)
-    {
-        if (_company == null)
-        {
-            return;
-        }
-
-        pictureBox.Image = _company.Show();
-    }
-}

ProjectPlane/ProjectPlane/MovementStrategy/AbstractStrategy.cs

@@ -1,74 +0,0 @@
-namespace ProjectPlane.MovementStrategy;
-
-public abstract class AbstractStrategy
-{
-    private IMoveableObject? _moveableObject;
-
-    private StrategyStatus _state = StrategyStatus.NotInit;
-
-    protected int FieldWidth { get; private set; }
-
-    protected int FieldHeight { get; private set; }
-
-    public StrategyStatus GetStatus() { return _state; }
-
-    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;
-    }
-
-    public void MakeStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return;
-        }
-        if (IsTargetDestinaion())
-        {
-            _state = StrategyStatus.Finish;
-            return;
-        }
-        MoveToTarget();
-    }
-
-
-    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
-
-    protected bool MoveRight() => MoveTo(MovementDirection.Right);
-
-    protected bool MoveUp() => MoveTo(MovementDirection.Up);
-
-    protected bool MoveDown() => MoveTo(MovementDirection.Down);
-
-    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
-
-    protected int? GetStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return null;
-        }
-        return _moveableObject?.GetStep;
-    }
-
-    protected abstract void MoveToTarget();
-
-    protected abstract bool IsTargetDestinaion();
-
-    private bool MoveTo(MovementDirection movementDirection)
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return false;
-        }
-        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
-    }
-}

ProjectPlane/ProjectPlane/MovementStrategy/IMoveableObject.cs

@@ -1,10 +0,0 @@
-namespace ProjectPlane.MovementStrategy;
-
-public interface IMoveableObject
-{
-    ObjectParameters? GetObjectPosition { get; }
-
-    int GetStep { get; }
-
-    bool TryMoveObject(MovementDirection direction);
-}

ProjectPlane/ProjectPlane/MovementStrategy/MoveToBorder.cs

@@ -1,52 +0,0 @@
-namespace ProjectPlane.MovementStrategy;
-
-public class MoveToBorder : AbstractStrategy
-{
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-        return objParams.RightBorder - GetStep() <= FieldWidth
-            && objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder - GetStep() <= 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();
-            }
-        }
-    }
-}

ProjectPlane/ProjectPlane/MovementStrategy/MoveToCenter.cs

@@ -1,50 +0,0 @@
-namespace ProjectPlane.MovementStrategy;
-
-internal 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();
-            }
-        }
-    }
-}

ProjectPlane/ProjectPlane/MovementStrategy/MoveableShip.cs

@@ -1,49 +0,0 @@
-using ProjectPlane.Drawnings;
-
-namespace ProjectPlane.MovementStrategy;
-
-public class MoveableShip : IMoveableObject
-{
-    private readonly DrawningShip? _ship = null;
-
-    public MoveableShip(DrawningShip ship)
-    {
-        _ship = ship;
-    }
-
-    public ObjectParameters? GetObjectPosition
-    {
-        get
-        {
-            if (_ship == null || _ship.EntityShip == null || !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
-            {
-                return null;
-            }
-            return new ObjectParameters(_ship.GetPosX.Value, _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight);
-        }
-    }
-
-    public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0);
-
-    public bool TryMoveObject(MovementDirection direction)
-    {
-        if (_ship == null || _ship.EntityShip == null)
-        {
-            return false;
-        }
-        return _ship.MoveTransport(GetDirectionType(direction));
-    }
-
-    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,
-        };
-    }
-
-}

ProjectPlane/ProjectPlane/MovementStrategy/MovementDirection.cs

@@ -1,13 +0,0 @@
-
-namespace ProjectPlane.MovementStrategy;
-
-public enum MovementDirection
-{
-    Up = 1,
-
-    Down = 2,
-    
-    Left = 3, 
-
-    Right = 4
-}

ProjectPlane/ProjectPlane/MovementStrategy/ObjectParameters.cs

@@ -1,33 +0,0 @@
-namespace ProjectPlane.MovementStrategy;
-
-public class ObjectParameters
-{
-    private readonly int _x;
-
-    private readonly int _y;
-
-    private readonly int _width;
-
-    private readonly int _height;
-
-    public int LeftBorder => _x;
-    
-    public int TopBorder => _y;
-
-    public int RightBorder => _x + _width;
-
-    public int DownBorder => _y + _height;
-
-    public int ObjectMiddleHorizontal => _x + _width / 2;
-
-    public int ObjectMiddleVertical => _y + _height / 2;
-
-    public ObjectParameters(int x, int y, int width, int height)
-    {
-        _x = x;
-        _y = y;
-        _width = width;
-        _height = height;
-    }
-
-}

ProjectPlane/ProjectPlane/MovementStrategy/StrategyStatus.cs

@@ -1,11 +0,0 @@
-
-namespace ProjectPlane.MovementStrategy;
-
-public enum StrategyStatus
-{
-    NotInit,
-
-    InProgress,
-
-    Finish
-}

ProjectPlane/ProjectPlane/Program.cs

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

ProjectPlane/ProjectPlane/ProjectPlane.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>

ProjectPlane/ProjectPlane/Properties/Resources.Designer.cs

@@ -1,103 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ProjectPlane.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("ProjectPlane.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;
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap вверх {
-            get {
-                object obj = ResourceManager.GetObject("вверх", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap влево {
-            get {
-                object obj = ResourceManager.GetObject("влево", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap вниз {
-            get {
-                object obj = ResourceManager.GetObject("вниз", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap вправо {
-            get {
-                object obj = ResourceManager.GetObject("вправо", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

ProjectPlane/ProjectPlane/Properties/Resources.resx

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="вверх" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\вверх.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="влево" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\влево.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="вниз" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\вниз.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="вправо" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\вправо.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>