Merge pull request 'Nevaeva K. A. LabWork03' (#3) from Lab_3 into Lab_2

Reviewed-on: http://student.git.athene.tech/ksenia_nevaeva/PIbd-23_Nevaeva_K.A._ContainerShip_Base/pulls/3

ContainerShip/ContainerShip/AbstractMap.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    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 _freeRoad = 0;
+        protected readonly int _barrier = 1;
+        public Bitmap CreateMap(int width, int height, IDrawingObject drawingObject)
+        {
+            _width = width;
+            _height = height;
+            _drawingObject = drawingObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_drawingObject == null) return DrawMapWithObject();
+            bool canMove = true;
+            switch (direction)
+            {
+                case Direction.Left:
+                    if (!CheckForBarriers(0, -1 * _drawingObject.Step, -1 * _drawingObject.Step, 0)) canMove = false;
+                    break;
+                case Direction.Right:
+                    if (!CheckForBarriers(0, _drawingObject.Step, _drawingObject.Step, 0)) canMove = false;
+                    break;
+                case Direction.Up:
+                    if (!CheckForBarriers(-1 * _drawingObject.Step, 0, 0, -1 * _drawingObject.Step)) canMove = false;
+                    break;
+                case Direction.Down:
+                    if (!CheckForBarriers(_drawingObject.Step, 0, 0, _drawingObject.Step)) canMove = false;
+                    break;
+            }
+            if (canMove)
+            {
+                _drawingObject.MoveObject(direction);
+            }
+            return DrawMapWithObject();
+        }
+        //Вспомогательная функция проверки
+        private bool CheckForBarriers(float topBorder, float rightBorder, float leftBorder, float bottomBorder)
+        {
+            int top = Convert.ToInt32((_drawingObject.GetCurrentPosition().Top + topBorder)/_size_y);
+            int bottom = Convert.ToInt32((_drawingObject.GetCurrentPosition().Bottom + bottomBorder)/_size_y);
+            int right = Convert.ToInt32((_drawingObject.GetCurrentPosition().Right + rightBorder)/_size_x);
+            int left = Convert.ToInt32((_drawingObject.GetCurrentPosition().Left + leftBorder)/_size_x);
+
+            if (left < 0 || top < 0 || right >= _map.GetLength(0) || bottom >= _map.GetLength(1))
+            {
+                return false;
+            }
+
+            for (int i = top; i <= bottom; i++)
+            {
+                for (int j = left; j <= right; j++)
+                {
+                    if (_map[j, i] == 1) return false;
+                }
+            }
+            return true;
+        }
+        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);
+            if (!CheckForBarriers(0, 0, 0, 0)) return false;
+            return true;
+        }
+        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.DrawingObject(gr);
+            return bmp;
+        }
+
+        protected abstract void GenerateMap();
+        protected abstract void DrawRoadPart(Graphics g, int i, int j);
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

ContainerShip/ContainerShip/Direction.cs

@@ -6,8 +6,9 @@ using System.Threading.Tasks;
 
 namespace ContainerShip
 {
-    internal enum Direction
+    public enum Direction
     {
+            None = 0,
             Up = 1,
             Down = 2,
             Left = 3,

ContainerShip/ContainerShip/DrawingContainerShip.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class DrawingContainerShip : DrawingShip
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public DrawingContainerShip(int speed, float weight, Color bodyColor, Color dopColor, bool crane, bool containers) :
+            base(speed, weight, bodyColor, 135, 70)
+        {
+            Ship = new EntityContainerShip(speed, weight, bodyColor, dopColor, crane, containers);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Ship is not EntityContainerShip containerShip)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Brush dopBrush = new SolidBrush(containerShip.DopColor);
+            Pen dopPen = new (containerShip.DopColor);
+
+            _startPosY += 30;
+            base.DrawTransport(g);
+            _startPosY -= 30;
+            int _startPosYInt = (int)_startPosY;
+            int _startPosXInt = (int)_startPosX;
+            if (containerShip.Containers)
+            {
+                Point[] container1 =
+                {
+                    new Point(_startPosXInt + 5, _startPosYInt + 45),
+                    new Point(_startPosXInt + 5, _startPosYInt + 35),
+                    new Point(_startPosXInt + 25, _startPosYInt + 35),
+                    new Point(_startPosXInt + 25, _startPosYInt + 45)
+                };
+
+
+                Point[] container2 =
+                {
+                    new Point(_startPosXInt + 40, _startPosYInt + 45),
+                    new Point(_startPosXInt + 40, _startPosYInt + 35),
+                    new Point(_startPosXInt + 75, _startPosYInt + 35),
+                    new Point(_startPosXInt + 75, _startPosYInt + 45),
+                    
+                };
+
+                Point[] container3 =
+                {
+                    new Point(_startPosXInt + 80, _startPosYInt + 45),
+                    new Point(_startPosXInt + 80, _startPosYInt + 35),
+                    new Point(_startPosXInt + 110, _startPosYInt + 35),
+                    new Point(_startPosXInt + 110, _startPosYInt + 45)
+                };
+
+                Point[] container4 =
+                {
+                    new Point(_startPosXInt + 110, _startPosYInt + 30),
+                    new Point(_startPosXInt + 110, _startPosYInt + 45),
+                    new Point(_startPosXInt + 130, _startPosYInt + 45),
+                    new Point(_startPosXInt + 130, _startPosYInt + 30)
+                };
+
+                g.FillPolygon(dopBrush, container1);
+                g.DrawPolygon(pen, container1);
+                g.FillPolygon(dopBrush, container2);
+                g.DrawPolygon(pen, container2);
+                g.FillPolygon(dopBrush, container3);
+                g.DrawPolygon(pen, container3);
+                g.FillPolygon(dopBrush, container4);
+                g.DrawPolygon(pen, container4);
+
+
+            }
+            if (containerShip.Crane)
+            {
+                g.DrawLine(dopPen, _startPosX + 40, _startPosY + 15, _startPosX + 40, _startPosY);
+                g.DrawLine(dopPen, _startPosX + 40, _startPosY, _startPosX + 80, _startPosY);
+                g.DrawLine(dopPen, _startPosX + 40, _startPosY, _startPosX + 80, _startPosY + 5);
+                g.DrawLine(dopPen, _startPosX + 80, _startPosY, _startPosX + 80, _startPosY + 30);
+            }
+
+        }
+    }
+}
+

ContainerShip/ContainerShip/DrawingObjectShip.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class DrawingObjectShip : IDrawingObject
+    {
+        private DrawingShip _ship = null;
+
+        public DrawingObjectShip(DrawingShip ship)
+        {
+            _ship = ship;
+        }
+
+        public float Step => _ship?.Ship?.Step ?? 0;
+
+        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
+        {
+            return _ship?.GetCurrentPosition() ?? default;
+        }
+
+        public void MoveObject(Direction direction)
+        {
+            _ship?.MoveTransport(direction);
+        }
+
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _ship.SetPosition(x, y, width, height);
+        }
+
+        void IDrawingObject.DrawingObject(Graphics g)
+        {
+            if (_ship == null) return;
+            if (_ship is DrawingContainerShip ship)
+            {
+                ship.DrawTransport(g);
+            }
+            else
+            {
+                _ship.DrawTransport(g);
+            }
+        }
+    }
+}

ContainerShip/ContainerShip/DrawingShip.cs

@@ -7,11 +7,11 @@ using static ContainerShip.EntityShip;
 
 namespace ContainerShip
 {
-    internal class DrawingShip
+    public class DrawingShip
     {
-        public EntityShip Ship { private set; get; }
-        private float _startPosX;
-        private float _startPosY;
+        public EntityShip Ship { protected set; get; }
+        protected float _startPosX;
+        protected float _startPosY;
         private int? _pictureWidth = null;
         private int _startPosXInt;
         private int _startPosYInt;
@@ -22,7 +22,7 @@ namespace ContainerShip
         /// <summary>
         /// Ширина отрисовки автомобиля
         /// </summary>
-        private readonly int _shipWidth = 120;
+        private readonly int _shipWidth = 135;
         /// <summary>
         /// Высота отрисовки автомобиля
         /// </summary>
@@ -33,12 +33,18 @@ namespace ContainerShip
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес автомобиля</param>
         /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public DrawingShip(int speed, float weight, Color bodyColor)
         {
-            Ship = new EntityShip();
-            Ship.Init(speed, weight, bodyColor);
+            Ship = new EntityShip(speed, weight, bodyColor);
         }
 
+        protected DrawingShip(int speed, float weight, Color bodyColor, int
+                shipWidth, int shipHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _shipWidth = shipWidth;
+            _shipHeight = shipHeight;
+        }
         /// <param name="x">Координата X</param>
         /// <param name="y">Координата Y</param>
         /// <param name="width">Ширина картинки</param>
@@ -100,7 +106,7 @@ namespace ContainerShip
         /// Отрисовка 
         /// </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)
@@ -130,7 +136,6 @@ namespace ContainerShip
             g.DrawLine(pen, _startPosXInt + 30, _startPosYInt + 20, _startPosXInt + 30, _startPosYInt + 30);
             g.DrawLine(pen, _startPosXInt + 25, _startPosYInt + 25, _startPosXInt + 35, _startPosYInt + 25);
             g.DrawLine(pen, _startPosXInt + 25, _startPosYInt + 30, _startPosXInt + 35, _startPosYInt + 30);
-
         }
         /// <summary>
         /// Смена границ формы отрисовки
@@ -156,5 +161,14 @@ namespace ContainerShip
                 _startPosY = _pictureHeight.Value - _shipHeight;
             }
         }
+
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight);
+        }
     }
 }

ContainerShip/ContainerShip/EntityContainerShip.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class EntityContainerShip : EntityShip
+    {
+        public Color DopColor { get; private set; }
+        public bool Containers { get; private set; }
+        public bool Crane { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public EntityContainerShip(int speed, float weight, Color bodyColor, Color dopColor, bool crane, bool containers) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            Crane = crane;
+            Containers = containers;
+        }
+    }
+}

ContainerShip/ContainerShip/EntityShip.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ContainerShip
 {
-    internal class EntityShip
+    public class EntityShip
     {
         /// <summary>
         /// Скорость
@@ -31,7 +31,7 @@ namespace ContainerShip
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityShip(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

ContainerShip/ContainerShip/FormMapWithSetShips.Designer.cs

@@ -0,0 +1,215 @@
+namespace ContainerShip
+{
+    partial class FormMapWithSetShips
+    {
+        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.ButtonAddShip = new System.Windows.Forms.Button();
+            this.ComboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.button3 = new System.Windows.Forms.Button();
+            this.ButtonShowStorage = new System.Windows.Forms.Button();
+            this.ButtonRemoveShip = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.ButtonAddShip);
+            this.groupBox1.Controls.Add(this.ComboBoxSelectorMap);
+            this.groupBox1.Controls.Add(this.buttonUp);
+            this.groupBox1.Controls.Add(this.buttonRight);
+            this.groupBox1.Controls.Add(this.buttonDown);
+            this.groupBox1.Controls.Add(this.buttonLeft);
+            this.groupBox1.Controls.Add(this.button3);
+            this.groupBox1.Controls.Add(this.ButtonShowStorage);
+            this.groupBox1.Controls.Add(this.ButtonRemoveShip);
+            this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Location = new System.Drawing.Point(553, 0);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(300, 508);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Инструменты";
+            // 
+            // ButtonAddShip
+            // 
+            this.ButtonAddShip.Location = new System.Drawing.Point(6, 74);
+            this.ButtonAddShip.Name = "ButtonAddShip";
+            this.ButtonAddShip.Size = new System.Drawing.Size(288, 34);
+            this.ButtonAddShip.TabIndex = 11;
+            this.ButtonAddShip.Text = "Добавить корабль";
+            this.ButtonAddShip.UseVisualStyleBackColor = true;
+            this.ButtonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
+            // 
+            // ComboBoxSelectorMap
+            // 
+            this.ComboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.ComboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Модифицированная карта"});
+            this.ComboBoxSelectorMap.Location = new System.Drawing.Point(6, 35);
+            this.ComboBoxSelectorMap.Name = "ComboBoxSelectorMap";
+            this.ComboBoxSelectorMap.Size = new System.Drawing.Size(288, 33);
+            this.ComboBoxSelectorMap.TabIndex = 10;
+            this.ComboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::ContainerShip.Properties.Resources.upArrow;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(131, 390);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(50, 50);
+            this.buttonUp.TabIndex = 9;
+            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::ContainerShip.Properties.Resources.LeftArrow;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(187, 446);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(50, 50);
+            this.buttonRight.TabIndex = 8;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::ContainerShip.Properties.Resources.DownArrow;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(131, 446);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(50, 50);
+            this.buttonDown.TabIndex = 7;
+            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::ContainerShip.Properties.Resources.RightArrow;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(75, 446);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(50, 50);
+            this.buttonLeft.TabIndex = 6;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // button3
+            // 
+            this.button3.Location = new System.Drawing.Point(8, 292);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(286, 34);
+            this.button3.TabIndex = 3;
+            this.button3.Text = "Посмотреть карту";
+            this.button3.UseVisualStyleBackColor = true;
+            this.button3.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // ButtonShowStorage
+            // 
+            this.ButtonShowStorage.Location = new System.Drawing.Point(6, 243);
+            this.ButtonShowStorage.Name = "ButtonShowStorage";
+            this.ButtonShowStorage.Size = new System.Drawing.Size(288, 34);
+            this.ButtonShowStorage.TabIndex = 2;
+            this.ButtonShowStorage.Text = "Просмотреть хранилище";
+            this.ButtonShowStorage.UseVisualStyleBackColor = true;
+            this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // ButtonRemoveShip
+            // 
+            this.ButtonRemoveShip.Location = new System.Drawing.Point(6, 162);
+            this.ButtonRemoveShip.Name = "ButtonRemoveShip";
+            this.ButtonRemoveShip.Size = new System.Drawing.Size(288, 41);
+            this.ButtonRemoveShip.TabIndex = 1;
+            this.ButtonRemoveShip.Text = "Удалить корабль";
+            this.ButtonRemoveShip.UseVisualStyleBackColor = true;
+            this.ButtonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 125);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(288, 31);
+            this.maskedTextBoxPosition.TabIndex = 0;
+            // 
+            // 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(553, 508);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetShips
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(853, 508);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormMapWithSetShips";
+            this.Text = "Карта с набором объектов";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private Button button3;
+        private Button ButtonShowStorage;
+        private Button ButtonRemoveShip;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonLeft;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button ButtonAddShip;
+        private ComboBox ComboBoxSelectorMap;
+    }
+}

ContainerShip/ContainerShip/FormMapWithSetShips.cs

@@ -0,0 +1,158 @@
+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 ContainerShip
+{
+    public partial class FormMapWithSetShips : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetShipsGeneric<DrawingObjectShip, AbstractMap> _mapShipsCollectionGeneric;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetShips()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (ComboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Модифицированная карта":
+                    map = new ModifyMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapShipsCollectionGeneric = new MapWithSetShipsGeneric<DrawingObjectShip, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+{
+            _mapShipsCollectionGeneric = null;
+}
+        }
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddShip_Click(object sender, EventArgs e)
+        {
+            if (_mapShipsCollectionGeneric == null)
+            {
+                return;
+            }
+            FormShip form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawingObjectShip ship = new(form.SelectedShip);
+                if (_mapShipsCollectionGeneric + ship != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveShip_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 (_mapShipsCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapShipsCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapShipsCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapShipsCollectionGeneric.ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapShipsCollectionGeneric == 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 = _mapShipsCollectionGeneric.MoveObject(dir);
+        }
+    }
+}

ContainerShip/ContainerShip/FormMapWithSetShips.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>

ContainerShip/ContainerShip/FormShip.Designer.cs

@@ -32,12 +32,14 @@
             this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
             this.pictureBoxShip = new System.Windows.Forms.PictureBox();
             this.ButtonCreate = new System.Windows.Forms.Button();
+            this.ButtonCreateModif = new System.Windows.Forms.Button();
+            this.ButtonSelectShip = 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.buttonDown = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
             this.SuspendLayout();
@@ -60,31 +62,92 @@
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
             this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(93, 25);
             this.toolStripStatusLabelSpeed.Text = "Скорость:";
+            this.toolStripStatusLabelSpeed.Click += new System.EventHandler(this.toolStripStatusLabelSpeed_Click);
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
             this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(43, 25);
             this.toolStripStatusLabelWeight.Text = "Вес:";
+            this.toolStripStatusLabelWeight.Click += new System.EventHandler(this.toolStripStatusLabelWeight_Click);
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
             this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(55, 25);
             this.toolStripStatusLabelBodyColor.Text = "Цвет:";
+            this.toolStripStatusLabelBodyColor.Click += new System.EventHandler(this.toolStripStatusLabelBodyColor_Click);
+            // 
+            // pictureBoxShip
+            // 
+            this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxShip.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxShip.Name = "pictureBoxShip";
+            this.pictureBoxShip.Size = new System.Drawing.Size(800, 418);
+            this.pictureBoxShip.TabIndex = 7;
+            this.pictureBoxShip.TabStop = false;
+            this.pictureBoxShip.Click += new System.EventHandler(this.pictureBoxShip_Click);
+            // 
+            // ButtonCreate
+            // 
+            this.ButtonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonCreate.BackColor = System.Drawing.SystemColors.Window;
+            this.ButtonCreate.Location = new System.Drawing.Point(12, 381);
+            this.ButtonCreate.Name = "ButtonCreate";
+            this.ButtonCreate.Size = new System.Drawing.Size(112, 34);
+            this.ButtonCreate.TabIndex = 8;
+            this.ButtonCreate.Text = "Создать";
+            this.ButtonCreate.UseVisualStyleBackColor = false;
+            this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+            // 
+            // ButtonCreateModif
+            // 
+            this.ButtonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonCreateModif.BackColor = System.Drawing.SystemColors.Window;
+            this.ButtonCreateModif.Location = new System.Drawing.Point(130, 381);
+            this.ButtonCreateModif.Name = "ButtonCreateModif";
+            this.ButtonCreateModif.Size = new System.Drawing.Size(143, 34);
+            this.ButtonCreateModif.TabIndex = 9;
+            this.ButtonCreateModif.Text = "Модификация";
+            this.ButtonCreateModif.UseVisualStyleBackColor = false;
+            this.ButtonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // ButtonSelectShip
+            // 
+            this.ButtonSelectShip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ButtonSelectShip.BackColor = System.Drawing.SystemColors.Window;
+            this.ButtonSelectShip.Location = new System.Drawing.Point(479, 381);
+            this.ButtonSelectShip.Name = "ButtonSelectShip";
+            this.ButtonSelectShip.Size = new System.Drawing.Size(112, 34);
+            this.ButtonSelectShip.TabIndex = 10;
+            this.ButtonSelectShip.Text = "Выбрать";
+            this.ButtonSelectShip.UseVisualStyleBackColor = false;
+            this.ButtonSelectShip.Click += new System.EventHandler(this.ButtonSelectShip_Click);
             // 
             // buttonRight
             // 
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::ContainerShip.Properties.Resources.LeftArrow;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(738, 353);
+            this.buttonRight.Location = new System.Drawing.Point(738, 362);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(50, 50);
             this.buttonRight.TabIndex = 2;
             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::ContainerShip.Properties.Resources.RightArrow;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(626, 362);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(50, 50);
+            this.buttonLeft.TabIndex = 5;
+            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)));
@@ -102,51 +165,20 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::ContainerShip.Properties.Resources.DownArrow;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(682, 352);
+            this.buttonDown.Location = new System.Drawing.Point(682, 362);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(50, 50);
             this.buttonDown.TabIndex = 4;
             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::ContainerShip.Properties.Resources.RightArrow;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(626, 353);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(50, 50);
-            this.buttonLeft.TabIndex = 5;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // pictureBoxShip
-            // 
-            this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxShip.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxShip.Name = "pictureBoxShip";
-            this.pictureBoxShip.Size = new System.Drawing.Size(800, 418);
-            this.pictureBoxShip.TabIndex = 7;
-            this.pictureBoxShip.TabStop = false;
-            // 
-            // ButtonCreate
-            // 
-            this.ButtonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.ButtonCreate.BackColor = System.Drawing.SystemColors.Window;
-            this.ButtonCreate.Location = new System.Drawing.Point(12, 381);
-            this.ButtonCreate.Name = "ButtonCreate";
-            this.ButtonCreate.Size = new System.Drawing.Size(112, 34);
-            this.ButtonCreate.TabIndex = 8;
-            this.ButtonCreate.Text = "Создать";
-            this.ButtonCreate.UseVisualStyleBackColor = false;
-            this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
             // FormShip
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ButtonSelectShip);
+            this.Controls.Add(this.ButtonCreateModif);
             this.Controls.Add(this.ButtonCreate);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonDown);
@@ -168,14 +200,16 @@
         #endregion
 
         private StatusStrip statusStrip1;
-        private Button buttonRight;
-        private Button buttonUp;
-        private Button buttonDown;
-        private Button buttonLeft;
         private ToolStripStatusLabel toolStripStatusLabelSpeed;
         private ToolStripStatusLabel toolStripStatusLabelWeight;
         private ToolStripStatusLabel toolStripStatusLabelBodyColor;
         private PictureBox pictureBoxShip;
         private Button ButtonCreate;
+        private Button ButtonCreateModif;
+        private Button ButtonSelectShip;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonDown;
     }
 }

ContainerShip/ContainerShip/FormShip.cs

@@ -1,8 +1,14 @@
+using System.Drawing;
+
 namespace ContainerShip
 {
     public partial class FormShip : Form
     {
         private DrawingShip _ship;
+        /// <summary>
+        /// âûáðàííûé îáõåêò
+        /// </summary>
+        public DrawingShip SelectedShip { get; private set; }
         public FormShip()
         {
             InitializeComponent();
@@ -61,16 +67,73 @@ namespace ContainerShip
             Draw();
         }
 
+        private void SetData()
+        {
+            Random rnd = new();
+            _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height);
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_ship.Ship.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_ship.Ship.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_ship.Ship.BodyColor.Name}";
+        }
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
-                Random rnd = new();
-                _ship = new DrawingShip();
-                _ship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-                _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height);
-                toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_ship.Ship.Speed}";
-                toolStripStatusLabelWeight.Text = $"Âåñ: {_ship.Ship.Weight}";
-                toolStripStatusLabelBodyColor.Text = $"Öâåò: {_ship.Ship.BodyColor.Name}";
-                Draw();
+            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;
+            }
+            _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+            SetData();
+            Draw();
+        }
+
+        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;
+            }
+            _ship = new DrawingContainerShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
+
+        private void ButtonSelectShip_Click(object sender, EventArgs e)
+        {
+            SelectedShip = _ship;
+            DialogResult = DialogResult.OK;
+        }
+
+        private void pictureBoxShip_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void toolStripStatusLabelBodyColor_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void toolStripStatusLabelWeight_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void toolStripStatusLabelSpeed_Click(object sender, EventArgs e)
+        {
+
         }
     }
 }

ContainerShip/ContainerShip/IDrawingObject.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    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>
+        /// <returns></returns>
+        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();
+    }
+}

ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class MapWithSetShipsGeneric<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 = 135;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 70;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetShipsGeneric<T> _setShips;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetShipsGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setShips = new SetShipsGeneric<T>(width * height); 
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawShips(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setShips.Count; i++)
+            {
+                var ship = _setShips.Get(i);
+                if (ship != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// Перемещение объекта по крате
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setShips.Count - 1;
+            for (int i = 0; i < _setShips.Count; i++)
+            {
+                if (_setShips.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var ship = _setShips.Get(j);
+                        if (ship != null)
+                        {
+                            _setShips.Insert(ship, i);
+                            _setShips.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Brown, 3);
+            g.FillRectangle(Brushes.Aqua, 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, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawShips(Graphics g)
+        {
+            for (int i = 0; i < _setShips.Count; i++)
+            {
+                int countOfShipsInLine = _pictureWidth / _placeSizeWidth;
+                int countOfShipsInColumn = _pictureHeight / _placeSizeHeight;
+                _setShips.Get(i)?.SetObject((countOfShipsInLine - (i % countOfShipsInLine) - 1) * _placeSizeWidth, (countOfShipsInColumn - (i / countOfShipsInLine) - 1) * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                _setShips.Get(i)?.DrawingObject(g);
+            }
+        }
+        /// <summary>
+        /// Перегрузка операторов
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="ship"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetShipsGeneric<T, U> map, T ship)
+        {
+            return map._setShips.Insert(ship);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static T operator -(MapWithSetShipsGeneric<T, U> map, int position)
+        {
+            return map._setShips.Remove(position);
+        }
+    }
+}

ContainerShip/ContainerShip/ModifyMap.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class ModifyMap : AbstractMap
+    {
+        private readonly Brush barrierColor = new SolidBrush(Color.WhiteSmoke);
+        private readonly Brush roadColor = new SolidBrush(Color.Blue);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void GenerateMap()
+        {   
+            Random random = new Random();
+            int firstPointX;
+            int secondPointX;
+            int pointY;
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            while(counter < 15)
+            {
+                bool freePlace = true;
+                firstPointX = random.Next(0, _map.GetLength(0)-10);
+                secondPointX = random.Next(firstPointX, _map.GetLength(0)-10);
+                pointY = random.Next(0, _map.GetLength(1)-10);
+                for(int i = firstPointX; i <secondPointX; i++)
+                {
+                    if (_map[i, pointY] == _barrier)
+                    {
+                        freePlace = false;   
+                        break;
+                    }
+                    _map[i, pointY] = _barrier;
+                }
+                if (freePlace)
+                {
+                    counter++;
+                }
+               
+            }
+        }
+    }
+}

ContainerShip/ContainerShip/Program.cs

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

ContainerShip/ContainerShip/SetShipsGeneric.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class SetShipsGeneric<T>
+    where T: class
+    {
+        /// <summary>
+		/// Массив объектов, которые храним
+		/// </summary>
+		private readonly T[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetShipsGeneric(int count)
+        {
+            _places = new T[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="car">Добавляемый автомобиль</param>
+        /// <returns></returns>
+        public int Insert(T ship)
+        {
+            return Insert(ship, 0);
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="ship">Добавляемый корабль</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T ship, int position)
+        {   
+            if (position < 0 || position >= _places.Length)
+            {
+                return -1;
+            }
+            if (_places[position] == null)
+            {
+
+                _places[position] = ship;
+            }
+            else
+            {
+                int freePlace = -1;
+                for (int i = position; i < _places.Length; i++)
+                {
+                    if (_places[i] == null)
+                    {
+                        freePlace = i;
+                    }
+                }
+                if (freePlace == -1)
+                {
+                    return -1;
+                }
+                else
+                {
+                    for (int i = freePlace; i > position; i--)
+                    {
+                        T buf = _places[i];
+                        _places[i] = _places[i - 1];
+                        _places[i - 1] = buf;
+                    }
+                    _places[position] = ship;
+                }
+            }
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Remove(int position)
+        {
+            if (position < 0 || position >= _places.Length)
+            {
+                return null;
+            }
+            T ship = _places[position];
+            _places[position] = null;
+            return ship;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Get(int position)
+        {
+            if (position < 0 || position >= _places.Length)
+            {
+                return null;
+            }
+            return _places[position];
+        }
+    }
+}

ContainerShip/ContainerShip/SimpleMap.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainerShip
+{
+    internal class SimpleMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.LightBlue);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y );
+        }
+        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++;
+                }
+            }
+        }
+    }
+}