Merge pull request 'A. F. Kadyrov Lab work 03' (#3) from LabWork03 into LabWork02

Reviewed-on: http://student.git.athene.tech/NAP/ISEbd-21_Kadyrov_A.F._Battleship_Base/pulls/3

Battleship/Battleship/AbstractMap.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    internal abstract class AbstractMap
+    {
+        private IDrawningObject _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 Random();
+        protected readonly int _freeRoad = 0;
+        protected readonly int _barrier = 1;
+
+
+        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+        {
+            _width = width;
+            _height = height;
+            _drawingObject = drawningObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+
+            _drawingObject.MoveObject(direction);
+
+            bool collision = CheckCollision();
+
+            if (collision)
+            {
+                switch (direction)
+                {
+                    case Direction.Left:
+                        _drawingObject.MoveObject(Direction.Right);
+                        break;
+                    case Direction.Right:
+                        _drawingObject.MoveObject(Direction.Left);
+                        break;
+                    case Direction.Up:
+                        _drawingObject.MoveObject(Direction.Down);
+                        break;
+                    case Direction.Down:
+                        _drawingObject.MoveObject(Direction.Up);
+                        break;
+                }
+            }
+
+            return DrawMapWithObject();
+        }
+        private bool SetObjectOnMap()
+        {
+            if (_drawingObject == null || _map == null)
+            {
+                return false;
+            }
+            int x = _random.Next(0, 10);
+            int y = _random.Next(0, 10);
+            _drawingObject.SetObject(x, y, _width, _height);
+
+            return !CheckCollision();
+        }
+        private Bitmap DrawMapWithObject()
+        {
+            Bitmap bmp = new(_width, _height);
+            if (_drawingObject == null || _map == null)
+            {
+                return bmp;
+            }
+            Graphics gr = 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] == _freeRoad)
+                    {
+                        DrawRoadPart(gr, i, j);
+                    }
+                    else if (_map[i, j] == _barrier)
+                    {
+                        DrawBarrierPart(gr, i, j);
+                    }
+                }
+            }
+            _drawingObject.DrawningObject(gr);
+            return bmp;
+
+        }
+
+        private bool CheckCollision()
+        {
+            var pos = _drawingObject.GetCurrentPosition();
+            int startX = (int)((pos.Left) / _size_x);
+            int endX = (int)((pos.Right) / _size_x);
+            int startY = (int)((pos.Top) / _size_y);
+            int endY = (int)((pos.Bottom) / _size_y);
+
+            if (startX < 0 || startY < 0 || endX > _map.GetLength(1) || endY > _map.GetLength(0)) { return false; }
+
+
+
+            for (int y = startY; y < endY; y++)
+            {
+                for (int x = startX; x < endX; x++)
+                {
+                    if (_map[x, y] == _barrier)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        protected abstract void GenerateMap();
+        protected abstract void DrawRoadPart(Graphics g, int i, int j);
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

Battleship/Battleship/Direction.cs

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

Battleship/Battleship/DrawningBattleship.cs

@@ -9,20 +9,20 @@ namespace Battleship
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawningBattleship
+    public class DrawningBattleship
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityBattleship Battleship { get; private set; }
+        public EntityBattleship Battleship { get; protected set; }
         /// <summary>
         /// Левая координата отрисовки боевого корабля
         /// </summary>
-        private float _startPosX;
+        protected float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки боевого корабля
         /// </summary>
-        private float _startPosY;
+        protected float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -34,21 +34,34 @@ namespace Battleship
         /// <summary>
         /// Ширина отрисовки боевого корабля
         /// </summary>
-        private readonly int _battleshipWidth = 80;
+        private readonly int _battleshipWidth = 130;
         /// <summary>
         /// Высота отрисовки боевого корабля
         /// </summary>
-        private readonly int _battleshipHeight = 50;
+        private readonly int _battleshipHeight = 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 DrawningBattleship(int speed, float weight, Color bodyColor)
         {
-            Battleship = new EntityBattleship();
-            Battleship.Init(speed, weight, bodyColor);
+            Battleship = new EntityBattleship(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес военного корабля</param>
+        /// <param name="bodyColor">Цвет корпуса корабля</param>
+        /// <param name="battleshipWidth">Ширина отрисовки военного корабля</param>
+        /// <param name="battleshipHeight">Высота отрисовки военного корабля</param>
+        protected DrawningBattleship(int speed, float weight, Color bodyColor, int battleshipWidth, int battleshipHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _battleshipWidth = battleshipWidth;
+            _battleshipHeight = battleshipHeight;
         }
         /// <summary>
         /// Установка позиции боевого корабля
@@ -117,7 +130,7 @@ namespace Battleship
         /// Отрисовка боевого корабля
         /// </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)
@@ -131,10 +144,10 @@ namespace Battleship
             g.DrawRectangle(pen, _startPosX - 4, _startPosY + 4, 4, 10);
             g.DrawRectangle(pen, _startPosX - 4, _startPosY + 16 , 4, 10);
             g.DrawRectangle(pen, _startPosX + 40, _startPosY + 4, 10, 20);
-            g.DrawRectangle(pen, _startPosX , _startPosY, 70, 30);
-            PointF point_triangle_1 = new PointF(_startPosX + 70, _startPosY);
-            PointF point_triangle_2 = new PointF(_startPosX + 90, _startPosY + 15);
-            PointF point_triangle_3 = new PointF(_startPosX + 70, _startPosY + 30);
+            g.DrawRectangle(pen, _startPosX , _startPosY, 110, 30);
+            PointF point_triangle_1 = new PointF(_startPosX + 110, _startPosY);
+            PointF point_triangle_2 = new PointF(_startPosX + 130, _startPosY + 15);
+            PointF point_triangle_3 = new PointF(_startPosX + 110, _startPosY + 30);
             PointF[] assembled_triangle =
              {
                  point_triangle_1,
@@ -151,7 +164,7 @@ namespace Battleship
 
             //палуба корабля
             Brush br = new SolidBrush(Battleship?.BodyColor ?? Color.Black);
-            g.FillRectangle(br, _startPosX, _startPosY, 70, 30);
+            g.FillRectangle(br, _startPosX, _startPosY, 110, 30);
             g.FillPolygon(br, assembled_triangle);
 
             //отсек корабля
@@ -190,5 +203,13 @@ namespace Battleship
                 _startPosY = _pictureHeight.Value - _battleshipHeight;
             }
         }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosX + _battleshipWidth, _startPosY, _startPosY + _battleshipHeight);
+        }
     }
 }

Battleship/Battleship/DrawningGunBattleship.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    internal class DrawningGunBattleship : DrawningBattleship
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес военного корабля</param>
+        /// <param name="bodyColor">Цвет корпуса корабля</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="compartmentRocket">Признак наличия отсека для ракет</param>
+        /// <param name="gunTower">Признак наличия орудийной башни</param>
+        /// <param name="sternFence">Признак наличия забора на корме</param>
+        public DrawningGunBattleship(int speed, float weight, Color bodyColor, Color dopColor, bool compartmentRocket, bool gunTower, bool sternFence) :
+            base(speed, weight, bodyColor, 140, 40)
+        {
+            Battleship = new EntityGunBattleship(speed, weight, bodyColor, dopColor, compartmentRocket, gunTower, sternFence);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Battleship is not EntityGunBattleship gunBattleship)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Brush dopBrush = new SolidBrush(gunBattleship.DopColor);
+
+            if (gunBattleship.CompartmentRocket)
+            {
+                g.FillRectangle(dopBrush, _startPosX + 85, _startPosY + 10, 15, 20);
+
+                g.DrawRectangle(pen, _startPosX + 85, _startPosY + 10, 15, 20);
+            }
+
+            _startPosX += 10;
+            _startPosY += 5;
+            base.DrawTransport(g);
+            _startPosX -= 10;
+            _startPosY -= 5;
+
+            if (gunBattleship.GunTower)
+            {
+                g.FillEllipse(dopBrush, _startPosX + 105, _startPosY + 12, 17, 17);
+                g.FillRectangle(dopBrush, _startPosX + 121, _startPosY + 17, 11, 7);
+
+                g.DrawEllipse(pen, _startPosX + 105, _startPosY + 12, 17, 17);
+                g.DrawRectangle(pen, _startPosX + 121, _startPosY + 17, 11, 7);
+            }
+
+            if (gunBattleship.SternFence)
+            {
+                g.FillRectangle(dopBrush, _startPosX + 13, _startPosY + 8, 5, 25);
+                g.DrawRectangle(pen, _startPosX + 13, _startPosY + 8, 5, 25);
+            }
+        }
+    }
+}

Battleship/Battleship/DrawningObjectBattleship.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    internal class DrawningObjectBattleship : IDrawningObject
+    {
+        private DrawningBattleship _battleship = null;
+
+        public DrawningObjectBattleship(DrawningBattleship battleship)
+        {
+            _battleship = battleship;
+        }
+
+        public float Step => _battleship?.Battleship?.Step ?? 0;
+
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return _battleship?.GetCurrentPosition() ?? default;
+        }
+
+        public void MoveObject(Direction direction)
+        {
+            _battleship?.MoveTransport(direction);
+        }
+
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _battleship.SetPosition(x, y, width, height);
+        }
+
+        void IDrawningObject.DrawningObject(Graphics g)
+        {
+            _battleship.DrawTransport(g);
+        }
+    }
+}

Battleship/Battleship/EntityBattleship.cs

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

Battleship/Battleship/EntityGunBattleship.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    /// <summary>
+    /// Класс-сущность "Военный корабль с оружием"
+    /// </summary>
+    internal class EntityGunBattleship : EntityBattleship
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        /// Признак наличия отсека для ракет
+        /// </summary>
+        public bool CompartmentRocket { get; private set; }
+        /// <summary>
+        /// Признак наличия орудийной башни
+        /// </summary>
+        public bool GunTower { get; private set; }
+        /// <summary>
+        /// Признак наличия забора на корме
+        /// </summary>
+        public bool SternFence { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес военного корабля</param>
+        /// <param name="bodyColor">Цвет корпуса корабля</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="compartmentRocket">Признак наличия отсека для ракет</param>
+        /// <param name="gunTower">Признак наличия орудийной башни</param>
+        /// <param name="sternFence">Признак наличия забора на корме</param>
+        public EntityGunBattleship(int speed, float weight, Color bodyColor, Color dopColor, bool compartmentRocket, bool gunTower, bool sternFence) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            CompartmentRocket = compartmentRocket;
+            GunTower = gunTower;
+            SternFence = sternFence;
+        }
+    }
+}

Battleship/Battleship/FormBattleship.Designer.cs

@@ -29,15 +29,17 @@
         private void InitializeComponent()
         {
             this.pictureBoxBattleship = new System.Windows.Forms.PictureBox();
-            this.statusStripBattleship = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabeBodylColor = new System.Windows.Forms.ToolStripStatusLabel();
             this.buttonCreate = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabeBodylColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusStripBattleship = new System.Windows.Forms.StatusStrip();
+            this.buttonSelectBatlleship = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBattleship)).BeginInit();
             this.statusStripBattleship.SuspendLayout();
             this.SuspendLayout();
@@ -53,36 +55,6 @@
             this.pictureBoxBattleship.TabStop = false;
             this.pictureBoxBattleship.Resize += new System.EventHandler(this.PictureBoxBattleship_Resize);
             // 
-            // statusStripBattleship
-            // 
-            this.statusStripBattleship.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabeBodylColor});
-            this.statusStripBattleship.Location = new System.Drawing.Point(0, 428);
-            this.statusStripBattleship.Name = "statusStripBattleship";
-            this.statusStripBattleship.Size = new System.Drawing.Size(800, 22);
-            this.statusStripBattleship.TabIndex = 1;
-            this.statusStripBattleship.Text = "statusStrip1";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17);
-            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17);
-            this.toolStripStatusLabelWeight.Text = "Вес: ";
-            // 
-            // toolStripStatusLabeBodylColor
-            // 
-            this.toolStripStatusLabeBodylColor.Name = "toolStripStatusLabeBodylColor";
-            this.toolStripStatusLabeBodylColor.Size = new System.Drawing.Size(36, 17);
-            this.toolStripStatusLabeBodylColor.Text = "Цвет:";
-            // 
             // buttonCreate
             // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -138,12 +110,64 @@
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Location = new System.Drawing.Point(93, 397);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(110, 23);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17);
+            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17);
+            this.toolStripStatusLabelWeight.Text = "Вес: ";
+            // 
+            // toolStripStatusLabeBodylColor
+            // 
+            this.toolStripStatusLabeBodylColor.Name = "toolStripStatusLabeBodylColor";
+            this.toolStripStatusLabeBodylColor.Size = new System.Drawing.Size(36, 17);
+            this.toolStripStatusLabeBodylColor.Text = "Цвет:";
+            // 
+            // statusStripBattleship
+            // 
+            this.statusStripBattleship.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabeBodylColor});
+            this.statusStripBattleship.Location = new System.Drawing.Point(0, 428);
+            this.statusStripBattleship.Name = "statusStripBattleship";
+            this.statusStripBattleship.Size = new System.Drawing.Size(800, 22);
+            this.statusStripBattleship.TabIndex = 1;
+            this.statusStripBattleship.Text = "statusStrip1";
+            // 
+            // buttonSelectBatlleship
+            // 
+            this.buttonSelectBatlleship.Location = new System.Drawing.Point(614, 397);
+            this.buttonSelectBatlleship.Name = "buttonSelectBatlleship";
+            this.buttonSelectBatlleship.Size = new System.Drawing.Size(75, 23);
+            this.buttonSelectBatlleship.TabIndex = 8;
+            this.buttonSelectBatlleship.Text = "Выбрать";
+            this.buttonSelectBatlleship.UseVisualStyleBackColor = true;
+            this.buttonSelectBatlleship.Click += new System.EventHandler(this.ButtonSelectBatlleship_Click);
+            // 
             // FormBattleship
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.buttonSelectBatlleship);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonUp);
@@ -164,14 +188,16 @@
         #endregion
 
         private PictureBox pictureBoxBattleship;
-        private StatusStrip statusStripBattleship;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabeBodylColor;
         private Button buttonCreate;
         private Button buttonDown;
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonLeft;
+        private Button buttonCreateModif;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabeBodylColor;
+        private StatusStrip statusStripBattleship;
+        private Button buttonSelectBatlleship;
     }
 }

Battleship/Battleship/FormBattleship.cs

@@ -3,6 +3,10 @@ namespace Battleship
     public partial class FormBattleship : Form
     {
         private DrawningBattleship _battleship;
+        /// <summary>
+        /// Âűáđŕííűé îáúĺęň
+        /// </summary>
+        public DrawningBattleship SelectedBattleship { get; private set; }
 
         public FormBattleship()
         {
@@ -10,7 +14,7 @@ namespace Battleship
         }
 
         /// <summary>
-		/// Ìåòîä ïðîðèñîâêè ìàøèíû
+		/// Ěĺňîä ďđîđčńîâęč âîĺííîăî ęîđŕáë˙
 		/// </summary>
 		private void Draw()
         {
@@ -20,20 +24,32 @@ namespace Battleship
             pictureBoxBattleship.Image = bmp;
         }
         /// <summary>
-        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
+		/// Ěĺňîä óńňŕíîâęč äŕííűő
 		/// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
+		private void SetData()
         {
             Random rnd = new();
-            _battleship = new DrawningBattleship();
-            _battleship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             _battleship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBattleship.Width, pictureBoxBattleship.Height);
             toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_battleship.Battleship.Speed}";
             toolStripStatusLabelWeight.Text = $"Âåñ: {_battleship.Battleship.Weight}";
             toolStripStatusLabeBodylColor.Text = $"Öâåò: {_battleship.Battleship.BodyColor.Name}";
+        }
+        /// <summary>
+        /// Îáđŕáîňęŕ íŕćŕňč˙ ęíîďęč "Ńîçäŕňü"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            _battleship = new DrawningBattleship(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+            SetData();
             Draw();
         }
         /// <summary>
@@ -72,5 +88,37 @@ namespace Battleship
             _battleship?.ChangeBorders(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
             Draw();
         }
+        /// <summary>
+        /// Îáđŕáîňęŕ íŕćŕňč˙ ęíîďęč "Ěîäčôčęŕöč˙"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            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;
+            }
+            _battleship = new DrawningGunBattleship(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
+
+        private void ButtonSelectBatlleship_Click(object sender, EventArgs e)
+        {
+            SelectedBattleship = _battleship;
+            DialogResult = DialogResult.OK;
+
+        }
     }
 }

Battleship/Battleship/FormBattleship.resx

@@ -60,4 +60,7 @@
   <metadata name="statusStripBattleship.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

Battleship/Battleship/FormMapWithSetBattleship.Designer.cs

@@ -0,0 +1,217 @@
+namespace Battleship
+{
+    partial class FormMapWithSetBattleship
+    {
+        /// <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.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveBattleship = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddBattleship = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.buttonDown);
+            this.groupBoxTools.Controls.Add(this.buttonLeft);
+            this.groupBoxTools.Controls.Add(this.buttonUp);
+            this.groupBoxTools.Controls.Add(this.buttonRight);
+            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTools.Controls.Add(this.buttonRemoveBattleship);
+            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTools.Controls.Add(this.buttonAddBattleship);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTools.Location = new System.Drawing.Point(632, 0);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(200, 493);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::Battleship.Properties.Resources.BatteleshipDown;
+            this.buttonDown.Location = new System.Drawing.Point(77, 449);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 9;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::Battleship.Properties.Resources.BattleshipLeft;
+            this.buttonLeft.Location = new System.Drawing.Point(41, 449);
+            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::Battleship.Properties.Resources.BattleshipUp;
+            this.buttonUp.Location = new System.Drawing.Point(77, 413);
+            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);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::Battleship.Properties.Resources.BattleshipRight;
+            this.buttonRight.Location = new System.Drawing.Point(113, 449);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 6;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonShowOnMap.Location = new System.Drawing.Point(6, 367);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(188, 30);
+            this.buttonShowOnMap.TabIndex = 5;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonShowStorage.Location = new System.Drawing.Point(6, 290);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(188, 30);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveBattleship
+            // 
+            this.buttonRemoveBattleship.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRemoveBattleship.Location = new System.Drawing.Point(6, 195);
+            this.buttonRemoveBattleship.Name = "buttonRemoveBattleship";
+            this.buttonRemoveBattleship.Size = new System.Drawing.Size(188, 29);
+            this.buttonRemoveBattleship.TabIndex = 3;
+            this.buttonRemoveBattleship.Text = "Удалить корабль";
+            this.buttonRemoveBattleship.UseVisualStyleBackColor = true;
+            this.buttonRemoveBattleship.Click += new System.EventHandler(this.ButtonRemoveBattleship_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 166);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddBattleship
+            // 
+            this.buttonAddBattleship.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonAddBattleship.Location = new System.Drawing.Point(6, 112);
+            this.buttonAddBattleship.Name = "buttonAddBattleship";
+            this.buttonAddBattleship.Size = new System.Drawing.Size(188, 29);
+            this.buttonAddBattleship.TabIndex = 1;
+            this.buttonAddBattleship.Text = "Добавить корабль";
+            this.buttonAddBattleship.UseVisualStyleBackColor = true;
+            this.buttonAddBattleship.Click += new System.EventHandler(this.ButtonAddBattleship_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Водная карта"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 32);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
+            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(632, 493);
+            this.pictureBox.TabIndex = 0;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetBattleship
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(832, 493);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTools);
+            this.Name = "FormMapWithSetBattleship";
+            this.Text = "FormMapWithSetBattleship";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemoveBattleship;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddBattleship;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+    }
+}

Battleship/Battleship/FormMapWithSetBattleship.cs

@@ -0,0 +1,168 @@
+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 static System.Windows.Forms.DataFormats;
+
+namespace Battleship
+{
+    public partial class FormMapWithSetBattleship : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetBattleshipGeneric<DrawningObjectBattleship, AbstractMap> _mapBattleshipCollectionGeneric;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetBattleship()
+        {
+            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;
+            }
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Водная карта":
+                    map = new WaterMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapBattleshipCollectionGeneric = new MapWithSetBattleshipGeneric<DrawningObjectBattleship, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapBattleshipCollectionGeneric = null;
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBattleship_Click(object sender, EventArgs e)
+        {
+            if (_mapBattleshipCollectionGeneric == null)
+            {
+                return;
+            }
+            FormBattleship form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectBattleship battleship = new(form.SelectedBattleship);
+                if (_mapBattleshipCollectionGeneric + battleship != null )
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapBattleshipCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBattleship_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);
+            if (_mapBattleshipCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapBattleshipCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapBattleshipCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBattleshipCollectionGeneric.ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapBattleshipCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBattleshipCollectionGeneric.ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapBattleshipCollectionGeneric == 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 = _mapBattleshipCollectionGeneric.MoveObject(dir);
+        }
+    }
+}
+

Battleship/Battleship/FormMapWithSetBattleship.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>

Battleship/Battleship/IDrawningObject.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    /// <summary>
+    /// Интерфейс для работы с объектом, прорисовываемым на форме
+    /// </summary>
+    internal interface IDrawningObject
+    {
+        /// <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>
+        /// <returns></returns>
+        void MoveObject(Direction direction);
+        /// <summary>
+        /// Отрисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        void DrawningObject(Graphics g);
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+    }
+}

Battleship/Battleship/MapWithSetBattleshipGeneric.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    /// <summary>
+    /// Карта с набром объектов под нее
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class MapWithSetBattleshipGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        private readonly int _placeSizeWidth = 150;
+        private readonly int _placeSizeHeight = 45;
+        private readonly SetBattleshipGeneric<T> _setBattleship;
+        private readonly U _map;
+
+        public MapWithSetBattleshipGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setBattleship = new SetBattleshipGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        public static int operator +(MapWithSetBattleshipGeneric<T, U> map, T battleship)
+        {
+            return map._setBattleship.Insert(battleship);
+        }
+        public static T operator -(MapWithSetBattleshipGeneric<T, U> map, int position)
+        {
+            return map._setBattleship.Remove(position);
+        }
+
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureWidth);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawBattleship(gr);
+            return bmp;
+        }
+
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setBattleship.Count; i++)
+            {
+                var battleship = _setBattleship.Get(i);
+                if (battleship != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, battleship);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        public void Shaking()
+        {
+            int j = _setBattleship.Count - 1;
+            for (int i = 0; i < _setBattleship.Count; i++)
+            {
+                if (_setBattleship.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var battleship = _setBattleship.Get(j);
+                        if (battleship != null)
+                        {
+                            _setBattleship.Insert(battleship, i);
+                            _setBattleship.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.LightSlateGray, 3);
+            Brush brush = new SolidBrush(Color.SkyBlue);
+            g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight + 2, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight + 2);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth + 7, 2, i * _placeSizeWidth + 7, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth + 3, 2, i * _placeSizeWidth + 3, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        private void DrawBattleship(Graphics gr)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+
+            for (int i = 0; i < _setBattleship.Count; i++)
+            {
+                if (_setBattleship.Get(i) != null)
+                {
+                    _setBattleship.Get(i).SetObject(i % width * _placeSizeWidth + 15, (height - 1 - i / width) * _placeSizeHeight + 8, _pictureWidth, _pictureHeight);
+                    _setBattleship.Get(i)?.DrawningObject(gr);
+                }
+            }
+        }
+    }
+}

Battleship/Battleship/Program.cs

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

Battleship/Battleship/SetBattleshipGeneric.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetBattleshipGeneric<T>
+        where T : class
+    {
+        private readonly T[] _places;
+
+        public int Count => _places.Length;
+
+        public SetBattleshipGeneric(int count)
+        {
+            _places = new T[count];
+        }
+
+        public int Insert(T battleship)
+        {
+            return Insert(battleship, 0);
+        }
+
+        public int Insert(T battleship, int position)
+        {
+            if (position >= _places.Length)
+            {
+                return -1;
+            }
+            if (_places[position] != null)
+            {
+                int indexNull = -1;
+                for (int i = position; i < _places.Length; i++)
+                {
+                    if (_places[i] == null)
+                    {
+                        indexNull = i;
+                        break;
+                    }
+                }
+                if (indexNull == -1) return -1;
+                for (int i = indexNull; i > position; i--)
+                {
+                    T tmp = _places[i];
+                    _places[i] = _places[i - 1];
+                    _places[i - 1] = tmp;
+                }
+            }
+            _places[position] = battleship;
+            return position;
+        }
+        public T Remove(int position)
+        {
+            if (position >= _places.Length)
+            {
+                return null;
+            }
+            T removedObject = _places[position];
+            _places[position] = null;
+            return removedObject;
+        }
+        public T Get(int position)
+        {
+            if (position >= Count || position < 0)
+                return null;
+
+            return _places[position];
+        }
+    }
+}

Battleship/Battleship/SimpleMap.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    /// <summary>
+    /// Простая реализация абсрактного класса AbstractMap
+    /// </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);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x+1), j * (_size_y+1));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x+1), j * (_size_y+1));
+        }
+        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] = _freeRoad;
+                }
+            }
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

Battleship/Battleship/WaterMap.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Battleship
+{
+    internal class WaterMap : AbstractMap
+    {
+        private readonly Brush barrierColor = new SolidBrush(Color.Red);
+        private readonly Brush lightGrassColor = new SolidBrush(Color.Blue);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(lightGrassColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        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] = _freeRoad;
+                }
+            }
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}