lab8 сделано и сдано

MotorBoat/MotorBoat/AbstractStrategy.cs

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

MotorBoat/MotorBoat/AppSetting.json

@@ -0,0 +1,20 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log_.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "MotorBoat"
+    }
+  }
+}

MotorBoat/MotorBoat/BoatCompareByColor.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+using MotorBoat.Entities;
+
+namespace MotorBoat.Generics
+{
+    internal class BoatCompareByColor : IComparer<DrawningBoat?>
+    {
+        public int Compare(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            var bodyColorCompare = x.EntityBoat.BodyColor.Name.CompareTo(y.EntityBoat.BodyColor.Name);
+            if (bodyColorCompare != 0)
+            {
+                return bodyColorCompare;
+            }
+            if (x.EntityBoat is EntityMotorBoat xEntityMotorBoat && y.EntityBoat is EntityMotorBoat yEntityMotorBoat)
+            {
+                var BodyColorCompare = xEntityMotorBoat.BodyColor.Name.CompareTo(yEntityMotorBoat.BodyColor.Name);
+                if (BodyColorCompare != 0)
+                {
+                    return BodyColorCompare;
+                }
+                var AdditionalColorCompare = xEntityMotorBoat.AdditionalColor.Name.CompareTo(yEntityMotorBoat.AdditionalColor.Name);
+                if (AdditionalColorCompare != 0)
+                {
+                    return AdditionalColorCompare;
+                }
+            }
+            var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+        }
+    }
+}

MotorBoat/MotorBoat/BoatCompareByType.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+
+namespace MotorBoat.Generics
+{
+    internal class BoatCompareByType : IComparer<DrawningBoat?>
+    {
+        public int Compare(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return x.GetType().Name.CompareTo(y.GetType().Name);
+            }
+            var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+        }
+    }
+}

MotorBoat/MotorBoat/BoatGenericCollection.cs

@@ -0,0 +1,161 @@
+using MotorBoat.Generics;
+using MotorBoat.DrawningObjects;
+using MotorBoat.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.Exceptions;
+using Microsoft.Extensions.Logging;
+
+namespace MotorBoat.Generics
+{
+    /// <summary>
+    /// Параметризованный класс для набора объектов DrawningBoat
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class BoatsGenericCollection<T, U>
+        where T : DrawningBoat
+        where U : IMoveableObject
+    {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 180;
+
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 80;
+
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public BoatsGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static bool operator +(BoatsGenericCollection<T, U> collect, T? obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            return collect?._collection.Insert(obj, new DrawningBoatEqutables()) ?? false;
+
+        }
+
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static T? operator -(BoatsGenericCollection<T, U>? collect, int pos)
+        {
+            T? obj = collect?._collection[pos];
+            if (obj != null && collect != null)
+            {
+                collect._collection.Remove(pos);
+            }
+            return obj;
+        }
+
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U? GetU(int pos)
+        {
+            return (U?)_collection[pos]?.GetMoveableObject;
+        }
+
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowBoats()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {//линия разметки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight,
+                    i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth,
+                _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            int i = 0;
+            int Rows = _pictureWidth / _placeSizeWidth;
+            foreach(var boat in _collection.GetBoats())
+            {
+                if (boat != null)
+                {
+                    boat.SetPosition(i % Rows * _placeSizeWidth, i / Rows * _placeSizeHeight + 5);
+                    boat.DrawTransport(g);
+                }
+                i++;
+            }
+        }
+
+        /// <summary>
+        /// Получение объектов коллекции
+        /// </summary>
+        public IEnumerable<T?> GetBoats => _collection.GetBoats();
+        public void Sort(IComparer<T?> comparer) => _collection.SortSet(comparer);
+    }
+}

MotorBoat/MotorBoat/BoatNotFoundException.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Exceptions
+{
+    internal class BoatNotFoundException : ApplicationException
+    {
+        public BoatNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+        public BoatNotFoundException() : base() { }
+        public BoatNotFoundException(string message) : base(message) { }
+        public BoatNotFoundException(string message, Exception exception) : base(message, exception)
+        { }
+        protected BoatNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+
+    }
+}

MotorBoat/MotorBoat/BoatsCollectionInfo.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Generics
+{
+    internal class BoatsCollectionInfo : IEquatable<BoatsCollectionInfo>
+    {
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public BoatsCollectionInfo(string name, string description)
+        {
+            Name = name;
+            Description = description;
+        }
+        public bool Equals(BoatsCollectionInfo? other)
+        {
+            if (Name == other?.Name)
+                return true;
+
+            return false;
+        }
+        public override int GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
+    }
+}

MotorBoat/MotorBoat/BoatsGenericStorage.cs

@@ -0,0 +1,202 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+using MotorBoat.MovementStrategy;
+using MotorBoat.Exceptions;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
+
+namespace MotorBoat.Generics
+{
+    /// <summary>
+    /// Класс для хранения коллекции
+    /// </summary>
+    internal class BoatsGenericStorage
+    {
+        /// <summary>
+        /// Словарь (хранилище)
+        /// </summary>
+        readonly Dictionary<BoatsCollectionInfo, BoatsGenericCollection<DrawningBoat,DrawningObjectBoat>> _boatStorages;
+
+        /// <summary>
+        /// Возвращение списка названий наборов
+        /// </summary>
+        public List<BoatsCollectionInfo> Keys => _boatStorages.Keys.ToList();
+
+        /// <summary>
+        /// Разделитель для записи ключа и значения элемента словаря
+        /// </summary>
+        private static readonly char _separatorForKeyValue = '|';
+
+        /// <summary>
+        /// Разделитель для записей коллекции данных в файл
+        /// </summary>
+        private readonly char _separatorRecords = ';';
+
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly char _separatorForObject = ':';
+
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public BoatsGenericStorage(int pictureWidth, int pictureHeight)
+        {
+            _boatStorages = new Dictionary<BoatsCollectionInfo, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+
+        /// <summary>
+        /// Добавление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void AddSet(string name)
+        {
+            if (!_boatStorages.ContainsKey(new BoatsCollectionInfo(name, string.Empty)))
+                _boatStorages.Add(new BoatsCollectionInfo(name, string.Empty),
+                    new BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>(_pictureWidth, _pictureHeight));
+        }
+
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void DelSet(string name)
+        {
+            if (_boatStorages.ContainsKey(new BoatsCollectionInfo(name, string.Empty)))
+                _boatStorages.Remove(new BoatsCollectionInfo(name, string.Empty));
+        }
+
+        /// <summary>
+        /// Доступ к набору
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>? this[string ind]
+        {
+            get
+            {
+                if (_boatStorages.ContainsKey(new BoatsCollectionInfo(ind, string.Empty)))
+                    return _boatStorages[new BoatsCollectionInfo(ind, string.Empty)];
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Сохранение информации по лодкам в хранилище в файл
+        /// </summary>
+        /// <param name="filename">Путь и имя файла</param>
+        /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+        public void SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            StringBuilder data = new();
+            foreach (KeyValuePair<BoatsCollectionInfo, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>> record in _boatStorages)
+            {
+                StringBuilder records = new();
+                foreach (DrawningBoat? elem in record.Value.GetBoats)
+                {
+                    records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
+                }
+                data.AppendLine($"{record.Key.Name}{_separatorForKeyValue}{records}");
+            }
+
+            if (data.Length == 0) {
+                throw new InvalidOperationException("Невалидная операция, нет данных для сохранения");
+            }
+      
+            using (StreamWriter writer = new StreamWriter(filename))
+            {
+                writer.Write($"BoatStorage{Environment.NewLine}{data}");
+            }
+        }
+
+        /// <summary>
+        /// Загрузка информации по лодкам в хранилище из файла
+        /// </summary>
+        /// <param name="filename">Путь и имя файла</param>
+        /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException($"Файл {filename} не найден");
+            }
+
+            using (StreamReader fs = File.OpenText(filename))
+            {
+                string str = fs.ReadLine();
+                if (str == null || str.Length == 0)
+                {
+                    throw new NullReferenceException("Нет данных для загрузки");
+                }
+                if (!str.StartsWith("BoatStorage"))
+                {
+                    // если нет такой записи,то это не те данные
+                    throw new FormatException("Неверный формат данных");
+                }
+
+                _boatStorages.Clear();
+                string strs = "";
+
+                while ((strs = fs.ReadLine()) != null)
+                {
+                    if (strs == null)
+                    {
+                        throw new NullReferenceException("Нет данных для загрузки");
+                    }
+
+                    string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                    if (record.Length != 2)
+                    {
+                        continue;
+                    }
+                    BoatsGenericCollection<DrawningBoat, DrawningObjectBoat> collection = new(_pictureWidth, _pictureHeight);
+                    string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string elem in set)
+                    {
+                        DrawningBoat? boat = elem?.CreateDrawningBoat(_separatorForObject, _pictureWidth, _pictureHeight);
+                        if (boat != null)
+                        {
+                            try
+                            {
+                                _ = collection + boat;
+                            }
+                            catch (BoatNotFoundException e)
+                            {
+                                throw e;
+                            }
+
+                            catch (StorageOverflowException e)
+                            {
+                                throw e;
+                            }
+                        }
+                    }
+                    _boatStorages.Add(new BoatsCollectionInfo(record[0], string.Empty), collection);
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/DrawningBoat.cs

@@ -0,0 +1,220 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.Entities;
+using MotorBoat;
+using MotorBoat.MovementStrategy;
+
+namespace MotorBoat.DrawningObjects
+{
+    /// <summary>
+    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+    /// </summary>
+    public class DrawningBoat
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityBoat? EntityBoat { get; protected set; }
+
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        private int _pictureWidth = 800;
+
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        private int _pictureHeight = 450;
+
+        /// <summary>
+        /// Левая координата прорисовки 
+        /// </summary>
+        protected int _startPosX;
+
+        /// <summary>
+        /// Верхняя кооридната прорисовки 
+        /// </summary>
+        protected int _startPosY;
+
+        /// <summary>
+        /// Ширина прорисовки 
+        /// </summary>
+        protected readonly int _boatWeight = 165;
+
+        /// <summary>
+        /// Высота прорисовки 
+        /// </summary>
+        protected readonly int _boatHeight = 80;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        /// <returns>true - объект создан, false - проверка не пройдена, 
+        ///нельзя создать объект в этих размерах</returns>
+        public DrawningBoat(int speed, double weight, Color bodyColor, int width, int height)
+        {
+            if (width < _boatWeight || height < _boatHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntityBoat = new EntityBoat(speed, weight, bodyColor);
+        }
+
+        /// <summary>
+        /// Получение объекта IMoveableObject из объекта DrawningCar
+        /// </summary>
+        public IMoveableObject GetMoveableObject => new DrawningObjectBoat(this);
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param> 
+        /// <param name="boatWidth">Ширина прорисовки автомобиля</param>
+        /// <param name="boatHeight">Высота прорисовки автомобиля</param>
+        protected DrawningBoat(int speed, double weight, Color bodyColor, int width, int height, int boatWidth, int boatHeight)
+        {
+            if (width <= _boatWeight || height <= _boatHeight)
+                return;
+            _pictureWidth = width;
+            _pictureHeight = height;
+            _boatWeight = boatWidth;
+            _boatHeight = boatHeight;
+            EntityBoat = new EntityBoat(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Установка позиции
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        public void SetPosition(int x, int y)
+        {
+            if (x >= 0 && x + _boatWeight <= _pictureWidth && y >= 0 && y + _boatHeight <= _pictureHeight)
+            {
+                _startPosX = x;
+                _startPosY = y;
+            }
+        }
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (EntityBoat == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black, 1);
+
+            Brush mainBrush = new SolidBrush(EntityBoat.BodyColor);
+
+            // корпус
+            Point[] hull = new Point[]
+            {
+                new Point(_startPosX + 5, _startPosY + 0),
+                new Point(_startPosX + 120, _startPosY + 0),
+                new Point(_startPosX + 160, _startPosY + 35),
+                new Point(_startPosX + 120, _startPosY + 70),
+                new Point(_startPosX + 5, _startPosY + 70),
+            };
+            g.FillPolygon(mainBrush, hull);
+            g.DrawPolygon(pen, hull);
+
+            // осн часть
+            Brush blockBrush = new SolidBrush(Color.Olive);
+            g.FillRectangle(blockBrush, _startPosX + 20, _startPosY + 15, 80, 40);
+            g.DrawRectangle(pen, _startPosX + 20, _startPosY + 15, 80, 40);
+        }
+        /// <summary>
+        /// Координата X объекта
+        /// </summary>
+        public int GetPosX => _startPosX;
+        /// <summary>
+        /// Координата Y объекта
+        /// /// </summary>
+        public int GetPosY => _startPosY;
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _boatWeight;
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _boatHeight;
+        /// <summary>
+        /// Проверка, что объект может переместится по указанному направлению
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// <returns>true - можно переместится по указанному направлению</returns>
+        public bool CanMove(DirectionType direction)
+        {
+            if (EntityBoat == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                //влево
+                DirectionType.Left => _startPosX - EntityBoat.Step > 0,
+                //вверх
+                DirectionType.Up => _startPosY - EntityBoat.Step > 0,
+                //вправо
+                DirectionType.Right => _startPosX + EntityBoat.Step + _boatWeight < _pictureWidth,
+                //вниз
+                DirectionType.Down => _startPosY + EntityBoat.Step + _boatHeight < _pictureHeight,
+                _ => false,
+            };
+        }
+        /// <summary>
+        /// Изменение направления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(DirectionType direction)
+        {
+            if (!CanMove(direction) || EntityBoat == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                //влево
+                case DirectionType.Left:
+                    _startPosX -= (int)EntityBoat.Step;
+                    break;
+                //вверх
+                case DirectionType.Up:
+                    _startPosY -= (int)EntityBoat.Step;
+                    break;
+                //вправо
+                case DirectionType.Right:
+                    _startPosX += (int)EntityBoat.Step;
+                    break;
+                //вниз
+                case DirectionType.Down:
+                    _startPosY += (int)EntityBoat.Step;
+                    break;
+            }
+        }
+
+        public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
+        {
+            _pictureWidth = pictureBoxWidth;
+            _pictureHeight = pictureBoxHeight;
+        }
+    }
+}

MotorBoat/MotorBoat/DrawningMotorBoat.cs

@@ -3,142 +3,34 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MotorBoat;
+using MotorBoat.DrawningObjects;
+using MotorBoat.Entities;
 
-namespace MotorBoat
+namespace MotorBoat.DrawningObjects
 {
     /// <summary>.
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    public class DrawningMotorboat
+    public class DrawningMotorBoat : DrawningBoat
     {
         /// <summary>
-        /// Класс-сущность
+        /// Конструктор
-        /// </summary>
-        public EntityMotorBoat? EntityMotorBoat { get; private set; }
-
-        /// <summary>
-        /// Ширина окна
-        /// </summary>
-        private int _pictureWight = 800;
-
-        /// <summary>
-        /// Высота окна
-        /// </summary>
-        private int _pictureHeight = 450;
-
-        /// <summary>
-        /// Левая координата прорисовки катера
-        /// </summary>
-        private int _startPosX = 0;
-
-        /// <summary>
-        /// Правая координата прорисовки катера
-        /// </summary>
-        private int _startPosY = 0;
-
-        /// <summary>
-        /// Ширина прорисовки катера
-        /// </summary>
-        private readonly int _boatWight = 165;
-
-        /// <summary>
-        /// Высота прорисовки катера
-        /// </summary>
-        private readonly int _boatHeight = 80;
-
-        /// <summary>
-        /// Инициализация свойств
         /// </summary>
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="bodyColor">Основной цвет</param>
         /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="engine">Признак наличия двигателя в корме</param>
+        /// <param name="glass">Признак наличия стекла спереди</param>
-        /// <param name="glass">Признак наличия защитного стекла впереди</param>
+        /// <param name="engine">Признак наличия двигателя</param>
         /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Выслота картинки</param>
+        /// <param name="height">Высота картинки</param>
-        /// <returns>true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах</returns>
+        public DrawningMotorBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool glass, 
-        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool engine, bool glass, int width, int height)
+            bool engine, int width, int height) : base (speed, weight, bodyColor, width, height, 165, 80)
         {
-            if (width <= _boatWight || height <= _boatHeight) 
+            if (EntityBoat != null)
-                return false; 
-            _pictureWight = width;
-            _pictureHeight = height;
-            EntityMotorBoat = new EntityMotorBoat();
-            EntityMotorBoat.Init(speed, weight, bodyColor, additionalColor, engine, glass);
-            return true;
-        }
-
-        /// <summary> 
-        /// Установка позиции
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        public void SetPosition(int x, int y)
             {
-            if (EntityMotorBoat == null) return;
+                EntityBoat = new EntityMotorBoat(speed, weight, bodyColor, additionalColor, glass, engine);
-            while (x + _boatWight > _pictureWight)
-            {
-                x -= (int)EntityMotorBoat.Step;
-            }
-            while (x < 0)
-            {
-                x += (int)EntityMotorBoat.Step;
-            }
-            while (y + _boatHeight > _pictureHeight)
-            {
-                y -= (int)EntityMotorBoat.Step;
-            }
-            while (y < 0)
-            {
-                y += (int)EntityMotorBoat.Step;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        
-        /// <summary>
-        /// Изменение направления перемещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(DirectionType direction)
-        {
-            if (EntityMotorBoat == null)
-                return;
-            
-            switch (direction)
-            {
-                //влево
-                case DirectionType.Left:
-                    if (_startPosX - EntityMotorBoat.Step > 0)
-                    {
-                        _startPosX -= (int)EntityMotorBoat.Step;
-                    }
-                    break;
-
-                //вверх
-                case DirectionType.Up:
-                    if (_startPosY - EntityMotorBoat.Step > 0)
-                    {
-                        _startPosY -= (int)EntityMotorBoat.Step;
-                    }
-                    break;
-
-                //вправо
-                case DirectionType.Right:
-                    if (_startPosX + _boatWight + EntityMotorBoat.Step < _pictureWight)
-                    {
-                        _startPosX += (int)EntityMotorBoat.Step;
-                    }
-                    break;
-
-                //вниз
-                case DirectionType.Down:
-                    if (_startPosY + _boatHeight + EntityMotorBoat.Step < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityMotorBoat.Step;
-                    }
-                    break;
             }
         }
 
@@ -146,42 +38,39 @@ namespace MotorBoat
         /// Прорисовка объекта
         /// </summary>
         /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+        public override void DrawTransport(Graphics g)
         {
-            if (EntityMotorBoat == null)
+            if (EntityBoat is not EntityMotorBoat motorBoat)
             {
                 return;
             }
+
             Pen pen = new(Color.Black, 1);
-            Brush mainBrush = new SolidBrush(EntityMotorBoat.BodyColor);
+            Brush additionalBrush = new SolidBrush(motorBoat.AdditionalColor);
 
-            // корпус
+            base.DrawTransport(g);
-            Point[] hull = new Point[]
+
+            if (motorBoat.Glass)
             {
-                new Point(_startPosX + 5, _startPosY + 0),
-                new Point(_startPosX + 120, _startPosY + 0),
-                new Point(_startPosX + 160, _startPosY + 35),
-                new Point(_startPosX + 120, _startPosY + 70),
-                new Point(_startPosX + 5, _startPosY + 70),
-            };
-            g.FillPolygon(mainBrush, hull);
-            g.DrawPolygon(pen, hull);
-
                 // стекло впереди
                 Brush glassBrush = new SolidBrush(Color.LightBlue);
-            g.FillEllipse(glassBrush, _startPosX + 20, _startPosY + 15, 100, 40);
+                Point[] glassPoints = new Point[]
-            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 15, 100, 40);
+                {
-
+                new Point(_startPosX + 100, _startPosY + 15),
-            // осн часть
+                new Point(_startPosX + 120, _startPosY + 25),
-            Brush blockBrush = new SolidBrush(EntityMotorBoat.AdditionalColor);
+                new Point(_startPosX + 120, _startPosY + 45),
-            g.FillRectangle(blockBrush, _startPosX + 20, _startPosY + 15, 80, 40);
+                new Point(_startPosX + 100, _startPosY + 55)
-            g.DrawRectangle(pen, _startPosX + 20, _startPosY + 15, 80, 40);
+                };
+                g.FillPolygon(glassBrush, glassPoints);
+                g.DrawPolygon(pen, glassPoints);
+            }
 
+            if (motorBoat.Engine)
+            {
                 // двигатель
-            Brush engineBrush = new
+                g.FillRectangle(additionalBrush, _startPosX + 0, _startPosY + 10, 5, 50);
-            SolidBrush(EntityMotorBoat.AdditionalColor);
-            g.FillRectangle(engineBrush, _startPosX + 0, _startPosY + 10, 5, 50);
                 g.DrawRectangle(pen, _startPosX + 0, _startPosY + 10, 5, 50);
             }
         }
+    }
 }

MotorBoat/MotorBoat/DrawningObjectBoat.cs

@@ -0,0 +1,39 @@
+using MotorBoat.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+
+namespace MotorBoat.MovementStrategy
+{
+    /// <summary>
+    /// Реализация интерфейса IDrawningObject для работы с объектом DrawningBoat (паттерн Adapter)
+    /// </summary>
+    public class DrawningObjectBoat : IMoveableObject
+    {
+        private readonly DrawningBoat? _drawningBoat = null;
+        public DrawningObjectBoat(DrawningBoat drawningBoat)
+        {
+            _drawningBoat = drawningBoat;
+        }
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawningBoat == null || _drawningBoat.EntityBoat == null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawningBoat.GetPosX,
+                _drawningBoat.GetPosY, _drawningBoat.GetWidth, _drawningBoat.GetHeight);
+            }
+        }
+        public int GetStep => (int)(_drawningBoat?.EntityBoat?.Step ?? 0);
+        public bool CheckCanMove(DirectionType direction) =>
+        _drawningBoat?.CanMove(direction) ?? false;
+        public void MoveObject(DirectionType direction) =>
+        _drawningBoat?.MoveTransport(direction);
+    }
+}

MotorBoat/MotorBoat/DrawningShipEqutables.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+using MotorBoat.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace MotorBoat.Generics
+{
+    internal class DrawningBoatEqutables : IEqualityComparer<DrawningBoat?>
+    {
+        public bool Equals(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return false;
+            }
+            if (x.EntityBoat.Speed != y.EntityBoat.Speed)
+            {
+                return false;
+            }
+            if (x.EntityBoat.Weight != y.EntityBoat.Weight)
+            {
+                return false;
+            }
+            if (x.EntityBoat.BodyColor != y.EntityBoat.BodyColor)
+            {
+                return false;
+            }
+            if (x is DrawningMotorBoat && y is DrawningMotorBoat)
+            {
+                EntityMotorBoat EntityX = (EntityMotorBoat)x.EntityBoat;
+                EntityMotorBoat EntityY = (EntityMotorBoat)y.EntityBoat;
+
+                if (EntityX.Glass != EntityY.Glass)
+                    return false;
+                if (EntityX.Engine != EntityY.Engine)
+                    return false;
+                if (EntityX.AdditionalColor != EntityY.AdditionalColor)
+                    return false;
+            }
+            return true;
+        }
+
+        public int GetHashCode([DisallowNull] DrawningBoat obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+}

MotorBoat/MotorBoat/EntityBoat.cs

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

MotorBoat/MotorBoat/EntityMotorBoat.cs

@@ -3,26 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MotorBoat.Entities;
 
-namespace MotorBoat
+namespace MotorBoat.Entities
 {
-    public class EntityMotorBoat
+    /// <summary>
+    /// Класс-сущность моторная лодка
+    /// </summary>
+    public class EntityMotorBoat : EntityBoat
     {
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public double Weight { get; private set; }
-
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-
         /// <summary>
         /// Дополнительный цвет
         /// </summary>
@@ -38,11 +27,6 @@ namespace MotorBoat
         /// </summary>
         public bool Glass { get; private set; }
 
-        /// <summary>
-        /// Шаг перемещения моторной лодки
-        /// </summary>
-        public double Step => (double)Speed * 100 / Weight;
-
         /// <summary>
         /// Инициализация полей объекта-класса моторной лодки
         /// </summary>
@@ -53,14 +37,17 @@ namespace MotorBoat
         /// <param name="engine">Признак наличия двигателя в корме</param>
         /// <param name="glass">Признак наличия защитного стекла впереди</param>
 
-        public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool engine, bool glass)
+        public EntityMotorBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool engine, bool glass) :
+            base (speed, weight, bodyColor)
         {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
             AdditionalColor = additionalColor;
             Engine = engine;
             Glass = glass;
         }
+
+        internal void setAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
     }
 }

MotorBoat/MotorBoat/ExtentionDrawningBoat.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.Entities;
+using System.Runtime.Serialization;
+
+namespace MotorBoat.DrawningObjects
+{
+    /// <summary>
+    /// Расширение для класса EntityBoat
+    /// </summary>
+    public static class ExtentionDrawningBoat
+    {
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info">Строка с данными для создания объекта</param>
+        /// <param name="separatorForObject">Разделитель даннных</param>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
+        /// <returns>Объект</returns>
+        public static DrawningBoat? CreateDrawningBoat(this string info, char separatorForObject, int width, int height)
+        {
+            string[] strs = info.Split(separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawningBoat(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
+            }
+            if (strs.Length == 7)
+            {
+                return new DrawningMotorBoat(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]),
+                Color.FromName(strs[2]),
+                Color.FromName(strs[3]),
+                Convert.ToBoolean(strs[4]),
+                Convert.ToBoolean(strs[5]), width, height);
+            }
+            return null;
+        }
+        /// <summary>
+        /// Получение данных для сохранения в файл
+        /// </summary>
+        /// <param name="drawningBoat">Сохраняемый объект</param>
+        /// <param name="separatorForObject">Разделитель даннных</param>
+        /// <returns>Строка с данными по объекту</returns>
+        public static string GetDataForSave(this DrawningBoat drawningBoat,
+        char separatorForObject)
+        {
+            var boat = drawningBoat.EntityBoat;
+            if (boat == null)
+            {
+                return string.Empty;
+            }
+            var str = $"{boat.Speed}{separatorForObject}{boat.Weight}{separatorForObject}{boat.BodyColor.Name}";
+
+            if (boat is not EntityMotorBoat motorBoat)
+            {
+                return str;
+            }
+            return $"{str}{separatorForObject}{motorBoat.AdditionalColor.Name}" +
+            $"{separatorForObject}{motorBoat.Glass}{separatorForObject}{motorBoat.Engine}{separatorForObject}";
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.Designer.cs

@@ -0,0 +1,272 @@
+namespace MotorBoat
+{
+    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()
+        {
+            pictureBoxCollection = new PictureBox();
+            maskedTextBoxNumber = new MaskedTextBox();
+            ButtonAddBoat = new Button();
+            ButtonRemoveBoat = new Button();
+            ButtonRefreshCollection = new Button();
+            groupBoxTools = new GroupBox();
+            buttonSortByType = new Button();
+            buttonSortByColor = new Button();
+            groupBoxCollections = new GroupBox();
+            ButtonRemoveObject = new Button();
+            listBoxStorages = new ListBox();
+            ButtonAddObject = new Button();
+            textBoxStorageName = new MaskedTextBox();
+            menuStrip1 = new MenuStrip();
+            FileToolStripMenuItem = new ToolStripMenuItem();
+            SaveToolStripMenuItem = new ToolStripMenuItem();
+            LoadToolStripMenuItem = new ToolStripMenuItem();
+            openFileDialog = new OpenFileDialog();
+            saveFileDialog = new SaveFileDialog();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+            groupBoxTools.SuspendLayout();
+            groupBoxCollections.SuspendLayout();
+            menuStrip1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // pictureBoxCollection
+            // 
+            pictureBoxCollection.Dock = DockStyle.Left;
+            pictureBoxCollection.Location = new Point(0, 24);
+            pictureBoxCollection.Name = "pictureBoxCollection";
+            pictureBoxCollection.Size = new Size(578, 576);
+            pictureBoxCollection.TabIndex = 1;
+            pictureBoxCollection.TabStop = false;
+            // 
+            // maskedTextBoxNumber
+            // 
+            maskedTextBoxNumber.Location = new Point(51, 454);
+            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            maskedTextBoxNumber.Size = new Size(100, 23);
+            maskedTextBoxNumber.TabIndex = 0;
+            // 
+            // ButtonAddBoat
+            // 
+            ButtonAddBoat.Location = new Point(6, 408);
+            ButtonAddBoat.Name = "ButtonAddBoat";
+            ButtonAddBoat.Size = new Size(188, 40);
+            ButtonAddBoat.TabIndex = 1;
+            ButtonAddBoat.Text = "Добавить лодку";
+            ButtonAddBoat.UseVisualStyleBackColor = true;
+            ButtonAddBoat.Click += ButtonAddBoat_Click;
+            // 
+            // ButtonRemoveBoat
+            // 
+            ButtonRemoveBoat.Location = new Point(6, 490);
+            ButtonRemoveBoat.Name = "ButtonRemoveBoat";
+            ButtonRemoveBoat.Size = new Size(188, 41);
+            ButtonRemoveBoat.TabIndex = 2;
+            ButtonRemoveBoat.Text = "Удалить лодку";
+            ButtonRemoveBoat.UseVisualStyleBackColor = true;
+            ButtonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // ButtonRefreshCollection
+            // 
+            ButtonRefreshCollection.Location = new Point(6, 537);
+            ButtonRefreshCollection.Name = "ButtonRefreshCollection";
+            ButtonRefreshCollection.Size = new Size(188, 39);
+            ButtonRefreshCollection.TabIndex = 3;
+            ButtonRefreshCollection.Text = "Обновить коллекцию";
+            ButtonRefreshCollection.UseVisualStyleBackColor = true;
+            ButtonRefreshCollection.Click += ButtonRefreshCollection_Click;
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonSortByType);
+            groupBoxTools.Controls.Add(buttonSortByColor);
+            groupBoxTools.Controls.Add(groupBoxCollections);
+            groupBoxTools.Controls.Add(ButtonRefreshCollection);
+            groupBoxTools.Controls.Add(ButtonRemoveBoat);
+            groupBoxTools.Controls.Add(ButtonAddBoat);
+            groupBoxTools.Controls.Add(maskedTextBoxNumber);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(584, 24);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(200, 576);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Location = new Point(12, 339);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(176, 29);
+            buttonSortByType.TabIndex = 6;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Location = new Point(12, 304);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(176, 29);
+            buttonSortByColor.TabIndex = 5;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
+            // groupBoxCollections
+            // 
+            groupBoxCollections.Controls.Add(ButtonRemoveObject);
+            groupBoxCollections.Controls.Add(listBoxStorages);
+            groupBoxCollections.Controls.Add(ButtonAddObject);
+            groupBoxCollections.Controls.Add(textBoxStorageName);
+            groupBoxCollections.Location = new Point(6, 22);
+            groupBoxCollections.Name = "groupBoxCollections";
+            groupBoxCollections.Size = new Size(188, 261);
+            groupBoxCollections.TabIndex = 4;
+            groupBoxCollections.TabStop = false;
+            groupBoxCollections.Text = "Наборы";
+            // 
+            // ButtonRemoveObject
+            // 
+            ButtonRemoveObject.Location = new Point(6, 214);
+            ButtonRemoveObject.Name = "ButtonRemoveObject";
+            ButtonRemoveObject.Size = new Size(176, 41);
+            ButtonRemoveObject.TabIndex = 3;
+            ButtonRemoveObject.Text = "Удалить набор";
+            ButtonRemoveObject.UseVisualStyleBackColor = true;
+            ButtonRemoveObject.Click += ButtonRemoveObject_Click;
+            // 
+            // listBoxStorages
+            // 
+            listBoxStorages.FormattingEnabled = true;
+            listBoxStorages.ItemHeight = 15;
+            listBoxStorages.Location = new Point(6, 99);
+            listBoxStorages.Name = "listBoxStorages";
+            listBoxStorages.Size = new Size(176, 109);
+            listBoxStorages.TabIndex = 2;
+            listBoxStorages.SelectedIndexChanged += ButtonRefreshCollection_Click;
+            // 
+            // ButtonAddObject
+            // 
+            ButtonAddObject.Location = new Point(6, 54);
+            ButtonAddObject.Name = "ButtonAddObject";
+            ButtonAddObject.Size = new Size(176, 39);
+            ButtonAddObject.TabIndex = 1;
+            ButtonAddObject.Text = "Добавить набор";
+            ButtonAddObject.UseVisualStyleBackColor = true;
+            ButtonAddObject.Click += buttonAddObject_Click;
+            // 
+            // textBoxStorageName
+            // 
+            textBoxStorageName.Location = new Point(6, 25);
+            textBoxStorageName.Name = "textBoxStorageName";
+            textBoxStorageName.Size = new Size(176, 23);
+            textBoxStorageName.TabIndex = 0;
+            // 
+            // menuStrip1
+            // 
+            menuStrip1.Items.AddRange(new ToolStripItem[] { FileToolStripMenuItem });
+            menuStrip1.Location = new Point(0, 0);
+            menuStrip1.Name = "menuStrip1";
+            menuStrip1.Size = new Size(784, 24);
+            menuStrip1.TabIndex = 2;
+            menuStrip1.Text = "menuStrip1";
+            // 
+            // FileToolStripMenuItem
+            // 
+            FileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
+            FileToolStripMenuItem.Name = "FileToolStripMenuItem";
+            FileToolStripMenuItem.Size = new Size(48, 20);
+            FileToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            SaveToolStripMenuItem.Size = new Size(141, 22);
+            SaveToolStripMenuItem.Text = "Сохранение";
+            SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // LoadToolStripMenuItem
+            // 
+            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            LoadToolStripMenuItem.Size = new Size(141, 22);
+            LoadToolStripMenuItem.Text = "Загрузка";
+            LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.FileName = "openFileDialog1";
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(784, 600);
+            Controls.Add(groupBoxTools);
+            Controls.Add(pictureBoxCollection);
+            Controls.Add(menuStrip1);
+            MainMenuStrip = menuStrip1;
+            Name = "FormBoatCollection";
+            Text = "Набор лодок";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            groupBoxCollections.ResumeLayout(false);
+            groupBoxCollections.PerformLayout();
+            menuStrip1.ResumeLayout(false);
+            menuStrip1.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxCollection;
+        private MaskedTextBox maskedTextBoxNumber;
+        private Button ButtonAddBoat;
+        private Button ButtonRemoveBoat;
+        private Button ButtonRefreshCollection;
+        private GroupBox groupBoxTools;
+        private GroupBox groupBoxCollections;
+        private Button ButtonRemoveObject;
+        private ListBox listBoxStorages;
+        private Button ButtonAddObject;
+        private MaskedTextBox textBoxStorageName;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem FileToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.cs

@@ -0,0 +1,308 @@
+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 MotorBoat.DrawningObjects;
+using MotorBoat.Generics;
+using MotorBoat.MovementStrategy;
+using Microsoft.Extensions.Logging;
+using MotorBoat.Exceptions;
+using System.Xml.Linq;
+
+namespace MotorBoat
+{
+    /// <summary>
+    /// Форма для работы с набором объектов класса DrawningBoat
+    /// </summary>
+    public partial class FormBoatCollection : Form
+    {
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly BoatsGenericStorage _storage;
+
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatCollection(ILogger<FormBoatCollection> logger)
+        {
+            InitializeComponent();
+            _storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Заполнение listBoxStorages
+        /// </summary>
+        private void ReloadObjects()
+        {
+            int index = listBoxStorages.SelectedIndex;
+            listBoxStorages.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
+            {
+                listBoxStorages.Items.Add(_storage.Keys[i].Name);
+            }
+            if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
+            {
+                listBoxStorages.SelectedIndex = 0;
+            }
+            else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
+            {
+                listBoxStorages.SelectedIndex = index;
+            }
+        }
+
+        /// <summary>
+        /// Добавление набора в коллекцию
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+            _logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text}");
+        }
+
+        /// <summary>
+        /// Выбор набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image =
+            _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
+        }
+
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveObject_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                _logger.LogWarning("Коллекция не выбрана");
+                return;
+            }
+            string nameSet = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+            if (MessageBox.Show($"Удалить объект {nameSet}?", "Удаление",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(nameSet);
+                ReloadObjects();
+                _logger.LogInformation($"Удален набор: {nameSet}");
+            }
+            _logger.LogWarning("Отмена удаления набора");
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                _logger.LogWarning("Коллекция не выбрана");
+                return;
+            }
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            var FormBoatConfig = new FormBoatConfig();
+            FormBoatConfig.AddEvent(AddBoat);
+            FormBoatConfig.Show();
+        }
+
+        private void AddBoat(DrawningBoat drawningBoat)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+                return;
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+            {
+                _logger.LogWarning("Добавление пустого объекта");
+                return;
+            }
+
+            try
+            {
+                if (obj + drawningBoat)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollection.Image = obj.ShowBoats();
+                    _logger.LogInformation($"Объект {obj.GetType()} добавлен");
+                }
+            }
+            catch (StorageOverflowException ex)
+            {
+                MessageBox.Show(ex.Message);
+                MessageBox.Show("Не удалось добавить объект");
+                _logger.LogWarning($"{ex.Message} в наборе {listBoxStorages.SelectedItem.ToString()}");
+            }
+            catch (ArgumentException ex)
+            {
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"Не удалось добавить объект: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Удаление объекта из набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                _logger.LogWarning("Удаление объекта из несуществующего набора");
+                return;
+            }
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                _logger.LogWarning("Отмена удаления объекта");
+                return;
+            }
+
+            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            try
+            {
+                if (obj - pos != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    _logger.LogInformation($"Удален объект из коллекции {listBoxStorages.SelectedItem.ToString() ?? string.Empty} по номеру {pos}");
+                    pictureBoxCollection.Image = obj.ShowBoats();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось удалить объект");
+                    _logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorages.SelectedItem.ToString()}");
+                }
+            }
+            catch (BoatNotFoundException ex)
+            {
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"Нет объекта{ex.Message} из набора {listBoxStorages.SelectedItem.ToString()}");
+            }
+            catch (FormatException)
+            {
+                _logger.LogWarning($"Было введено не число");
+                MessageBox.Show("Введите число");
+            }
+        }
+
+        /// <summary>
+        /// Обновление рисунка по набору
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+                return;
+
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+
+            if (obj == null)
+                return;
+
+            pictureBoxCollection.Image = obj.ShowBoats();
+        }
+
+        /// <summary>
+        /// Обработка нажатия "Сохранение"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storage.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Данные загружены в файл {saveFileDialog.FileName}");
+                }
+
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogWarning($"Не удалось сохранить информацию в файл: {ex.Message}");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Обработка нажатия "Загрузка"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storage.LoadData(openFileDialog.FileName);
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}");
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogWarning($"Не удалось загрузить информацию из файла: {ex.Message}");
+                }
+            }
+            ReloadObjects();
+        }
+
+        private void buttonSortByColor_Click(object sender, EventArgs e) => CompareBoats(new BoatCompareByType());
+        private void buttonSortByType_Click(object sender, EventArgs e) => CompareBoats(new BoatCompareByColor());
+        private void CompareBoats(IComparer<DrawningBoat?> comparer)
+        {
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            obj.Sort(comparer);
+            pictureBoxCollection.Image = obj.ShowBoats();
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.resx

@@ -0,0 +1,72 @@
+<root>
+  <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>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>272, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
+</root>

MotorBoat/MotorBoat/FormBoatConfig.Designer.cs

@@ -0,0 +1,393 @@
+namespace MotorBoat
+{
+    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()
+        {
+            groupBox1 = new GroupBox();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            PanelColor = new GroupBox();
+            panelMilky = new Panel();
+            panelRed = new Panel();
+            panel8 = new Panel();
+            panelCherry = new Panel();
+            panelPeach = new Panel();
+            panelGreen = new Panel();
+            panelOrange = new Panel();
+            panelGrey = new Panel();
+            panelBrown = new Panel();
+            checkBoxEngine = new CheckBox();
+            checkBoxGlass = new CheckBox();
+            label2 = new Label();
+            label1 = new Label();
+            numericUpDownWeight = new NumericUpDown();
+            numericUpDownSpeed = new NumericUpDown();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            PanelObject = new Panel();
+            labelBodyColor = new Label();
+            labelAdditionalColor = new Label();
+            pictureBoxObject = new PictureBox();
+            groupBox1.SuspendLayout();
+            PanelColor.SuspendLayout();
+            panelRed.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            PanelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(labelModifiedObject);
+            groupBox1.Controls.Add(labelSimpleObject);
+            groupBox1.Controls.Add(PanelColor);
+            groupBox1.Controls.Add(checkBoxEngine);
+            groupBox1.Controls.Add(checkBoxGlass);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(label1);
+            groupBox1.Controls.Add(numericUpDownWeight);
+            groupBox1.Controls.Add(numericUpDownSpeed);
+            groupBox1.Location = new Point(12, 12);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(499, 264);
+            groupBox1.TabIndex = 1;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Настройки объекта";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.AllowDrop = true;
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(368, 178);
+            labelModifiedObject.Margin = new Padding(0);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Padding = new Padding(12);
+            labelModifiedObject.Size = new Size(119, 42);
+            labelModifiedObject.TabIndex = 10;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.TopCenter;
+            labelModifiedObject.MouseDown += labelSimpleObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.AllowDrop = true;
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(242, 178);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Padding = new Padding(12);
+            labelSimpleObject.Size = new Size(120, 42);
+            labelSimpleObject.TabIndex = 9;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.TopCenter;
+            labelSimpleObject.MouseDown += labelSimpleObject_MouseDown;
+            // 
+            // PanelColor
+            // 
+            PanelColor.Controls.Add(panelMilky);
+            PanelColor.Controls.Add(panelRed);
+            PanelColor.Controls.Add(panelCherry);
+            PanelColor.Controls.Add(panelPeach);
+            PanelColor.Controls.Add(panelGreen);
+            PanelColor.Controls.Add(panelOrange);
+            PanelColor.Controls.Add(panelGrey);
+            PanelColor.Controls.Add(panelBrown);
+            PanelColor.Location = new Point(242, 22);
+            PanelColor.Name = "PanelColor";
+            PanelColor.Size = new Size(245, 141);
+            PanelColor.TabIndex = 8;
+            PanelColor.TabStop = false;
+            PanelColor.Text = "Выбор цвета";
+            // 
+            // panelMilky
+            // 
+            panelMilky.AllowDrop = true;
+            panelMilky.BackColor = Color.LightGoldenrodYellow;
+            panelMilky.BorderStyle = BorderStyle.FixedSingle;
+            panelMilky.Location = new Point(126, 19);
+            panelMilky.Name = "panelMilky";
+            panelMilky.Size = new Size(50, 50);
+            panelMilky.TabIndex = 7;
+            // 
+            // panelRed
+            // 
+            panelRed.AllowDrop = true;
+            panelRed.BackColor = Color.Firebrick;
+            panelRed.BorderStyle = BorderStyle.FixedSingle;
+            panelRed.Controls.Add(panel8);
+            panelRed.Location = new Point(70, 19);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(50, 50);
+            panelRed.TabIndex = 6;
+            // 
+            // panel8
+            // 
+            panel8.BackColor = Color.FromArgb(255, 255, 192);
+            panel8.Location = new Point(53, 8);
+            panel8.Name = "panel8";
+            panel8.Size = new Size(50, 50);
+            panel8.TabIndex = 7;
+            // 
+            // panelCherry
+            // 
+            panelCherry.AllowDrop = true;
+            panelCherry.BackColor = Color.Maroon;
+            panelCherry.BorderStyle = BorderStyle.FixedSingle;
+            panelCherry.Location = new Point(14, 78);
+            panelCherry.Name = "panelCherry";
+            panelCherry.Size = new Size(50, 50);
+            panelCherry.TabIndex = 5;
+            // 
+            // panelPeach
+            // 
+            panelPeach.AllowDrop = true;
+            panelPeach.BackColor = Color.SandyBrown;
+            panelPeach.BorderStyle = BorderStyle.FixedSingle;
+            panelPeach.Location = new Point(182, 19);
+            panelPeach.Name = "panelPeach";
+            panelPeach.Size = new Size(50, 50);
+            panelPeach.TabIndex = 4;
+            // 
+            // panelGreen
+            // 
+            panelGreen.AllowDrop = true;
+            panelGreen.BackColor = Color.DarkGreen;
+            panelGreen.BorderStyle = BorderStyle.FixedSingle;
+            panelGreen.Location = new Point(70, 78);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(50, 50);
+            panelGreen.TabIndex = 3;
+            // 
+            // panelOrange
+            // 
+            panelOrange.AllowDrop = true;
+            panelOrange.BackColor = Color.Orange;
+            panelOrange.BorderStyle = BorderStyle.FixedSingle;
+            panelOrange.Location = new Point(126, 78);
+            panelOrange.Name = "panelOrange";
+            panelOrange.Size = new Size(50, 50);
+            panelOrange.TabIndex = 2;
+            // 
+            // panelGrey
+            // 
+            panelGrey.AllowDrop = true;
+            panelGrey.BackColor = Color.Silver;
+            panelGrey.BorderStyle = BorderStyle.FixedSingle;
+            panelGrey.Location = new Point(182, 78);
+            panelGrey.Name = "panelGrey";
+            panelGrey.Size = new Size(50, 50);
+            panelGrey.TabIndex = 1;
+            // 
+            // panelBrown
+            // 
+            panelBrown.AllowDrop = true;
+            panelBrown.BackColor = Color.SaddleBrown;
+            panelBrown.BorderStyle = BorderStyle.FixedSingle;
+            panelBrown.Location = new Point(14, 19);
+            panelBrown.Name = "panelBrown";
+            panelBrown.Size = new Size(50, 50);
+            panelBrown.TabIndex = 0;
+            // 
+            // checkBoxEngine
+            // 
+            checkBoxEngine.AutoSize = true;
+            checkBoxEngine.Location = new Point(11, 126);
+            checkBoxEngine.Name = "checkBoxEngine";
+            checkBoxEngine.Size = new Size(180, 19);
+            checkBoxEngine.TabIndex = 7;
+            checkBoxEngine.Text = "Признак наличия двигателя";
+            checkBoxEngine.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxGlass
+            // 
+            checkBoxGlass.AutoSize = true;
+            checkBoxGlass.Location = new Point(11, 99);
+            checkBoxGlass.Name = "checkBoxGlass";
+            checkBoxGlass.Size = new Size(225, 19);
+            checkBoxGlass.TabIndex = 6;
+            checkBoxGlass.Text = "Признак наличия защитного стекла";
+            checkBoxGlass.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(11, 51);
+            label2.Name = "label2";
+            label2.Size = new Size(29, 15);
+            label2.TabIndex = 5;
+            label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(8, 24);
+            label1.Name = "label1";
+            label1.Size = new Size(62, 15);
+            label1.TabIndex = 4;
+            label1.Text = "Скорость:";
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(74, 51);
+            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(120, 23);
+            numericUpDownWeight.TabIndex = 3;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(74, 22);
+            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(120, 23);
+            numericUpDownSpeed.TabIndex = 2;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(544, 230);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(112, 46);
+            buttonAdd.TabIndex = 13;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(661, 230);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(111, 46);
+            buttonCancel.TabIndex = 14;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // PanelObject
+            // 
+            PanelObject.AllowDrop = true;
+            PanelObject.Controls.Add(labelBodyColor);
+            PanelObject.Controls.Add(labelAdditionalColor);
+            PanelObject.Controls.Add(pictureBoxObject);
+            PanelObject.Location = new Point(527, 16);
+            PanelObject.Name = "PanelObject";
+            PanelObject.Size = new Size(259, 208);
+            PanelObject.TabIndex = 15;
+            PanelObject.DragDrop += labelObject_DragDrop;
+            PanelObject.DragEnter += labelObject_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(16, 5);
+            labelBodyColor.Margin = new Padding(0);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Padding = new Padding(12);
+            labelBodyColor.Size = new Size(112, 48);
+            labelBodyColor.TabIndex = 14;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.TopCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelColor_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(133, 5);
+            labelAdditionalColor.Margin = new Padding(0);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Padding = new Padding(12);
+            labelAdditionalColor.Size = new Size(112, 48);
+            labelAdditionalColor.TabIndex = 13;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.TopCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelColor_DragEnter;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(16, 61);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(229, 137);
+            pictureBoxObject.TabIndex = 4;
+            pictureBoxObject.TabStop = false;
+            // 
+            // FormBoatConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(802, 288);
+            Controls.Add(PanelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBox1);
+            Name = "FormBoatConfig";
+            Text = "Создание объекта";
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            PanelColor.ResumeLayout(false);
+            panelRed.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            PanelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private GroupBox groupBox1;
+        private CheckBox checkBoxEngine;
+        private CheckBox checkBoxGlass;
+        private Label label2;
+        private Label label1;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private GroupBox PanelColor;
+        private Panel panelMilky;
+        private Panel panelRed;
+        private Panel panel8;
+        private Panel panelCherry;
+        private Panel panelPeach;
+        private Panel panelGreen;
+        private Panel panelOrange;
+        private Panel panelGrey;
+        private Panel panelBrown;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel PanelObject;
+        private PictureBox pictureBoxObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.cs

@@ -0,0 +1,168 @@
+using MotorBoat.DrawningObjects;
+using MotorBoat.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 MotorBoat
+{
+    public partial class FormBoatConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранная лодка
+        /// </summary>
+        DrawningBoat? _boat = null;
+
+        /// <summary>
+        /// Событие
+        /// </summary>
+        public event Action<DrawningBoat>? EventAddBoat;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+            panelBrown.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelMilky.MouseDown += PanelColor_MouseDown;
+            panelPeach.MouseDown += PanelColor_MouseDown;
+            panelGrey.MouseDown += PanelColor_MouseDown;
+            panelOrange.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelCherry.MouseDown += PanelColor_MouseDown;
+
+            buttonCancel.Click += (s, e) => Close();
+        }
+
+        /// <summary>
+        /// Отрисовать лодку
+        /// </summary>
+        private void DrawBoat()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPosition(5, 5);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelSimpleObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data?.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White, 900, 500);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxGlass.Checked,
+                   checkBoxEngine.Checked, 900, 500);
+                    break;
+            }
+            DrawBoat();
+        }
+
+        /// <summary>
+        /// Добавление лодки
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev">Привязанный метод</param>
+        internal void AddEvent(Action<DrawningBoat> ev)
+        {
+            if (EventAddBoat == null)
+            {
+                EventAddBoat = ev;
+            }
+            else
+            {
+                EventAddBoat += ev;
+            }
+        }
+
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            EventAddBoat?.Invoke(_boat);
+            Close();
+        }
+
+        private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null)
+                return;
+            _boat?.EntityBoat?.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawBoat();
+        }
+
+        private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null)
+                return;
+            if (!(_boat is DrawningMotorBoat))
+                return;
+            (_boat.EntityBoat as EntityMotorBoat)?.setAdditionalColor(color: (Color)e.Data.GetData(typeof(Color)));
+            DrawBoat();
+        }
+
+        private void labelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

MotorBoat/MotorBoat/FormMotorBoat.Designer.cs

@@ -34,6 +34,10 @@
             buttonRight = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
+            ButonCreateMotorBoat = new Button();
+            comboBoxStrategy = new ComboBox();
+            ButtonStep = new Button();
+            ButtonSelectBoat = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).BeginInit();
             SuspendLayout();
             // 
@@ -50,11 +54,11 @@
             // buttonCreate
             // 
             buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 409);
+            buttonCreate.Location = new Point(189, 412);
             buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(90, 40);
+            buttonCreate.Size = new Size(171, 37);
             buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
+            buttonCreate.Text = "Создать лодку";
             buttonCreate.UseVisualStyleBackColor = true;
             buttonCreate.Click += ButtonCreate_Click;
             // 
@@ -106,11 +110,55 @@
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
             // 
+            // ButonCreateMotorBoat
+            // 
+            ButonCreateMotorBoat.Location = new Point(12, 412);
+            ButonCreateMotorBoat.Name = "ButonCreateMotorBoat";
+            ButonCreateMotorBoat.Size = new Size(171, 37);
+            ButonCreateMotorBoat.TabIndex = 6;
+            ButonCreateMotorBoat.Text = "Создать моторную лодку";
+            ButonCreateMotorBoat.UseVisualStyleBackColor = true;
+            ButonCreateMotorBoat.Click += ButonCreateMotorBoat_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "Перемещение в центр", "Перемещение в правый нижний угол" });
+            comboBoxStrategy.Location = new Point(749, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // ButtonStep
+            // 
+            ButtonStep.Location = new Point(795, 41);
+            ButtonStep.Name = "ButtonStep";
+            ButtonStep.Size = new Size(75, 23);
+            ButtonStep.TabIndex = 8;
+            ButtonStep.Text = "Шаг";
+            ButtonStep.UseVisualStyleBackColor = true;
+            ButtonStep.Click += ButtonStep_Click;
+            // 
+            // ButtonSelectBoat
+            // 
+            ButtonSelectBoat.Location = new Point(366, 412);
+            ButtonSelectBoat.Name = "ButtonSelectBoat";
+            ButtonSelectBoat.Size = new Size(171, 37);
+            ButtonSelectBoat.TabIndex = 9;
+            ButtonSelectBoat.Text = "Выбрать лодку";
+            ButtonSelectBoat.UseVisualStyleBackColor = true;
+            ButtonSelectBoat.Click += ButtonSelectBoat_Click;
+            // 
             // FormMotorBoat
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(884, 461);
+            Controls.Add(ButtonSelectBoat);
+            Controls.Add(ButtonStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(ButonCreateMotorBoat);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
@@ -119,7 +167,7 @@
             Controls.Add(pictureBoxMotorBoat);
             Name = "FormMotorBoat";
             StartPosition = FormStartPosition.CenterScreen;
-            Text = "FormMotorBoat";
+            Text = "Моторная лодка";
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).EndInit();
             ResumeLayout(false);
             PerformLayout();
@@ -133,5 +181,9 @@
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonDown;
+        private Button ButonCreateMotorBoat;
+        private ComboBox comboBoxStrategy;
+        private Button ButtonStep;
+        private Button ButtonSelectBoat;
     }
 }

MotorBoat/MotorBoat/FormMotorBoat.cs

@@ -1,3 +1,16 @@
+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 MotorBoat;
+using MotorBoat.MovementStrategy;
+using MotorBoat.DrawningObjects;
+
 namespace MotorBoat
 {
     public partial class FormMotorBoat : Form
@@ -5,7 +18,17 @@ namespace MotorBoat
         /// <summary>
         /// <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         /// </summary>
-        private DrawningMotorboat? _drawningMotorboat;
+        private DrawningBoat? _drawningBoat;
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public DrawningBoat? SelectedBoat { get; set; }
 
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
@@ -13,6 +36,8 @@ namespace MotorBoat
         public FormMotorBoat()
         {
             InitializeComponent();
+            _strategy = null;
+            SelectedBoat = null;
         }
 
         /// <summary>
@@ -20,42 +45,71 @@ namespace MotorBoat
         /// </summary>
         private void Draw()
         {
-            if (_drawningMotorboat == null)
+            if (_drawningBoat == null)
             {
                 return;
             }
             Bitmap bmp = new(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningMotorboat.DrawTransport(gr);
+            _drawningBoat.DrawTransport(gr);
             pictureBoxMotorBoat.Image = bmp;
         }
 
         /// <summary>
-        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButonCreateMotorBoat_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            Color bodyColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            ColorDialog dialog = new ColorDialog();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                bodyColor = dialog.Color;
+            }
+            Color additionalColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                additionalColor = dialog.Color;
+            }
+            _drawningBoat = new DrawningMotorBoat(random.Next(100, 300), random.Next(1000, 3000),
+                bodyColor, additionalColor,
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
+                pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
-            _drawningMotorboat = new DrawningMotorboat();
+            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            _drawningMotorboat.Init(random.Next(100, 300), random.Next(1000, 3000),
+            ColorDialog dialog = new();
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+            if (dialog.ShowDialog() == DialogResult.OK)
-                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)),
+                color = dialog.Color;
-                pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            }
-            _drawningMotorboat.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000),
+                color, pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
         }
 
         /// <summary>
-        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningMotorboat == null)
+            if (_drawningBoat == null)
             {
                 return;
             }
@@ -63,19 +117,72 @@ namespace MotorBoat
             switch (name)
             {
                 case "buttonUp":
-                    _drawningMotorboat.MoveTransport(DirectionType.Up);
+                    _drawningBoat.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    _drawningMotorboat.MoveTransport(DirectionType.Down);
+                    _drawningBoat.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    _drawningMotorboat.MoveTransport(DirectionType.Left);
+                    _drawningBoat.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    _drawningMotorboat.MoveTransport(DirectionType.Right);
+                    _drawningBoat.MoveTransport(DirectionType.Right);
                     break;
             }
             Draw();
         }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD>"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningBoat == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex
+                switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new
+                DrawningObjectBoat(_drawningBoat), pictureBoxMotorBoat.Width,
+                pictureBoxMotorBoat.Height);
+                comboBoxStrategy.Enabled = false;
+            }
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.MakeStep();
+            Draw();
+            if (_strategy.GetStatus() == Status.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <<param name="e"></param>
+        private void ButtonSelectBoat_Click(object sender, EventArgs e)
+        {
+            SelectedBoat = _drawningBoat;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

MotorBoat/MotorBoat/IMovableObject.cs

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

MotorBoat/MotorBoat/MotorBoat.csproj

@@ -8,6 +8,19 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.7" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

MotorBoat/MotorBoat/MoveToBorder.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.MovementStrategy;
+
+namespace MotorBoat.MovementStrategy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в правый нижний край формы
+    /// </summary>
+    public class MoveToBorder : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+            return objParams.RightBorder <= FieldWidth &&
+                objParams.RightBorder + GetStep() >= FieldWidth &&
+                objParams.DownBorder <= FieldHeight &&
+                objParams.DownBorder + GetStep() >= FieldHeight;
+
+        }
+        protected override void MoveToTarget()
+        {
+            var objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+            var diffX = objParams.RightBorder - FieldWidth;
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
+            }
+            var diffY = objParams.DownBorder - FieldHeight;
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/MoveToCenter.cs

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

MotorBoat/MotorBoat/ObjectParameters.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.MovementStrategy
+{
+    /// <summary>
+    /// Параметры-координаты объекта
+    /// </summary>
+    public class ObjectParameters
+    {
+        private readonly int _x;
+        private readonly int _y;
+        private readonly int _width;
+        private readonly int _height;
+        /// <summary>
+        /// Левая граница
+        /// </summary>
+        public int LeftBorder => _x;
+        /// <summary>
+        /// Верхняя граница
+        /// </summary>
+        public int TopBorder => _y;
+        /// <summary>
+        /// Правая граница
+        /// </summary>
+        public int RightBorder => _x + _width;
+        /// <summary>
+        /// Нижняя граница
+        /// </summary>
+        public int DownBorder => _y + _height;
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
+        public int ObjectMiddleHorizontal => _x + _width / 2;
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
+        public int ObjectMiddleVertical => _y + _height / 2;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
+        public ObjectParameters(int x, int y, int width, int height)
+        {
+            _x = x;
+            _y = y;
+            _width = width;
+            _height = height;
+        }
+    }
+}

MotorBoat/MotorBoat/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace MotorBoat
 {
     internal static class Program
@@ -11,7 +16,30 @@ namespace MotorBoat
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMotorBoat());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
+            }
+        }
+
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormBoatCollection>().AddLogging(option =>
+            {
+                string[] path = Directory.GetCurrentDirectory().Split('\\');
+                string pathNeed = "";
+                for (int i = 0; i < path.Length - 3; i++)
+                {
+                    pathNeed += path[i] + "\\";
+                }
+                var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: $"{pathNeed}appSetting.json", optional: false, reloadOnChange: true).Build();
+                var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
+
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(logger);
+            });
         }
     }
 }

MotorBoat/MotorBoat/SetGeneric.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.Exceptions;
+
+namespace MotorBoat.Generics
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T?> _places;
+
+        /// <summary>
+        /// Количество объектов
+        /// </summary>
+        public int Count => _places.Count;
+
+        /// <summary>
+        /// Макс количество объектов в списке
+        /// </summary>
+        private readonly int _maxCount;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+
+        public void SortSet(IComparer<T?> comparer) => _places.Sort(comparer);
+        public SetGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T?>(_maxCount);
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="boat">Добавляемая лодка</param>
+        /// <returns></returns>
+        public bool Insert(T boat, IEqualityComparer<T?>? equal = null)
+        {   
+            return Insert(boat, 0, equal);
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="boat">Добавляемая лодка</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public bool Insert(T boat, int position, IEqualityComparer<T>? equal = null)
+        {
+            if (position < 0 || position >= _maxCount)
+                throw new BoatNotFoundException(position);
+
+            if (Count >= _maxCount)
+                throw new StorageOverflowException(_maxCount);
+
+            if (equal != null && _places.Contains(boat, equal))
+                throw new ArgumentException("Данный объект уже есть в коллекции");
+
+            _places.Insert(0, boat);
+            return true;
+        }
+
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool Remove(int position)
+        {
+            if (position < 0 || position > _maxCount || position >= Count)
+                throw new BoatNotFoundException(position);
+            _places.RemoveAt(position);
+            return true;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= Count)
+                    return null;
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position > _maxCount || Count == _maxCount)
+                {
+                    return;
+                }
+                _places[position] = value;
+            }
+        }
+
+        /// <summary>
+        /// Проход по списку
+        /// </summary>
+        /// <param name="maxBoats"></param>
+        /// <returns></returns>
+        public IEnumerable<T> GetBoats(int? maxBoats = null)
+        {
+            for (int i = 0; i < _places.Count; ++i)
+            {
+                yield return _places[i];
+                if (maxBoats.HasValue && i == maxBoats.Value)
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/Status.cs

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

MotorBoat/MotorBoat/StorageOverflowException.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace MotorBoat.Exceptions
+{
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: { count}") { }
+        public StorageOverflowException() : base() { }
+        public StorageOverflowException(string message) : base(message) { }
+        public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
+        protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}