LabWork05

ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs

@@ -0,0 +1,10 @@
+using ProjectMotorboat.Drownings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat;
+
+public delegate void BoatDelegate(DrawningBoat car);

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,61 @@
+using ProjectMotorboat.CollectionGenericObjects;
+using ProjectMotorboat.Drownings;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
+
+
+public abstract class AbstractCompany
+{
+    protected readonly int _placeSizeWidth = 190;
+
+    protected readonly int _placeSizeHeight = 100;
+
+    protected readonly int _pictureWidth;
+
+    protected readonly int _pictureHeight;
+
+    protected ICollectionGenericObjects<DrawningBoat>? _collection = null;
+
+    
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+    public static int operator +(AbstractCompany company, DrawningBoat boat)
+    {
+        return company._collection.Insert(boat);
+    }
+
+    public static DrawningBoat operator -(AbstractCompany company, int position)
+    {
+        return company._collection.Remove(position);
+    }
+    public DrawningBoat? 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)
+        {
+            DrawningBoat? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+
+        return bitmap;
+    }
+    protected abstract void DrawBackgound(Graphics g);
+
+    protected abstract void SetObjectsPosition();
+}

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
+
+public enum CollectionType
+{
+   
+	None = 0,
+    Massive = 1,
+    List = 2
+}

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs

@@ -0,0 +1,58 @@
+using ProjectMotorboat.CollectionGenericObjects;
+using ProjectMotorboat.Drownings;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
+
+
+public class HarborService : AbstractCompany
+{
+    public HarborService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        Pen pen = new(Color.Black, 2);
+        for (int i = 0; i < width; i++)
+        {
+            for (int j = 0; j < height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth + 5, j * _placeSizeHeight, i * _placeSizeWidth + 5 + _placeSizeWidth - 45, j * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth + 5, j * _placeSizeHeight, i * _placeSizeWidth + 5, j * _placeSizeHeight - _placeSizeHeight);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int boatWidth = 0;
+        int boatHeight = 0;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            if (_collection.Get(i) != null)
+            {
+                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i).SetPosition(_placeSizeWidth * boatWidth + 20, boatHeight * _placeSizeHeight + 20);
+            }
+
+            if (boatWidth < width - 1)
+                boatWidth++;
+            else
+            {
+                boatWidth = 0;
+                boatHeight++;
+            }
+            if (boatHeight > height)
+            {
+                return;
+            }
+        }
+    }
+}

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs

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

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
+
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+
+where T : class
+{
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
+    private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+
+    public int Count => _collection.Count;
+
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+
+    public T? Get(int position)
+    {
+        // TODO проверка позиции
+        if (position >= Count || position < 0) return null;
+        return _collection[position];
+    }
+
+    public int Insert(T obj)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO вставка в конец набора
+        if (Count + 1 > _maxCount) return -1;
+        _collection.Add(obj);
+        return Count;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
+        if (Count + 1 > _maxCount) return -1;
+        if (position < 0 || position > Count) return -1;
+        _collection.Insert(position, obj);
+        return 1;
+    }
+
+    public T? Remove(int position)
+    {
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (position < 0 || position > Count) return null;
+        T? pos = _collection[position];
+        _collection.RemoveAt(position);
+        return pos;
+    }
+}

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,97 @@
+namespace ProjectMotorboat.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 >= _collection.Length)
+        {
+            return null;
+        }
+        return _collection[position];
+    }
+    public int Insert(T obj)
+    {
+        for (int i = 0; i < _collection.Length; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+
+        return -1;
+    }
+    public int Insert(T obj, int position)
+    {
+        if (position < 0 || position >= _collection.Length) { return position; }
+
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+        else
+        {
+            for (int i = position + 1; i < _collection.Length; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return i;
+                }
+            }
+
+            for (int i = position - 1; i >= 0; i--)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return i;
+                }
+            }
+        }
+
+        return -1;
+    }
+    public T Remove(int position)
+    {
+        if (position < 0 || position >= _collection.Length)
+        {
+            return null;
+        }
+
+        T? obj = _collection[position];
+        _collection[position] = null;
+
+        return obj;
+    }
+}
+

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
+
+public class StorageCollection<T>
+    where T : class
+{
+    
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+    public List<string> Keys => _storages.Keys.ToList();
+
+    public StorageCollection()
+    {
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+    }
+
+    
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+        // TODO Прописать логику для добавления
+        if (name == null || _storages.ContainsKey(name)) { return; }
+        switch (collectionType)
+
+        {
+            case CollectionType.None:
+                return;
+            case CollectionType.Massive:
+                _storages[name] = new MassiveGenericObjects<T>();
+                return;
+            case CollectionType.List:
+                _storages[name] = new ListGenericObjects<T>();
+                return;
+        }
+    }
+
+   
+    public void DelCollection(string name)
+    {
+        // TODO Прописать логику для удаления коллекции
+        if (_storages.ContainsKey(name))
+            _storages.Remove(name);
+    }
+
+   
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            // TODO Продумать логику получения объекта
+            if (name == null || !_storages.ContainsKey(name)) { return null; }
+            return _storages[name];
+        }
+    }
+}

ProjectMotorboat/ProjectMotorboat/DrawningMotorboat.cs

@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat
-{
-    public class DrawningMotorboat
-    {
-        public EntityMotorboat? EntityMotorboat { get; private set; }
-
-        private int? _pictureWidth;
-
-        private int? _pictureHeight;
-
-        private int? _startPosX;
-
-        private int? _startPosY;
-        private readonly int _drawningMotorboatWidth = 160;
-
-        private readonly int _drawningMotorboatHeight = 60;
-
-        public void Init(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool motor, bool glass)
-        {
-            EntityMotorboat = new EntityMotorboat();
-            EntityMotorboat.Init(speed, weight, bodyColor, additionalColor,
-            motor, glass);
-            _pictureWidth = null;
-            _pictureHeight = null;
-            _startPosX = null;
-            _startPosY = null;
-        }
-        public bool SetPictureSize(int width, int height)
-        {
-            if (_drawningMotorboatWidth < width && _drawningMotorboatHeight < height)
-            {
-            _pictureWidth = width;
-            _pictureHeight = height;
-                if (_startPosX.HasValue && _startPosY.HasValue)
-                {
-                    SetPosition(_startPosX.Value, _startPosY.Value);
-                }
-
-                return true;
-            }
-            
-            return true;
-        }
-
-        public void SetPosition(int x, int y)
-        {
-            if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            {
-                return;
-            }
-
-            if (x + _drawningMotorboatWidth > _pictureWidth)
-            {
-                _startPosX = _pictureWidth - _drawningMotorboatWidth;
-            }
-            else if (x < 0)
-            {
-                _startPosX = 0;
-            }
-            else
-            {
-                _startPosX = x;
-            }
-            if (y + _drawningMotorboatHeight > _pictureHeight)
-            {
-                _startPosY = _pictureHeight - _drawningMotorboatHeight;
-            }
-            else if (y < 0)
-            {
-                _startPosY = 0;
-            }
-            else
-            {
-                _startPosY = y;
-            }
-        }
-        public bool MoveTransport(DirectionType direction)
-        {
-            if (EntityMotorboat == null || !_startPosX.HasValue ||
-            !_startPosY.HasValue)
-            {
-                return false;
-            }
-            switch (direction)
-            {
-                //влево
-                case DirectionType.Left:
-                    if (_startPosX.Value - EntityMotorboat.Step > 0)
-                    {
-                        _startPosX -= (int)EntityMotorboat.Step;
-                    }
-                    return true;
-                //вверх
-                case DirectionType.Up:
-                    if (_startPosY.Value - EntityMotorboat.Step > 0)
-                    {
-                        _startPosY -= (int)EntityMotorboat.Step;
-                    }
-                    return true;
-                // вправо
-                case DirectionType.Right:
-                    if (_startPosX.Value + EntityMotorboat.Step + _drawningMotorboatWidth < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityMotorboat.Step;
-                    }
-                    return true;
-                //вниз
-                case DirectionType.Down:
-                    if (_startPosY.Value + EntityMotorboat.Step + _drawningMotorboatHeight < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityMotorboat.Step;
-                    }
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-
-        public void DrawTransport(Graphics g)
-        {
-            if (EntityMotorboat == null || !_startPosX.HasValue || !_startPosY.HasValue)
-            { return; }
-            Pen pen = new(Color.Black, 1);
-            Brush mainBrush = new SolidBrush(EntityMotorboat.BodyColor);
-
-            // корпус
-            Point[] hull = new Point[]
-            {
-                new Point(_startPosX.Value + 5, _startPosY.Value + 0),
-                new Point(_startPosX.Value + 120, _startPosY.Value + 0),
-                new Point(_startPosX.Value + 160, _startPosY.Value + 35),
-                new Point(_startPosX.Value + 120, _startPosY.Value + 70),
-                new Point(_startPosX.Value + 5, _startPosY.Value + 70),
-            };
-            g.FillPolygon(mainBrush, hull);
-            g.DrawPolygon(pen, hull);
-
-            // стекло впереди
-            if (EntityMotorboat.Glass) { 
-                Brush glassBrush = new SolidBrush(Color.LightBlue);
-                g.FillEllipse(glassBrush, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
-                g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
-            }
-
-            // основная часть
-            Brush blockBrush = new SolidBrush(EntityMotorboat.AdditionalColor);
-            g.FillRectangle(blockBrush, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);
-            g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);
-
-            // двигатель 
-            if (EntityMotorboat.Motor)
-            {
-                Brush engineBrush = new
-                SolidBrush(EntityMotorboat.AdditionalColor);
-                g.FillRectangle(engineBrush, _startPosX.Value + 0, _startPosY.Value + 10, 5, 50);
-                g.DrawRectangle(pen, _startPosX.Value + 0, _startPosY.Value + 10, 5, 50);
-            }
-        }
-    }
-}
-
-
-

ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectMotorboat
+namespace ProjectMotorboat.Drownings
 {
     public enum DirectionType
     {
+        Unknow = -1,
         Up = 1,
         Down = 2,
         Left = 3,

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs

@@ -0,0 +1,170 @@
+using ProjectMotorboat.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.Drownings;
+
+public class DrawningBoat
+{
+    public EntityBoat? EntityBoat { get; protected set; }
+
+    private int? _pictureWidth;
+
+    private int? _pictureHeight;
+
+    protected int? _startPosX;
+
+    protected int? _startPosY;
+    private readonly int _drawningBoatWidth = 160;
+
+    private readonly int _drawningBoatHeight = 60;
+
+    public int? GetPosX => _startPosX;
+
+    
+    public int? GetPosY => _startPosY;
+
+    
+    public int GetWidth => _drawningBoatWidth;
+
+   
+    public int GetHeight => _drawningBoatHeight;
+    private DrawningBoat()
+    {
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    public DrawningBoat(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityBoat = new EntityBoat(speed, weight, bodyColor);
+       
+    }
+    protected DrawningBoat(int drawningBoatWidth, int drawningBoatHeight) : this() 
+    {
+        _drawningBoatWidth = drawningBoatWidth;
+        _drawningBoatHeight = drawningBoatHeight;
+        
+    }
+    public bool SetPictureSize(int width, int height)
+    {
+        if (_drawningBoatWidth < width && _drawningBoatHeight < height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_startPosX.HasValue && _startPosY.HasValue)
+            {
+                SetPosition(_startPosX.Value, _startPosY.Value);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+
+        if (x + _drawningBoatWidth > _pictureWidth)
+        {
+            _startPosX = _pictureWidth - _drawningBoatWidth;
+        }
+        else if (x < 0)
+        {
+            _startPosX = 0;
+        }
+        else
+        {
+            _startPosX = x;
+        }
+        if (y + _drawningBoatHeight > _pictureHeight)
+        {
+            _startPosY = _pictureHeight - _drawningBoatHeight;
+        }
+        else if (y < 0)
+        {
+            _startPosY = 0;
+        }
+        else
+        {
+            _startPosY = y;
+        }
+    }
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityBoat == null || !_startPosX.HasValue ||
+        !_startPosY.HasValue)
+        {
+            return false;
+        }
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityBoat.Step > 0)
+                {
+                    _startPosX -= (int)EntityBoat.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityBoat.Step > 0)
+                {
+                    _startPosY -= (int)EntityBoat.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth)
+                {
+                    _startPosX += (int)EntityBoat.Step;
+                }
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight)
+                {
+                    _startPosY += (int)EntityBoat.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+
+    public virtual void DrawTransport(Graphics g)
+    {
+        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        { return; }
+        Pen pen = new(Color.Black);
+        Brush mainBrush = new SolidBrush(EntityBoat.BodyColor);
+
+        // корпус
+        Point[] hull = new Point[]
+        {
+                new Point(_startPosX.Value + 5, _startPosY.Value + 0),
+                new Point(_startPosX.Value + 120, _startPosY.Value + 0),
+                new Point(_startPosX.Value + 160, _startPosY.Value + 35),
+                new Point(_startPosX.Value + 120, _startPosY.Value + 70),
+                new Point(_startPosX.Value + 5, _startPosY.Value + 70),
+        };
+        g.FillPolygon(mainBrush, hull);
+        g.DrawPolygon(pen, hull);
+
+        // основная часть
+        Brush blockBrush = new SolidBrush(EntityBoat.BodyColor);
+        g.FillRectangle(blockBrush, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);
+        g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);
+}
+}

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs

@@ -0,0 +1,44 @@
+using ProjectMotorboat.Entities;
+
+namespace ProjectMotorboat.Drownings;
+
+public class DrawningMotorboat : DrawningBoat
+{ 
+    public DrawningMotorboat(int speed, double weight, Color bodyColor, Color additionalColor, bool motor, bool glass) : base (160, 60)
+    {
+        EntityBoat = new EntityMotorboat(speed, weight, bodyColor, additionalColor, motor, glass);
+        
+    }
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityBoat == null || EntityBoat is not EntityMotorboat motorboat|| !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return; 
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(motorboat.AdditionalColor);
+
+        base.DrawTransport(g);
+
+        // стекло впереди
+        if (motorboat.Glass)
+        {
+            Brush glassBrush = new SolidBrush(Color.LightBlue);
+            g.FillEllipse(glassBrush, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
+            g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
+        }
+        // двигатель 
+        if (motorboat.Motor)
+        {
+            Brush engineBrush = new
+            SolidBrush(motorboat.AdditionalColor);
+            g.FillRectangle(engineBrush, _startPosX.Value + 0, _startPosY.Value + 10, 5, 50);
+            g.DrawRectangle(pen, _startPosX.Value + 0, _startPosY.Value + 10, 5, 50);
+        }
+       
+    }
+}
+
+
+

ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs

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

ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs

@@ -0,0 +1,23 @@
+namespace ProjectMotorboat.Entities;
+
+public class EntityMotorboat : EntityBoat
+{
+    public Color AdditionalColor { get; private set; }
+
+    public void SetAdditionalColor(Color color)
+    {
+        AdditionalColor = color;
+    }
+
+    public bool Motor { get; private set; }
+
+    public bool Glass { get; private set; }
+
+    public EntityMotorboat(int speed, double weight, Color bodyColor, Color additionalColor, bool motor, bool glass) : base (speed, weight, bodyColor)
+    {
+       
+        AdditionalColor = additionalColor;
+        Motor = motor;
+        Glass = glass;
+    }
+}

ProjectMotorboat/ProjectMotorboat/EntityMotorboat.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat;
-
-public class EntityMotorboat
-{
-    public int Speed { get; private set; }
-    
-    public double Weight { get; private set; }
-    
-    public Color BodyColor { get; private set; }
-    
-    public Color AdditionalColor { get; private set; }
-    
-    public bool Motor { get; private set; }
-    
-    public bool Glass { get; private set; }
-    
-    
-    public double Step => Speed * 100 / Weight;
-    
-    public void Init(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool motor, bool glass )
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-        AdditionalColor = additionalColor;
-        Motor = motor;
-        Glass = glass;
-       
-    }
-
-}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs

@@ -0,0 +1,287 @@
+namespace ProjectMotorboat
+{
+    partial class FormBoatCollection
+    {
+        /// <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();
+            panelCompanyTools = new Panel();
+            buttonAddBoat = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonRefresh = new Button();
+            buttonDelBoat = new Button();
+            buttonGoToCheck = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(1027, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(231, 746);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddBoat);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonDelBoat);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 418);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(225, 325);
+            panelCompanyTools.TabIndex = 7;
+            // 
+            // buttonAddBoat
+            // 
+            buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddBoat.Location = new Point(3, 3);
+            buttonAddBoat.Name = "buttonAddBoat";
+            buttonAddBoat.Size = new Size(219, 54);
+            buttonAddBoat.TabIndex = 1;
+            buttonAddBoat.Text = "Добавление лодки";
+            buttonAddBoat.UseVisualStyleBackColor = true;
+            buttonAddBoat.Click += ButtonAddBoat_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Location = new Point(3, 123);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(219, 27);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(3, 276);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(219, 54);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonDelBoat
+            // 
+            buttonDelBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonDelBoat.Location = new Point(3, 156);
+            buttonDelBoat.Name = "buttonDelBoat";
+            buttonDelBoat.Size = new Size(222, 54);
+            buttonDelBoat.TabIndex = 4;
+            buttonDelBoat.Text = "удалить лодку";
+            buttonDelBoat.UseVisualStyleBackColor = true;
+            buttonDelBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(3, 216);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(219, 54);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(6, 383);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(222, 29);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 23);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(225, 320);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(0, 251);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(222, 29);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.Location = new Point(3, 141);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(213, 104);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(3, 106);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(222, 29);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(121, 76);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(13, 76);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(82, 24);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 43);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(219, 27);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(43, 20);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(158, 20);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
+            // 
+            // 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, 349);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(213, 28);
+            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(1027, 746);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1258, 746);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormBoatCollection";
+            Text = "Коллекция лодок";
+            groupBoxTools.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddBoat;
+        private ComboBox comboBoxSelectorCompany;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonDelBoat;
+        private Button buttonGoToCheck;
+        private Button buttonRefresh;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private TextBox textBoxCollectionName;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private Button buttonCollectionAdd;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionDel;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
+    }
+}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs

@@ -0,0 +1,231 @@
+using ProjectMotorboat.CollectionGenericObjects;
+using ProjectMotorboat.Drownings;
+
+namespace ProjectMotorboat;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormBoatCollection : Form
+{ 
+    private readonly StorageCollection<DrawningBoat> _storageCollection;
+
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormBoatCollection()
+    {
+        InitializeComponent();
+        _storageCollection = new();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        panelCompanyTools.Enabled = false;
+    }
+
+    /// <summary>
+    /// Добавление обычного автомобиля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddBoat_Click(object sender, EventArgs e)
+    {
+        FormBoatConfig form = new();
+        // TODO передать метод
+        form.AddEvent(SetBoat);
+
+        form.Show();
+    }
+    private void SetBoat(DrawningBoat? boat)
+    {
+        if (_company == null || boat == null)
+        {
+            return;
+        }
+
+        if (_company + boat != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+
+    }
+
+
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBox.Text);
+        if (_company - pos != null)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningBoat? boat = null;
+        int counter = 100;
+        while (boat == null)
+        {
+            boat = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (boat == null)
+        {
+            return;
+        }
+
+        FormMotorboat form = new()
+        {
+            SetBoat = boat
+        };
+        form.ShowDialog();
+    }
+
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+
+    private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
+    }
+
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
+    }
+
+    private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+
+    }
+    private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningBoat>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new HarborService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.resx

@@ -1,17 +1,17 @@
 <?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 
+
+    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>
@@ -26,36 +26,36 @@
         <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 
+
+    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 
+
+    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 
+
+    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 
+
+    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 
+    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 
+    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 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

ProjectMotorboat/ProjectMotorboat/FormBoatConfig.Designer.cs

@@ -0,0 +1,357 @@
+namespace ProjectMotorboat
+{
+    partial class FormBoatConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelYellow = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelBlue = new Panel();
+            panelWhite = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxGlass = new CheckBox();
+            checkBoxMotor = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxGlass);
+            groupBoxConfig.Controls.Add(checkBoxMotor);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(491, 255);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(227, 26);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(252, 133);
+            groupBoxColors.TabIndex = 8;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(195, 83);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(38, 32);
+            panelPurple.TabIndex = 3;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(195, 26);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(38, 32);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(134, 83);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(38, 32);
+            panelBlack.TabIndex = 4;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(73, 83);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(38, 32);
+            panelGray.TabIndex = 5;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(134, 26);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(38, 32);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(12, 83);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(38, 32);
+            panelWhite.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(73, 26);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(38, 32);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(12, 26);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(38, 32);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxGlass
+            // 
+            checkBoxGlass.AutoSize = true;
+            checkBoxGlass.Location = new Point(6, 199);
+            checkBoxGlass.Name = "checkBoxGlass";
+            checkBoxGlass.Size = new Size(202, 24);
+            checkBoxGlass.TabIndex = 7;
+            checkBoxGlass.Text = "Признак наличия стекла";
+            checkBoxGlass.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxMotor
+            // 
+            checkBoxMotor.AutoSize = true;
+            checkBoxMotor.Location = new Point(6, 171);
+            checkBoxMotor.Name = "checkBoxMotor";
+            checkBoxMotor.Size = new Size(210, 24);
+            checkBoxMotor.TabIndex = 6;
+            checkBoxMotor.Text = "Признак наличия мотора";
+            checkBoxMotor.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(84, 64);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(88, 27);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(6, 66);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(84, 33);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(88, 27);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(6, 33);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(362, 179);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(117, 44);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(227, 179);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(123, 44);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(30, 66);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(179, 140);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(518, 214);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(94, 29);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(680, 214);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(94, 29);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(518, 0);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(256, 208);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(144, 9);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(94, 29);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(14, 9);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(94, 29);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += LabelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += LabelBodyColor_DragEnter;
+            // 
+            // FormBoatConfig
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(811, 255);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormBoatConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private CheckBox checkBoxMotor;
+        private CheckBox checkBoxGlass;
+        private GroupBox groupBoxColors;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs

@@ -0,0 +1,154 @@
+using ProjectMotorboat.Drownings;
+using ProjectMotorboat.Entities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectMotorboat
+{
+    public partial class FormBoatConfig : Form
+    {
+        private DrawningBoat? _boat;
+
+        private event Action<DrawningBoat>? BoatDelegate;
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+            panelRed.MouseDown += Panel_MouseDown;
+            panelGreen.MouseDown += Panel_MouseDown;
+            panelBlue.MouseDown += Panel_MouseDown;
+            panelYellow.MouseDown += Panel_MouseDown;
+            panelWhite.MouseDown += Panel_MouseDown;
+            panelGray.MouseDown += Panel_MouseDown;
+            panelBlack.MouseDown += Panel_MouseDown;
+            panelPurple.MouseDown += Panel_MouseDown;
+
+            buttonCancel.Click += (sender, e) => Close();
+        }
+
+        public void AddEvent(Action<DrawningBoat> boatDelegate)
+        {
+            if (BoatDelegate != null)
+            {
+                BoatDelegate = boatDelegate;
+            }
+            else
+            {
+                BoatDelegate += boatDelegate;
+            }
+        }
+
+        private void DrawObject()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+            _boat?.SetPosition(15, 15);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+        }
+
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+            {
+                case "labelSimpleObject":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new DrawningMotorboat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                    Color.Black, checkBoxMotor.Checked, checkBoxGlass.Checked);
+                    break;
+            }
+            DrawObject();
+        }
+
+        private void Panel_MouseDown(object? sender, MouseEventArgs e)
+        {
+            // TODO отправка цвета в Drag&Drop
+            (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+
+        }
+        // Логика смены цветов: основного и дополнительного (для продвинутого объекта)
+        private void LabelBodyColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+
+        private void LabelBodyColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat != null)
+            {
+                if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+                {
+                    _boat.EntityBoat.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+
+                }
+                DrawObject();
+            }
+        }
+        private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (_boat != null && _boat is DrawningMotorboat)
+            {
+                if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+                {
+                    e.Effect = DragDropEffects.Copy;
+                }
+                else
+                {
+                    e.Effect = DragDropEffects.None;
+                }
+            }
+        }
+
+        private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat != null && _boat.EntityBoat is EntityMotorboat _battleship)
+            {
+                if (e.Data.GetDataPresent(typeof(Color)))
+                {
+                    _battleship.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+
+                }
+                DrawObject();
+            }
+        }
+
+        private void ButtonAdd_Click(object sender, EventArgs e)
+        {
+
+            if (_boat != null)
+            {
+                BoatDelegate?.Invoke(_boat);
+                Close();
+            }
+
+        }
+    }
+
+}

ProjectMotorboat/ProjectMotorboat/FormBoatConfig.resx

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

ProjectMotorboat/ProjectMotorboat/FormMotorboat.Designer.cs

@@ -29,11 +29,12 @@
         private void InitializeComponent()
         {
             pictureBoxMotorboat = new PictureBox();
-            buttonCreate = new Button();
             buttonLeft = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
             buttonUp = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorboat).BeginInit();
             SuspendLayout();
             // 
@@ -46,17 +47,6 @@
             pictureBoxMotorboat.TabIndex = 0;
             pictureBoxMotorboat.TabStop = false;
             // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 409);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(94, 29);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += buttonCreate_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -106,16 +96,37 @@
             buttonUp.Click += ButtonMove_Click;
             buttonUp.MouseClick += ButtonMove_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(604, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(184, 28);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(686, 46);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(93, 28);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormMotorboat
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 450);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
             Controls.Add(pictureBoxMotorboat);
             Name = "FormMotorboat";
             Text = "Моторная лодка";
@@ -126,10 +137,11 @@
         #endregion
 
         private PictureBox pictureBoxMotorboat;
-        private Button buttonCreate;
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonUp;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectMotorboat/ProjectMotorboat/FormMotorboat.cs

@@ -1,85 +1,107 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using ProjectMotorboat.Drownings;
+using ProjectMotorboat.MovementStrategy;
 
-namespace ProjectMotorboat
+namespace ProjectMotorboat;
+
+public partial class FormMotorboat : Form
 {
-    public partial class FormMotorboat : Form
+    private DrawningBoat? _drawningBoat;
+    private AbstractStrategy? _strategy;
+
+    public DrawningBoat SetBoat
     {
-        private DrawningMotorboat? _drawningMotorboat;
-        public FormMotorboat()
+        set
         {
-            InitializeComponent();
+            _drawningBoat = value;
+            _drawningBoat.SetPictureSize(pictureBoxMotorboat.Width, pictureBoxMotorboat.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
         }
+    }
 
-        private void buttonCreate_Click(object sender, EventArgs e)
+    public FormMotorboat()
+    {
+        InitializeComponent();
+        _strategy = null;
+    }
+    private void Draw()
+    {
+        if (_drawningBoat == null)
         {
-            Random random = new();
-            _drawningMotorboat = new DrawningMotorboat();
-            _drawningMotorboat.Init(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)));
-            _drawningMotorboat.SetPictureSize(pictureBoxMotorboat.Width, pictureBoxMotorboat.Height);
-            _drawningMotorboat.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
-            Bitmap bmp = new(pictureBoxMotorboat.Width, pictureBoxMotorboat.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningMotorboat.DrawTransport(gr);
-            pictureBoxMotorboat.Image = bmp;
+            return;
         }
+        Bitmap bmp = new(pictureBoxMotorboat.Width, pictureBoxMotorboat.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _drawningBoat.DrawTransport(gr);
+        pictureBoxMotorboat.Image = bmp;
+    }
 
-        private void Draw()
+    private void ButtonMove_Click(object sender, EventArgs e)
+    {
+        if (_drawningBoat == null)
         {
-            if (_drawningMotorboat == null)
+            return;
+        }
+        string name = ((Button)sender)?.Name ?? string.Empty;
+        bool result = false;
+        switch (name)
+        {
+            case "buttonUp":
+                result = _drawningBoat.MoveTransport(DirectionType.Up);
+                break;
+            case "buttonDown":
+                result = _drawningBoat.MoveTransport(DirectionType.Down);
+                break;
+            case "buttonLeft":
+                result = _drawningBoat.MoveTransport(DirectionType.Left);
+                break;
+            case "buttonRight":
+                result = _drawningBoat.MoveTransport(DirectionType.Right);
+                break;
+        }
+        if (result)
+        {
+            Draw();
+        }
+    }
+
+    private void ButtonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningBoat == null)
             {
                 return;
             }
-            Bitmap bmp = new(pictureBoxMotorboat.Width,
-            pictureBoxMotorboat.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningMotorboat.DrawTransport(gr);
-            pictureBoxMotorboat.Image = bmp;
-        }
 
-        /// <summary>
-        /// Перемещение объекта по форме (нажатие кнопок навигации)
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawningMotorboat == null)
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableBoat(_drawningBoat), pictureBoxMotorboat.Width, pictureBoxMotorboat.Height);
+            }
+
+            if (_strategy == null)
             {
                 return;
             }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            bool result = false;
-            switch (name)
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
             {
-                case "buttonUp":
-                    result = _drawningMotorboat.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    result = _drawningMotorboat.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    result = _drawningMotorboat.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    result = _drawningMotorboat.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            if (result)
-            {
-                Draw();
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
             }
         }
     }
-}
+

ProjectMotorboat/ProjectMotorboat/MovementStrategy/AbstractStrategy.cs

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

ProjectMotorboat/ProjectMotorboat/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.MovementStrategy;
+
+public interface IMoveableObject
+{
+   
+    ObjectParameters? GetObjectPosition { get; }
+
+    int GetStep { get; }
+
+    
+    bool TryMoveObject(MovementDirection direction);
+}

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs

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

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs

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

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveableBoat.cs

@@ -0,0 +1,51 @@
+using ProjectMotorboat.Drownings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.MovementStrategy;
+
+public class MoveableBoat : IMoveableObject
+{
+    private readonly DrawningBoat? _boat = null;
+    public MoveableBoat(DrawningBoat boat)
+    {
+        _boat = boat;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_boat == null || _boat.EntityBoat == null || !_boat.GetPosX.HasValue || !_boat.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_boat.GetPosX.Value, _boat.GetPosY.Value, _boat.GetWidth, _boat.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_boat?.EntityBoat?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_boat == null || _boat.EntityBoat == null)
+        {
+            return false;
+        }
+
+        return _boat.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,
+        };
+    }
+}

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.MovementStrategy;
+
+public enum MovementDirection
+{
+   
+	Up = 1,
+
+    
+    Down = 2,
+
+    
+    Left = 3,
+
+   
+    Right = 4
+}

ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs

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

ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectMotorboat.MovementStrategy;
+
+public enum StrategyStatus
+{
+    NotInit,
+
+   
+    InProgress,
+
+   
+    Finish
+}

ProjectMotorboat/ProjectMotorboat/Program.cs

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

WinFormsApp1/WinFormsApp1.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34525.116
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsApp1", "WinFormsApp1\WinFormsApp1.csproj", "{50092433-6AF5-4E71-9559-079AE2F9901A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {59C3FED6-0E53-4AF0-9E1B-5ACF902ED5CE}
-	EndGlobalSection
-EndGlobal

WinFormsApp1/WinFormsApp1/Form1.Designer.cs

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

WinFormsApp1/WinFormsApp1/Form1.cs

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

WinFormsApp1/WinFormsApp1/Program.cs

@@ -1,17 +0,0 @@
-namespace WinFormsApp1
-{
-    internal static class Program
-    {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new Form1());
-        }
-    }
-}

WinFormsApp1/WinFormsApp1/WinFormsApp1.csproj

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