Changed forms

Boats/Boats/AbstractMap.cs

@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    internal abstract class AbstractMap
+    {
+        private IDrawingObject _drawingObject = null;
+        protected int[,] _map = null;
+        protected int _width;
+        protected int _height;
+        protected float _size_x;
+        protected float _size_y;
+        protected readonly Random _random = new();
+        protected readonly int _freeWater = 0;
+        protected readonly int _barrier = 1;
+        /// <summary>
+        /// Функция инициализирует карту,
+        /// устанавливает объект и отрисовывает карту с объектом
+        /// </summary>
+        /// <param name="width"></param>
+        /// <param name="height"></param>
+        /// <param name="drawingObject"></param>
+        /// <returns>Bitmap карты с объектом</returns>
+        public Bitmap CreateMap(int width, int height, IDrawingObject drawingObject)
+        {
+            _width = width;
+            _height = height;
+            _drawingObject = drawingObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        /// <summary>
+        /// Функция для передвижения объекта по карте
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns>Bitmap карты с объектом</returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            // Проверка, что объект может переместится в требуемом направлении
+            // Получаем текщую позицию объекта
+            var objectPos = _drawingObject.GetCurrentPosition();
+            float currentX = objectPos.Left;
+            float currentY = objectPos.Top;
+
+            // В зависимости от направления уставналиваем dx, dy
+            float dx = 0;
+            float dy = 0;
+            switch (direction)
+            {
+                case Direction.None:
+                    break;
+                case Direction.Up:
+                    {
+                        dy = -_drawingObject.Step;
+                    }
+                    break;
+                case Direction.Down:
+                    {
+                        dy = _drawingObject.Step;
+                    }
+                    break;
+                case Direction.Left:
+                    {
+                        dx = -_drawingObject.Step;
+                    }
+                    break;
+                case Direction.Right:
+                    {
+                        dx = _drawingObject.Step;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            // ЕСли нет коллизии, то перемещаем объект
+            if (!CheckCollision(currentX + dx, currentY + dy))
+            {
+                _drawingObject.MoveObject(direction);
+            }
+            return DrawMapWithObject();
+        }
+        /// <summary>
+        /// Функция пытается поместить объект на карту
+        /// </summary>
+        /// <returns>Если удачно возвращает true, иначе - false</returns>
+        private bool SetObjectOnMap()
+        {
+            if (_drawingObject == null || _map == null)
+            {
+                return false;
+            }
+            // Генерируем новые координаты объекта
+            int x = _random.Next(100, 200);
+            int y = _random.Next(100, 200);
+            _drawingObject.SetObject(x, y, _width, _height);
+
+            // Проверка, что объект не "накладывается" на закрытые участки
+            return !CheckCollision(x, y);
+        }
+        /// <summary>
+        /// Функция для проверки коллизии объекта с препятствиями на карте.
+        /// </summary>
+        /// <param name="x">Координата x объекта</param>
+        /// <param name="y">Координата y объекта</param>
+        /// <returns>Возвращает true если есть коллизия и false - если ее нет</returns>
+        protected bool CheckCollision(float x, float y)
+        {
+            // Получаем ширину и высоту отображаемого объекта
+            var objectPos = _drawingObject.GetCurrentPosition();
+            float objectWidth = objectPos.Right - objectPos.Left;
+            float objectHeight = objectPos.Bottom - objectPos.Top;
+
+            // Теперь узнаем сколько клеток в ширину и высоту объект занимает на карте
+            int objectCellsCountX = (int)Math.Ceiling(objectWidth / _size_x);
+            int objectCellsCountY = (int)Math.Ceiling(objectHeight / _size_y);
+
+            // Получим координаты объекта в сетке карты
+            int objectMapX = (int)Math.Floor((float)x / _size_x);
+            int objectMapY = (int)Math.Floor((float)y / _size_y);
+
+            // В цикле проверяем все клетки карты на коллизию с объектом
+            int dy = 0;
+            int mapCellsX = _map.GetLength(1);
+            int mapCellsY = _map.GetLength(0);
+            int mapState = _freeWater;
+
+            while (objectMapY + dy < mapCellsY && dy <= objectCellsCountY)
+            {
+                int dx = 0;
+                while (objectMapX + dx < mapCellsX && dx <= objectCellsCountX)
+                {
+                    mapState = _map[objectMapX + dx, objectMapY + dy];
+                    if (mapState == _barrier)
+                    {
+                        return true;
+                    }
+                    dx++;
+                }
+                dy++;
+            }
+            return false;
+        }
+        /// <summary>
+        /// Функция для отрисовки карты с объектом
+        /// </summary>
+        /// <returns></returns>
+        private Bitmap DrawMapWithObject()
+        {
+            Bitmap bmp = new(_width, _height);
+            if (_drawingObject == null || _map == null)
+            {
+                return bmp;
+            }
+            Graphics g = Graphics.FromImage(bmp);
+
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    if (_map[i, j] == _freeWater)
+                    {
+                        DrawWaterPart(g, i, j);
+                    }
+                    else if (_map[i, j] == _barrier)
+                    {
+                        DrawBarrierPart(g, i, j);
+                    }
+                }
+            }
+            _drawingObject.DrawingObject(g);
+            return bmp;
+        }
+        /// <summary>
+        /// Метод для генерации карты
+        /// </summary>
+        protected abstract void GenerateMap();
+        /// <summary>
+        /// Метод для отрисовки свободного участка на экране
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected abstract void DrawWaterPart(Graphics g, int i, int j);
+        /// <summary>
+        /// Метод для отрисовки закрытого участка на экране
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

Boats/Boats/Direction.cs

@@ -9,8 +9,9 @@ namespace Boats
     /// <summary>
     /// Направление перемещения
     /// </summary>
-    internal enum Direction
+    public enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

Boats/Boats/DrawingBoat.cs

@@ -9,20 +9,20 @@ namespace Boats
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawingBoat
+    public class DrawingBoat
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityBoat Boat { private set; get; }
+        public EntityBoat Boat { protected set; get; }
         /// <summary>
         /// Левая координата отрисовки лодки
         /// </summary>
-        private float _startPosX;
+        protected float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки лодки
         /// </summary>
-        private float _startPosY;
+        protected float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -34,21 +34,34 @@ namespace Boats
         /// <summary>
         /// Ширина отрисовки лодки
         /// </summary>
-        private readonly int _boatWidth = 100;
+        protected readonly int _boatWidth = 100;
         /// <summary>
         /// Высота отрисовки лодки
         /// </summary>
-        private readonly int _boatHeight = 40;
+        protected readonly int _boatHeight = 40;
         /// <summary>
         /// Инициализация свойств
         /// </summary>
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес лодки</param>
         /// <param name="bodyColor">Цвет корпуса</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public DrawingBoat(int speed, float weight, Color bodyColor)
         {
-            Boat = new EntityBoat();
+            Boat = new EntityBoat(speed, weight, bodyColor);
-            Boat.Init(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес лодки</param>
+        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="boatWidth">Ширина отрисовки лодки</param>
+        /// <param name="boatHeight">Высота отрисовки лодки</param>
+        protected DrawingBoat(int speed, float weight, Color bodyColor, int boatWidth, int boatHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _boatWidth = boatWidth;
+            _boatHeight = boatHeight;
         }
         /// <summary>
         /// Установка позиции лодки
@@ -114,7 +127,7 @@ namespace Boats
         /// Отрисовка лодки
         /// </summary>
         /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -165,5 +178,13 @@ namespace Boats
                 _startPosY = _pictureHeight.Value - _boatHeight;
             }
         }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight);
+        }
     }
 }

Boats/Boats/DrawingCatamaran.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Класс для отрисовки катамарана
+    /// </summary>
+    internal class DrawingCatamaran : DrawingBoat
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес катамарана</param>
+        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bobbers">Признак наличия поплавков</param>
+        /// <param name="sail">Признак наличия паруса</param>
+        public DrawingCatamaran(int speed, float weight, Color bodyColor,
+            Color dopColor, bool bobbers, bool sail) :
+            base(speed, weight, bodyColor, 110, 60)
+        {
+            Boat = new EntityCatamaran(speed, weight, bodyColor, dopColor, bobbers, sail);
+        }
+        /// <summary>
+        /// Метод для отрисовки катамарана
+        /// </summary>
+        /// <param name="g"></param>
+        public override void DrawTransport(Graphics g)
+        {
+            if (Boat is not EntityCatamaran catamaran)
+            {
+                return;
+            }
+            Brush dopBrush = new SolidBrush(catamaran.DopColor);
+
+            int bobbersWidth = _boatWidth / 4;
+            int bobbersHeight = _boatHeight / 5;
+
+            base.DrawTransport(g);
+
+            if (catamaran.Bobbers)
+            {
+                // Отрисовка верхних поплавков
+                g.FillRectangle(dopBrush, _startPosX, _startPosY, bobbersWidth, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX, _startPosY, bobbersWidth, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX + bobbersWidth / 4, _startPosY, bobbersWidth / 2, bobbersHeight);
+
+                g.FillRectangle(dopBrush, _startPosX + _boatWidth / 2, _startPosY, _boatWidth / 4, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX + _boatWidth / 2, _startPosY, _boatWidth / 4, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX + _boatWidth / 2 + bobbersWidth / 4, _startPosY, bobbersWidth / 2, bobbersHeight);
+
+                // Отрисовка нижних поплавков
+                g.FillRectangle(dopBrush, _startPosX, _startPosY + _boatHeight - bobbersHeight, bobbersWidth, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX, _startPosY + _boatHeight - bobbersHeight, bobbersWidth, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX + bobbersWidth / 4, _startPosY + _boatHeight - bobbersHeight, bobbersWidth / 2, bobbersHeight);
+
+                g.FillRectangle(dopBrush, _startPosX + _boatWidth / 2, _startPosY + _boatHeight - bobbersHeight, bobbersWidth, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX + _boatWidth / 2, _startPosY + _boatHeight - bobbersHeight, bobbersWidth, bobbersHeight);
+                g.DrawRectangle(Pens.Black, _startPosX + _boatWidth / 2 + bobbersWidth / 4, _startPosY + _boatHeight - bobbersHeight, bobbersWidth / 2, bobbersHeight);
+            }
+
+            if (catamaran.Sail)
+            {
+                float downPointSailX = _startPosX + _boatWidth / 2 - _boatWidth / 8;
+                float downPointSailY = _startPosY + _boatHeight / 2 + _boatWidth / 8;
+
+                PointF[] sailPoints = new PointF[3];
+                sailPoints[0] = new PointF(downPointSailX, downPointSailY);
+                sailPoints[1] = new PointF(downPointSailX, _startPosY);
+                sailPoints[2] = new PointF(downPointSailX - _boatWidth / 4, downPointSailY - _boatHeight / 4);
+                // Отрисовка паруса
+                g.FillPolygon(dopBrush, sailPoints);
+                g.DrawPolygon(Pens.Black, sailPoints);
+            }
+        }
+    }
+}

Boats/Boats/DrawingObjectBoat.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    internal class DrawingObjectBoat : IDrawingObject
+    {
+        private DrawingBoat _boat = null;
+        public DrawingObjectBoat(DrawingBoat boat)
+        {
+            _boat = boat;
+        }
+        public float Step => _boat?.Boat?.Step ?? 0;
+        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
+        {
+            return _boat?.GetCurrentPosition() ?? default;
+        }
+        public void MoveObject(Direction direction)
+        {
+            _boat?.MoveTransport(direction);
+        }
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _boat.SetPosition(x, y, width, height);
+        }
+        public void DrawingObject(Graphics g)
+        {
+            _boat.DrawTransport(g);
+        }
+    }
+}

Boats/Boats/EntityBoat.cs

@@ -9,7 +9,7 @@ namespace Boats
     /// <summary>
     /// Класс-сущность "Лодка"
     /// </summary>
-    internal class EntityBoat
+    public class EntityBoat
     {
         /// <summary>
         /// Скорость
@@ -34,7 +34,7 @@ namespace Boats
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityBoat(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

Boats/Boats/EntityCatamaran.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    internal class EntityCatamaran : EntityBoat
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        /// Признак наличия поплавков
+        /// </summary>
+        public bool Bobbers { get; private set; }
+        /// <summary>
+        /// Признак наличия паруса
+        /// </summary>
+        public bool Sail { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес катамарана</param>
+        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bobbers">Признак наличия поплавков</param>
+        /// <param name="sail">Признак наличия паруса</param>
+        public EntityCatamaran(int speed, float weight, Color bodyColor,
+            Color dopColor, bool bobbers, bool sail) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            Bobbers = bobbers;
+            Sail = sail;
+        }
+    }
+}

Boats/Boats/FormBoat.Designer.cs

@@ -38,6 +38,8 @@
             this.ButtonLeft = new System.Windows.Forms.Button();
             this.ButtonRight = new System.Windows.Forms.Button();
             this.ButtonDown = new System.Windows.Forms.Button();
+            this.ButtonCreateModificate = new System.Windows.Forms.Button();
+            this.ButtonSelectBoat = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -143,11 +145,35 @@
             this.ButtonDown.UseVisualStyleBackColor = true;
             this.ButtonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // ButtonCreateModificate
+            // 
+            this.ButtonCreateModificate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonCreateModificate.Location = new System.Drawing.Point(138, 381);
+            this.ButtonCreateModificate.Name = "ButtonCreateModificate";
+            this.ButtonCreateModificate.Size = new System.Drawing.Size(117, 29);
+            this.ButtonCreateModificate.TabIndex = 7;
+            this.ButtonCreateModificate.Text = "Модификация";
+            this.ButtonCreateModificate.UseVisualStyleBackColor = true;
+            this.ButtonCreateModificate.Click += new System.EventHandler(this.ButtonCreateModificate_Click);
+            // 
+            // ButtonSelectBoat
+            // 
+            this.ButtonSelectBoat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonSelectBoat.Location = new System.Drawing.Point(491, 381);
+            this.ButtonSelectBoat.Name = "ButtonSelectBoat";
+            this.ButtonSelectBoat.Size = new System.Drawing.Size(117, 29);
+            this.ButtonSelectBoat.TabIndex = 8;
+            this.ButtonSelectBoat.Text = "Выбрать";
+            this.ButtonSelectBoat.UseVisualStyleBackColor = true;
+            this.ButtonSelectBoat.Click += new System.EventHandler(this.ButtonSelectBoat_Click);
+            // 
             // FormBoat
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ButtonSelectBoat);
+            this.Controls.Add(this.ButtonCreateModificate);
             this.Controls.Add(this.ButtonDown);
             this.Controls.Add(this.ButtonRight);
             this.Controls.Add(this.ButtonLeft);
@@ -177,5 +203,7 @@
         private Button ButtonLeft;
         private Button ButtonRight;
         private Button ButtonDown;
+        private Button ButtonCreateModificate;
+        private Button ButtonSelectBoat;
     }
 }

Boats/Boats/FormBoat.cs

@@ -12,12 +12,29 @@ namespace Boats
 {
     public partial class FormBoat : Form
     {
-        private DrawingBoat _boat;
+        DrawingBoat _boat;
+        public DrawingBoat SelectedBoat { get; private set; }
         public FormBoat()
         {
             InitializeComponent();
         }
         /// <summary>
+        /// Метод установки данных
+        /// </summary>
+        private void SetData()
+        {
+            Random rnd = new Random();
+            _boat.SetPosition(
+                rnd.Next(10, 100),
+                rnd.Next(10, 100),
+                pictureBoxBoat.Width,
+                pictureBoxBoat.Height
+            );
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_boat.Boat.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_boat.Boat.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {_boat.Boat.BodyColor.Name}";
+        }
+        /// <summary>
         /// Метод прорисовки лодки
         /// </summary>
         private void Draw()
@@ -28,29 +45,23 @@ namespace Boats
             pictureBoxBoat.Image = bmp;
         }
         /// <summary>
-        /// Обработка нажатия кнопки "Создать"
+        /// Обработчик нажатия кнопки "Создать"
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
-            Random rnd = new();
+            Random rnd = new Random();
-            _boat = new DrawingBoat();
+            Color color = Color.FromArgb(rnd.Next(0, 255), rnd.Next(0, 255), rnd.Next(0, 255));
-            _boat.Init(
+            ColorDialog dialog = new ColorDialog();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            _boat = new DrawingBoat(
                 rnd.Next(100, 300),
-                rnd.Next(1000, 2000),
+                rnd.Next(1000, 3000),
-                Color.FromArgb(rnd.Next(0, 256),
+                color
-                rnd.Next(0, 256), rnd.Next(0, 256))
             );
-            _boat.SetPosition(
+            SetData();
-                rnd.Next(10, 100),
-                rnd.Next(10, 100),
-                pictureBoxBoat.Width,
-                pictureBoxBoat.Height
-            );
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_boat.Boat.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_boat.Boat.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {_boat.Boat.BodyColor.Name}";
             Draw();
         }
         /// <summary>
@@ -60,21 +71,34 @@ namespace Boats
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            //получаем имя кнопки
+            if (_boat == null)
-            string name = ((Button)sender)?.Name ?? string.Empty;
+                return;
-            switch (name)
+
+            string btnName = ((Button)sender).Name;
+
+            switch (btnName)
             {
                 case "ButtonUp":
-                    _boat?.MoveTransport(Direction.Up);
+                    {
+                        _boat.MoveTransport(Direction.Up);
+                    }
                     break;
                 case "ButtonDown":
-                    _boat?.MoveTransport(Direction.Down);
+                    {
+                        _boat.MoveTransport(Direction.Down);
+                    }
                     break;
                 case "ButtonLeft":
-                    _boat?.MoveTransport(Direction.Left);
+                    {
+                        _boat.MoveTransport(Direction.Left);
+                    }
                     break;
                 case "ButtonRight":
-                    _boat?.MoveTransport(Direction.Right);
+                    {
+                        _boat.MoveTransport(Direction.Right);
+                    }
+                    break;
+                default:
                     break;
             }
             Draw();
@@ -89,5 +113,52 @@ namespace Boats
             _boat?.ChangeBorders(pictureBoxBoat.Width, pictureBoxBoat.Height);
             Draw();
         }
+        /// <summary>
+        /// Обработка нажатия кнопки "Модификация"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModificate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new Random();
+
+            // Предлагаем установить свой основной цвет
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new ColorDialog();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+
+            // Предлагаем установить свой дополнительный цвет
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+
+            _boat = new DrawingCatamaran(
+                rnd.Next(100, 300),
+                rnd.Next(1000, 3000),
+                color,
+                dopColor,
+                Convert.ToBoolean(rnd.Next(0, 2)),
+                Convert.ToBoolean(rnd.Next(0, 2))
+            );
+
+            SetData();
+            Draw();
+        }
+        /// <summary>
+        /// Обработка нажатия кнопки "Выбрать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSelectBoat_Click(object sender, EventArgs e)
+        {
+            SelectedBoat = _boat;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

Boats/Boats/FormMapWithSetBoats.Designer.cs

@@ -0,0 +1,217 @@
+namespace Boats
+{
+    partial class FormMapWithSetBoats
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBox = new System.Windows.Forms.GroupBox();
+            this.ButtonDown = new System.Windows.Forms.Button();
+            this.ButtonRight = new System.Windows.Forms.Button();
+            this.ButtonLeft = new System.Windows.Forms.Button();
+            this.ButtonUp = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.ButtonShowOnMap = new System.Windows.Forms.Button();
+            this.ButtonShowStorage = new System.Windows.Forms.Button();
+            this.ButtonRemoveBoat = new System.Windows.Forms.Button();
+            this.ButtonAddBoat = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox
+            // 
+            this.groupBox.Controls.Add(this.ButtonDown);
+            this.groupBox.Controls.Add(this.ButtonRight);
+            this.groupBox.Controls.Add(this.ButtonLeft);
+            this.groupBox.Controls.Add(this.ButtonUp);
+            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox.Controls.Add(this.ButtonShowOnMap);
+            this.groupBox.Controls.Add(this.ButtonShowStorage);
+            this.groupBox.Controls.Add(this.ButtonRemoveBoat);
+            this.groupBox.Controls.Add(this.ButtonAddBoat);
+            this.groupBox.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox.Location = new System.Drawing.Point(901, 0);
+            this.groupBox.Name = "groupBox";
+            this.groupBox.Size = new System.Drawing.Size(250, 589);
+            this.groupBox.TabIndex = 0;
+            this.groupBox.TabStop = false;
+            this.groupBox.Text = "Инструменты";
+            // 
+            // ButtonDown
+            // 
+            this.ButtonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDown.BackgroundImage = global::Boats.Properties.Resources.arrow_down;
+            this.ButtonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonDown.Location = new System.Drawing.Point(99, 537);
+            this.ButtonDown.Name = "ButtonDown";
+            this.ButtonDown.Size = new System.Drawing.Size(30, 30);
+            this.ButtonDown.TabIndex = 10;
+            this.ButtonDown.UseVisualStyleBackColor = true;
+            this.ButtonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonRight
+            // 
+            this.ButtonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonRight.BackgroundImage = global::Boats.Properties.Resources.arrow_right;
+            this.ButtonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonRight.Location = new System.Drawing.Point(135, 537);
+            this.ButtonRight.Name = "ButtonRight";
+            this.ButtonRight.Size = new System.Drawing.Size(30, 30);
+            this.ButtonRight.TabIndex = 9;
+            this.ButtonRight.UseVisualStyleBackColor = true;
+            this.ButtonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonLeft
+            // 
+            this.ButtonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonLeft.BackgroundImage = global::Boats.Properties.Resources.arrow_left;
+            this.ButtonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonLeft.Location = new System.Drawing.Point(63, 537);
+            this.ButtonLeft.Name = "ButtonLeft";
+            this.ButtonLeft.Size = new System.Drawing.Size(30, 30);
+            this.ButtonLeft.TabIndex = 8;
+            this.ButtonLeft.UseVisualStyleBackColor = true;
+            this.ButtonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonUp
+            // 
+            this.ButtonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonUp.BackgroundImage = global::Boats.Properties.Resources.arrow_up;
+            this.ButtonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.ButtonUp.Location = new System.Drawing.Point(99, 501);
+            this.ButtonUp.Name = "ButtonUp";
+            this.ButtonUp.Size = new System.Drawing.Size(30, 30);
+            this.ButtonUp.TabIndex = 7;
+            this.ButtonUp.UseVisualStyleBackColor = true;
+            this.ButtonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 168);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(232, 27);
+            this.maskedTextBoxPosition.TabIndex = 5;
+            // 
+            // ButtonShowOnMap
+            // 
+            this.ButtonShowOnMap.Location = new System.Drawing.Point(6, 389);
+            this.ButtonShowOnMap.Name = "ButtonShowOnMap";
+            this.ButtonShowOnMap.Size = new System.Drawing.Size(232, 40);
+            this.ButtonShowOnMap.TabIndex = 4;
+            this.ButtonShowOnMap.Text = "Просмотреть карту";
+            this.ButtonShowOnMap.UseVisualStyleBackColor = true;
+            this.ButtonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // ButtonShowStorage
+            // 
+            this.ButtonShowStorage.Location = new System.Drawing.Point(6, 303);
+            this.ButtonShowStorage.Name = "ButtonShowStorage";
+            this.ButtonShowStorage.Size = new System.Drawing.Size(232, 40);
+            this.ButtonShowStorage.TabIndex = 3;
+            this.ButtonShowStorage.Text = "Просмотреть хранилище";
+            this.ButtonShowStorage.UseVisualStyleBackColor = true;
+            this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // ButtonRemoveBoat
+            // 
+            this.ButtonRemoveBoat.Location = new System.Drawing.Point(6, 212);
+            this.ButtonRemoveBoat.Name = "ButtonRemoveBoat";
+            this.ButtonRemoveBoat.Size = new System.Drawing.Size(232, 40);
+            this.ButtonRemoveBoat.TabIndex = 2;
+            this.ButtonRemoveBoat.Text = "Удалить лодку";
+            this.ButtonRemoveBoat.UseVisualStyleBackColor = true;
+            this.ButtonRemoveBoat.Click += new System.EventHandler(this.ButtonRemoveBoat_Click);
+            // 
+            // ButtonAddBoat
+            // 
+            this.ButtonAddBoat.Location = new System.Drawing.Point(6, 97);
+            this.ButtonAddBoat.Name = "ButtonAddBoat";
+            this.ButtonAddBoat.Size = new System.Drawing.Size(232, 40);
+            this.ButtonAddBoat.TabIndex = 1;
+            this.ButtonAddBoat.Text = "Добавить лодку";
+            this.ButtonAddBoat.UseVisualStyleBackColor = true;
+            this.ButtonAddBoat.Click += new System.EventHandler(this.ButtonAddBoat_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Океан карта",
+            "Линии карта"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 26);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(238, 28);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(901, 589);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetBoats
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1151, 589);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox);
+            this.Name = "FormMapWithSetBoats";
+            this.Text = "Карта с набором элементов";
+            this.groupBox.ResumeLayout(false);
+            this.groupBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button ButtonShowOnMap;
+        private Button ButtonShowStorage;
+        private Button ButtonRemoveBoat;
+        private Button ButtonAddBoat;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+        private Button ButtonDown;
+        private Button ButtonRight;
+        private Button ButtonLeft;
+        private Button ButtonUp;
+    }
+}

Boats/Boats/FormMapWithSetBoats.cs

@@ -0,0 +1,173 @@
+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 Boats
+{
+    public partial class FormMapWithSetBoats : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetBoatsGeneric<DrawingObjectBoat, AbstractMap> _mapBoatsCollectionGeneric;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetBoats()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Линии карта":
+                    map = new LineMap();
+                    break;
+                case "Океан карта":
+                    map = new OceanMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapBoatsCollectionGeneric = new MapWithSetBoatsGeneric<DrawingObjectBoat, AbstractMap>(
+                pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapBoatsCollectionGeneric = null;
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            FormBoat form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                bool added = false;
+                if (form.SelectedBoat != null)
+                {
+                    DrawingObjectBoat boat = new(form.SelectedBoat);
+                    if (_mapBoatsCollectionGeneric + boat != -1)
+                    {
+                        MessageBox.Show("Объект добавлен");
+                        pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+                        added = true;
+                    }
+                }
+                if (!added)
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            pos -= 1;
+            if (_mapBoatsCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBoatsCollectionGeneric.ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            // Получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "ButtonUp":
+                    dir = Direction.Up;
+                    break;
+                case "ButtonDown":
+                    dir = Direction.Down;
+                    break;
+                case "ButtonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "ButtonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+            pictureBox.Image = _mapBoatsCollectionGeneric.MoveObject(dir);
+        }
+    }
+}

Boats/Boats/FormMapWithSetBoats.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>

Boats/Boats/IDrawingObject.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Интерфейс для работы с объектом, прорисовываемым на форме
+    /// </summary>
+    internal interface IDrawingObject
+    {
+        /// <summary>
+        /// Шаг перемещения объекта
+        /// </summary>
+        public float Step { get; }
+        /// <summary>
+        /// Установка позиции объекта
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина полотна</param>
+        /// <param name="height">Высота полотна</param>
+        void SetObject(int x, int y, int width, int height);
+        /// <summary>
+        /// Изменение направления пермещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        void MoveObject(Direction direction);
+        /// <summary>
+        /// Отрисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        void DrawingObject(Graphics g);
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        (float Left, float Top, float Right, float Bottom) GetCurrentPosition();
+    }
+}

Boats/Boats/LineMap.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Класс линейной карты
+    /// </summary>
+    internal class LineMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.White);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Метод для отрисовки закрытого участка карты
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        /// <summary>
+        /// Метод для отрисовки открытого участка карты
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected override void DrawWaterPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        /// <summary>
+        /// Метод генерации карты
+        /// </summary>
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeWater;
+                }
+            }
+            // Будем рисовать линии
+            // из непроходимых блоков
+            int counter = 0;
+            while (counter < 20)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+
+                int lineLength = 5;
+
+                if (_map[x, y] == _freeWater)
+                {
+                    int d = 0;
+                    if (Convert.ToBoolean(_random.Next(0, 2)))
+                    {
+                        while (y + d < _map.GetLength(0) && d < lineLength * 2)
+                        {
+                            _map[x, y + d] = _barrier;
+                            d++;
+                        }
+                    }
+                    else
+                    {
+                        while (x + d < _map.GetLength(1) && d < lineLength)
+                        {
+                            _map[x + d, y] = _barrier;
+                            d++;
+                        }
+                    }
+                    counter++;
+                }
+            }
+        }
+    }
+}

Boats/Boats/MapWithSetBoatsGeneric.cs

@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Карта с набром объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class MapWithSetBoatsGeneric<T, U>
+        where T : class, IDrawingObject
+        where U : AbstractMap
+    {
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 130;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 80;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetBoatsGeneric<T> _setBoats;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Массив точек установки лодок в гавани
+        /// </summary>
+        private Point[]? _placesPoints;
+        private readonly int _placesCount = 14;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetBoatsGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setBoats = new SetBoatsGeneric<T>(_placesCount);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+            _placesPoints = null;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="boat"></param>
+        /// <returns>Возвращает позицию объекта в массиве или
+        /// -1, если установить объект не удплось</returns>
+        public static int operator +(MapWithSetBoatsGeneric<T, U> map, T boat)
+        {
+            return map._setBoats.Insert(boat);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns>Возвращает удаляемый объект или
+        /// null, если удалить не удалось</returns>
+        public static T operator -(MapWithSetBoatsGeneric<T, U> map, int position)
+        {
+            return map._setBoats.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns>Возвращает Bitmap с гаванью и лодками</returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics g = Graphics.FromImage(bmp);
+            DrawBackground(g);
+            DrawBoats(g);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns>Возвращает Bitmap с картой и объектом на ней</returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setBoats.Count; i++)
+            {
+                var boat = _setBoats.Get(i);
+                if (boat != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, boat);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// Перемещение объекта по карте
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns>Возвращает Bitmap с картой и перемещенным объектом на ней</returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setBoats.Count - 1;
+            for (int i = 0; i < _setBoats.Count; i++)
+            {
+                if (_setBoats.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var boat = _setBoats.Get(j);
+                        if (boat != null)
+                        {
+                            _setBoats.Insert(boat, i);
+                            _setBoats.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            bool pointsInit = false;
+            // Если массив точек null, значит рисуем фон первый раз и
+            // инициализируем массив для его заполнения
+            if (_placesPoints == null)
+            {
+                _placesPoints = new Point[_placesCount];
+                pointsInit = true;
+            }
+            // рисуем фон
+            g.FillRectangle(Brushes.Aqua, 0, 0, _pictureWidth * _placeSizeWidth,
+                _pictureHeight * _placeSizeHeight);
+
+            // рисуем основной пирс
+            g.FillRectangle(Brushes.Gray, 0, 0, _placeSizeWidth * 5 / 4, _placeSizeHeight * 3 / 2);
+            g.FillRectangle(Brushes.Gray, _pictureWidth - _placeSizeWidth * 5 / 4, 0,
+                _placeSizeWidth * 5 / 4, _placeSizeHeight * 3 / 2);
+
+            g.FillRectangle(Brushes.Gray, 0, _placeSizeHeight * 3 / 2,
+                _placeSizeWidth * 1 / 4, _pictureHeight - _placeSizeHeight * 3 / 2);
+            g.FillRectangle(Brushes.Gray, _pictureWidth - _placeSizeWidth * 1 / 4, _placeSizeHeight * 3 / 2,
+                _placeSizeWidth * 1 / 4, _pictureHeight - _placeSizeHeight * 3 / 2);
+
+            g.FillRectangle(Brushes.Gray, 0, 0, _pictureWidth, _placeSizeHeight * 1 / 2);
+
+            // рисуем плавучие пирсы
+            // горизонтальные
+            int w = _placeSizeWidth;
+            int h = _placeSizeHeight;
+            int x = w * 1 / 4;
+            int y = h * 5 / 2;
+            int pirsSize = h * 1 / 6;
+            int i = 0;
+            while (y + h + pirsSize < _pictureHeight)
+            {
+                g.FillRectangle(Brushes.Brown, x, y, w, pirsSize);
+                g.FillRectangle(Brushes.Brown, _pictureWidth - x - w, y, w, pirsSize);
+                if (pointsInit)
+                {
+                    _placesPoints[9 + i] = new Point(x + 5, y - _placeSizeHeight + 5);
+                    _placesPoints[4 - i] = new Point(_pictureWidth - x - w + 5, y - _placeSizeHeight + 5);
+                }
+                y += h + pirsSize;
+                i++;
+            }
+            if (pointsInit)
+            {
+                _placesPoints[9 + i] = new Point(x + 5, y - _placeSizeHeight + 5);
+                _placesPoints[4 - i] = new Point(_pictureWidth - x - w + 5, y - _placeSizeHeight + 5);
+            }
+
+            // вертикальные
+            x = _placeSizeWidth * 5 / 4 + w;
+            y = _placeSizeHeight * 1 / 2;
+            h = _placeSizeHeight;
+            i = 0;
+            while (x + w + pirsSize < _pictureWidth - _placeSizeWidth * 5 / 4)
+            {
+                g.FillRectangle(Brushes.Brown, x, y, pirsSize, h);
+                if (pointsInit)
+                {
+                    _placesPoints[8 - i] = new Point(x - w + 5, y + 5);
+                }
+                x += w + pirsSize;
+                i++;
+            }
+            if (pointsInit)
+            {
+                _placesPoints[8 - i] = new Point(x - w + 5, y + 5);
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки лодок
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBoats(Graphics g)
+        {
+            for (int i = 0; i < _setBoats.Count; i++)
+            {
+                // Установка позиции
+                _setBoats.Get(i)?.SetObject(_placesPoints[i].X, _placesPoints[i].Y,
+                    _pictureWidth, _pictureHeight);
+                _setBoats.Get(i)?.DrawingObject(g);
+            }
+        }
+    }
+}

Boats/Boats/OceanMap.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Класс океанической карты
+    /// </summary>
+    internal class OceanMap : AbstractMap
+    {
+        /// <summary>
+        /// Количество мин воруг центральной мины
+        /// </summary>
+        private readonly int minesAroundCount = 6;
+        /// <summary>
+        /// Количество центральных мин
+        /// </summary>
+        private readonly int circlesCount = 12;
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush mineColor = Brushes.Silver;
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush openColor = Brushes.Aqua;
+        /// <summary>
+        /// Метод для отрисовки закрытого участка карты
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(openColor, i * _size_x, j * _size_y, _size_x, _size_y);
+            g.FillEllipse(mineColor, i * _size_x, j * _size_y, _size_x, _size_y);
+            g.FillEllipse(Brushes.Black, i * _size_x + _size_x * 0.25f, j * _size_y + _size_y * 0.25f, _size_x * 0.5f, _size_y * 0.5f);
+            g.FillEllipse(Brushes.Red, i * _size_x + _size_x * 0.375f, j * _size_y + _size_y * 0.375f, _size_x * 0.25f, _size_y * 0.25f);
+        }
+        /// <summary>
+        /// Метод для отрисовки открытого участка карты
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected override void DrawWaterPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(openColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        /// <summary>
+        /// Метод генерации карты
+        /// </summary>
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeWater;
+                }
+            }
+            // Отрисовка "мин"
+            double radius = Math.Min(_size_x, _size_y);
+            while (counter < circlesCount)
+            {
+                int x = _random.Next(0, 99);
+                int y = _random.Next(0, 99);
+                _map[y, x] = _barrier;
+                for (int i = 0; i < minesAroundCount; i++)
+                {
+                    int row = (int)Math.Ceiling(radius * Math.Sin(Math.PI * 2 / minesAroundCount * i)) + y;
+                    int col = (int)Math.Ceiling(radius * Math.Cos(Math.PI * 2 / minesAroundCount * i)) + x;
+
+                    if (row > -1 && col > -1 && row < _map.GetLength(0) && col < _map.GetLength(1))
+                    {
+                        _map[row, col] = _barrier;
+                    }
+                }
+                counter++;
+            }
+        }
+    }
+}

Boats/Boats/Program.cs

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

Boats/Boats/SetBoatsGeneric.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetBoatsGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private readonly T[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetBoatsGeneric(int count)
+        {
+            _places = new T[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="boat">Добавляемая лодка</param>
+        /// <returns></returns>
+        public int Insert(T boat)
+        {
+            // Вставка в начало набора
+            return Insert(boat, 0);
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="boat">Добавляемая лодка</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T boat, int position)
+        {
+            // Проверка позиции
+            if (position < 0 || position >= _places.Length)
+                return -1;
+            // Проверка, что элемент массива по этой позиции пустой
+            if (_places[position] != null)
+            {
+                // Если нет, проверим, что после вставляемого элемента в массиве есть пустой элемент
+                int i = position + 1;
+                int nullIndex = -1;
+                while (i < _places.Length)
+                {
+                    if (_places[i] == null)
+                    {
+                        nullIndex = i;
+                        break;
+                    }
+                    i++;
+                }
+                // Если свободной нет, то выходим
+                if (nullIndex < 0)
+                {
+                    return -1;
+                }
+                else
+                {
+                    // Если есть, сдвигаем все объекты, находящиеся
+                    // справа от позиции до первого пустого элемента
+                    i = nullIndex - 1;
+                    while (i >= position)
+                    {
+                        _places[i + 1] = _places[i];
+                        i--;
+                    }
+                }
+            }
+            // Вставка по позиции
+            _places[position] = boat;
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns>Возвращает удаляемый объект или null, если не удалось удалить</returns>
+        public T Remove(int position)
+        {
+            // Проверка позиции
+            if (position < 0 || position >= _places.Length)
+                return null;
+            if (_places[position] == null)
+            {
+                return null;
+            }
+            // Удаление объекта из массива, присовив элементу массива значение null
+            T boat = _places[position];
+            _places[position] = null;
+            return boat;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns>Возвращает объект по позиции</returns>
+        public T Get(int position)
+        {
+            // Проверка позиции
+            if (position < 0 || position >= _places.Length)
+                return null;
+            return _places[position];
+        }
+    }
+}

Boats/Boats/SimpleMap.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Boats
+{
+    /// <summary>
+    /// Класс стандартной карты
+    /// </summary>
+    internal class SimpleMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Gray);
+        /// <summary>
+        /// Метод для отрисовки закрытого участка карты
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        /// <summary>
+        /// Метод для отрисовки открытого участка карты
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="j"></param>
+        protected override void DrawWaterPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        /// <summary>
+        /// Метод генерации карты
+        /// </summary>
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeWater;
+                }
+            }
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeWater)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}