Merge pull request 'Sorokin_P.V. Lab Work 5' (#5 ) from LabWork05 into LabWork04

Reviewed-on: http://student.git.athene.tech/Pavel_Sorokin/PIbd-21_Sorokin_P.V._Liner._Base/pulls/5
Лишние пробелы убраны.
2022-11-07 10:10:55 +04:00 · 2022-11-03 14:32:17 +04:00 · 2022-11-03 14:31:20 +04:00 · 2022-11-03 14:01:55 +04:00 · 2022-11-02 10:33:43 +04:00 · 2022-11-01 11:58:16 +04:00
24 changed files with 1303 additions and 342 deletions
--- a/Liner/Liner/AbstractMap.cs
+++ b/Liner/Liner/AbstractMap.cs
@@ -17,7 +17,6 @@ namespace Liner
        protected readonly Random _random = new();
        protected readonly int _freeRoad = 0;
        protected readonly int _barrier = 1;
-
        public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject)
        {
            _width = width;
@@ -111,8 +110,6 @@ namespace Liner
                startY += _size_y;
            }
            return false;
-
-
        }
        private Bitmap DrawMapWithObject()
        {
@@ -139,7 +136,6 @@ namespace Liner
            _drawningObject.DrawningObject(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);
--- a/Liner/Liner/Direction.cs
+++ b/Liner/Liner/Direction.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;

 namespace Liner
 {
-    internal enum Direction
+    public enum Direction
    {
        None=0,
        Up = 1,
--- a/Liner/Liner/DrawingObjectShip.cs
+++ b/Liner/Liner/DrawingObjectShip.cs
@@ -9,7 +9,6 @@ namespace Liner
    internal class DrawingObjectShip : IDrawingObject
    {
        private DrawingShip _ship = null;
-
        public DrawingObjectShip(DrawingShip ship)
        {
            _ship = ship;
@@ -23,17 +22,13 @@ namespace Liner
        {
            _ship?.MoveTransport(direction);
        }
-
        public void SetObject(int x, int y, int width, int height)
        {
            _ship.SetPosition(x, y, width, height);
        }
-
-
        void IDrawingObject.DrawningObject(Graphics g)
        {
            _ship.DrawTransport(g);
        }
-
    }
 }
--- a/Liner/Liner/DrawingShip.cs
+++ b/Liner/Liner/DrawingShip.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;

 namespace Liner
 {
-    internal class DrawingShip
+    public class DrawingShip
    {
        public EntityShip Ship { get; protected set; }
        protected float _startPosX;
@@ -38,7 +38,6 @@ namespace Liner
            _pictureWidth = width;
            _pictureHeight = height;
        }
-
        public void MoveTransport(Direction direction)
        {
            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
@@ -72,10 +71,8 @@ namespace Liner
                        _startPosY += Ship.Step;
                    }
                    break;
-
            }
        }
-
        public virtual void DrawTransport(Graphics g)
        {
            if (_startPosX < 0 || _startPosY < 0 || !_pictureWidth.HasValue || !_pictureHeight.HasValue)
@@ -100,7 +97,6 @@ namespace Liner
            g.DrawLine(pen, _startPosX, _startPosY + 20, _startPosX + 20, _startPosY + 40);
            g.DrawLine(pen, _startPosX + 20, _startPosY + 40, _startPosX + 100, _startPosY + 40);
        }
-
        public void ChangeBorders(int width, int height)
        {
            _pictureWidth = width;
--- a/Liner/Liner/EntityLiner.cs
+++ b/Liner/Liner/EntityLiner.cs
@@ -8,7 +8,7 @@ namespace Liner
 {
    internal class EntityLiner : EntityShip
    {
-        public Color DopColor { get; private set; }
+        public Color DopColor { get; set; }

        public bool DopDeck { get; private set; }

--- a/Liner/Liner/EntityShip.cs
+++ b/Liner/Liner/EntityShip.cs
@@ -6,13 +6,13 @@ using System.Threading.Tasks;

 namespace Liner
 {
-    internal class EntityShip
+    public class EntityShip
    {
        public int Speed { get; private set; }

        public float Weight { get; private set; }

-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get;  set; }

        public float Step => Speed * 100 / Weight;

--- a/Liner/Liner/FormMap.Designer.cs
+++ b/Liner/Liner/FormMap.Designer.cs
@@ -1,212 +0,0 @@
-namespace Liner
-{
-    partial class FormMap
-    {
-        /// <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.pictureBoxShip = new System.Windows.Forms.PictureBox();
-            this.statusStrip = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.buttonCreate = 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.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
-            this.statusStrip.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // 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, 424);
-            this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxShip.TabIndex = 0;
-            this.pictureBoxShip.TabStop = false;
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 424);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 26);
-            this.statusStrip.TabIndex = 1;
-            this.statusStrip.Text = "statusStrip1";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет:";
-            // 
-            // buttonCreate
-            // 
-            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(12, 392);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::Liner.Properties.Resources._1;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(686, 391);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 3;
-            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::Liner.Properties.Resources._4;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(722, 355);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 4;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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::Liner.Properties.Resources._2;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(722, 391);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 5;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::Liner.Properties.Resources._3;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(758, 391);
-            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);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModif.Location = new System.Drawing.Point(112, 391);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(121, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Море и айсберги",
-            "Болото"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged_1);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreateModif);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxShip);
-            this.Controls.Add(this.statusStrip);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit();
-            this.statusStrip.ResumeLayout(false);
-            this.statusStrip.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxShip;
-        private StatusStrip statusStrip;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonCreateModif;
-        private ComboBox comboBoxSelectorMap;
-
-    }
-}
--- a/Liner/Liner/FormMap.cs
+++ b/Liner/Liner/FormMap.cs
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Liner
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        private void SetData(DrawingShip ship)
-        {
-            Random rnd = new();
-            toolStripStatusLabelSpeed.Text = $"Скорость: {ship.Ship.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {ship.Ship.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {ship.Ship.BodyColor.Name}";
-            pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship));
-            new DrawingObjectShip(ship);
-        }
-
-
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(ship);
-
-        }
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            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;
-            }
-            pictureBoxShip.Image = _abstractMap?.MoveObject(dir);
-        }
-
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var ship = new DrawningLiner(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(ship);
-
-        }
-
-
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged_1(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Море и айсберги":
-                    _abstractMap = new SeaMap();
-                    break;
-                case "Болото":
-                    _abstractMap = new SwampMap();
-                    break;
-
-            }
-        }
-
-
-    }
-}
--- a/Liner/Liner/FormMapWithSetShips.Designer.cs
+++ b/Liner/Liner/FormMapWithSetShips.Designer.cs
@@ -0,0 +1,280 @@
+namespace Liner
+{
+    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.groupBox = new System.Windows.Forms.GroupBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.ButtonDeleteMap = new System.Windows.Forms.Button();
+            this.ListBoxMaps = new System.Windows.Forms.ListBox();
+            this.ButtonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.ComboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.ButtonShowOnMap = 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.ButtonAddShip = new System.Windows.Forms.Button();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBox.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox
+            // 
+            this.groupBox.Controls.Add(this.groupBox1);
+            this.groupBox.Controls.Add(this.buttonRight);
+            this.groupBox.Controls.Add(this.buttonDown);
+            this.groupBox.Controls.Add(this.buttonUp);
+            this.groupBox.Controls.Add(this.buttonLeft);
+            this.groupBox.Controls.Add(this.ButtonShowOnMap);
+            this.groupBox.Controls.Add(this.ButtonShowStorage);
+            this.groupBox.Controls.Add(this.ButtonRemoveShip);
+            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox.Controls.Add(this.ButtonAddShip);
+            this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox.Location = new System.Drawing.Point(696, 0);
+            this.groupBox.Name = "groupBox";
+            this.groupBox.Size = new System.Drawing.Size(279, 668);
+            this.groupBox.TabIndex = 0;
+            this.groupBox.TabStop = false;
+            this.groupBox.Text = "Инструменты";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.ButtonDeleteMap);
+            this.groupBox1.Controls.Add(this.ListBoxMaps);
+            this.groupBox1.Controls.Add(this.ButtonAddMap);
+            this.groupBox1.Controls.Add(this.textBoxNewMapName);
+            this.groupBox1.Controls.Add(this.ComboBoxSelectorMap);
+            this.groupBox1.Location = new System.Drawing.Point(6, 26);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(250, 300);
+            this.groupBox1.TabIndex = 18;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Карты";
+            // 
+            // ButtonDeleteMap
+            // 
+            this.ButtonDeleteMap.Location = new System.Drawing.Point(10, 255);
+            this.ButtonDeleteMap.Name = "ButtonDeleteMap";
+            this.ButtonDeleteMap.Size = new System.Drawing.Size(222, 29);
+            this.ButtonDeleteMap.TabIndex = 13;
+            this.ButtonDeleteMap.Text = "Удалить карту";
+            this.ButtonDeleteMap.UseVisualStyleBackColor = true;
+            this.ButtonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // ListBoxMaps
+            // 
+            this.ListBoxMaps.FormattingEnabled = true;
+            this.ListBoxMaps.ItemHeight = 20;
+            this.ListBoxMaps.Location = new System.Drawing.Point(10, 136);
+            this.ListBoxMaps.Name = "ListBoxMaps";
+            this.ListBoxMaps.Size = new System.Drawing.Size(222, 104);
+            this.ListBoxMaps.TabIndex = 12;
+            this.ListBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // ButtonAddMap
+            // 
+            this.ButtonAddMap.Location = new System.Drawing.Point(10, 101);
+            this.ButtonAddMap.Name = "ButtonAddMap";
+            this.ButtonAddMap.Size = new System.Drawing.Size(222, 29);
+            this.ButtonAddMap.TabIndex = 11;
+            this.ButtonAddMap.Text = "Добавить карту";
+            this.ButtonAddMap.UseVisualStyleBackColor = true;
+            this.ButtonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(10, 34);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(222, 27);
+            this.textBoxNewMapName.TabIndex = 10;
+            // 
+            // ComboBoxSelectorMap
+            // 
+            this.ComboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.ComboBoxSelectorMap.FormattingEnabled = true;
+            this.ComboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Море и айсберги",
+            "Болото"});
+            this.ComboBoxSelectorMap.Location = new System.Drawing.Point(10, 67);
+            this.ComboBoxSelectorMap.Name = "ComboBoxSelectorMap";
+            this.ComboBoxSelectorMap.Size = new System.Drawing.Size(222, 28);
+            this.ComboBoxSelectorMap.TabIndex = 9;
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::Liner.Properties.Resources._3;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(233, 626);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 17;
+            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::Liner.Properties.Resources._2;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(197, 626);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 16;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::Liner.Properties.Resources._4;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(197, 590);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 15;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.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::Liner.Properties.Resources._1;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(161, 626);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 14;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // ButtonShowOnMap
+            // 
+            this.ButtonShowOnMap.Location = new System.Drawing.Point(16, 558);
+            this.ButtonShowOnMap.Name = "ButtonShowOnMap";
+            this.ButtonShowOnMap.Size = new System.Drawing.Size(222, 29);
+            this.ButtonShowOnMap.TabIndex = 13;
+            this.ButtonShowOnMap.Text = "Посмотреть карту";
+            this.ButtonShowOnMap.UseVisualStyleBackColor = true;
+            this.ButtonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // ButtonShowStorage
+            // 
+            this.ButtonShowStorage.Location = new System.Drawing.Point(16, 505);
+            this.ButtonShowStorage.Name = "ButtonShowStorage";
+            this.ButtonShowStorage.Size = new System.Drawing.Size(222, 29);
+            this.ButtonShowStorage.TabIndex = 12;
+            this.ButtonShowStorage.Text = "Посмотреть хранилище";
+            this.ButtonShowStorage.UseVisualStyleBackColor = true;
+            this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // ButtonRemoveShip
+            // 
+            this.ButtonRemoveShip.Location = new System.Drawing.Point(16, 452);
+            this.ButtonRemoveShip.Name = "ButtonRemoveShip";
+            this.ButtonRemoveShip.Size = new System.Drawing.Size(222, 29);
+            this.ButtonRemoveShip.TabIndex = 11;
+            this.ButtonRemoveShip.Text = "Удалить корабль";
+            this.ButtonRemoveShip.UseVisualStyleBackColor = true;
+            this.ButtonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(16, 419);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(222, 27);
+            this.maskedTextBoxPosition.TabIndex = 10;
+            // 
+            // ButtonAddShip
+            // 
+            this.ButtonAddShip.Location = new System.Drawing.Point(16, 368);
+            this.ButtonAddShip.Name = "ButtonAddShip";
+            this.ButtonAddShip.Size = new System.Drawing.Size(222, 29);
+            this.ButtonAddShip.TabIndex = 2;
+            this.ButtonAddShip.Text = "Добавить корабль";
+            this.ButtonAddShip.UseVisualStyleBackColor = true;
+            this.ButtonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
+            // 
+            // 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(696, 668);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetShips
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(975, 668);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox);
+            this.Name = "FormMapWithSetShips";
+            this.Text = "FormMapWithSetShips";
+            this.groupBox.ResumeLayout(false);
+            this.groupBox.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox;
+        private PictureBox pictureBox;
+        private ComboBox ComboBoxSelectorMap;
+        private Button ButtonShowOnMap;
+        private Button ButtonShowStorage;
+        private Button ButtonRemoveShip;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button ButtonAddShip;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonLeft;
+        private GroupBox groupBox1;
+        private Button ButtonDeleteMap;
+        private ListBox ListBoxMaps;
+        private Button ButtonAddMap;
+        private TextBox textBoxNewMapName;
+    }
+}
--- a/Liner/Liner/FormMapWithSetShips.cs
+++ b/Liner/Liner/FormMapWithSetShips.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.DataFormats;
+
+namespace Liner
+{
+    public partial class FormMapWithSetShips : Form
+    {
+        private readonly Dictionary<string, AbstractMap> _mapDict = new()
+        {
+            {"Простая карта", new SimpleMap() },
+            {"Море и айсберги", new SeaMap() },
+            {"Болото",new SwampMap() }
+        };
+        private readonly MapsCollection _mapsCollection;
+        public FormMapWithSetShips()
+        {
+            InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            ComboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapDict)
+            {
+                ComboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        private void ReloadMaps()
+        {
+            int index = ListBoxMaps.SelectedIndex;
+
+            ListBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                ListBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+            }
+
+            if (ListBoxMaps.Items.Count > 0 && (index == -1 || index >= ListBoxMaps.Items.Count))
+            {
+                ListBoxMaps.SelectedIndex = 0;
+            }
+            else if (ListBoxMaps.Items.Count > 0 && index > -1 && index < ListBoxMaps.Items.Count)
+            {
+                ListBoxMaps.SelectedIndex = index;
+            }
+        }
+        private void ButtonAddShip_Click(object sender, EventArgs e)
+        {
+            var formShipConfig = new FormShipConfig();
+            formShipConfig.AddEvent(AddShip);
+            formShipConfig.Show();
+        }
+        private void AddShip(DrawingShip ship)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectShip(ship) != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
+            }
+
+        }
+        private void ButtonRemoveShip_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                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 = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (ComboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapDict.ContainsKey(ComboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapDict[ComboBoxSelectorMap.Text]);
+            ReloadMaps();
+        }
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {ListBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+        }
+    }
+}
--- a/Liner/Liner/FormMapWithSetShips.resx
+++ b/Liner/Liner/FormMapWithSetShips.resx
@@ -57,7 +57,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
--- a/Liner/Liner/FormShip.Designer.cs
+++ b/Liner/Liner/FormShip.Designer.cs
@@ -39,6 +39,7 @@
            this.buttonRight = new System.Windows.Forms.Button();
            this.buttonLeft = new System.Windows.Forms.Button();
            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.ButtonSelectShip = new System.Windows.Forms.Button();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
            this.statusStrip.SuspendLayout();
            this.SuspendLayout();
@@ -155,11 +156,23 @@
            this.buttonCreateModif.UseVisualStyleBackColor = true;
            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.Location = new System.Drawing.Point(552, 373);
+            this.ButtonSelectShip.Name = "ButtonSelectShip";
+            this.ButtonSelectShip.Size = new System.Drawing.Size(94, 29);
+            this.ButtonSelectShip.TabIndex = 8;
+            this.ButtonSelectShip.Text = "Выбрать";
+            this.ButtonSelectShip.UseVisualStyleBackColor = true;
+            this.ButtonSelectShip.Click += new System.EventHandler(this.ButtonSelectShip_Click);
+            // 
            // FormShip
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ButtonSelectShip);
            this.Controls.Add(this.buttonCreateModif);
            this.Controls.Add(this.buttonLeft);
            this.Controls.Add(this.buttonRight);
@@ -191,5 +204,6 @@
        private Button buttonRight;
        private Button buttonLeft;
        private Button buttonCreateModif;
+        private Button ButtonSelectShip;
    }
 }
--- a/Liner/Liner/FormShip.cs
+++ b/Liner/Liner/FormShip.cs
@@ -5,12 +5,11 @@ namespace Liner
    {
        
        private DrawingShip _ship;
-        
+        public DrawingShip SelectedShip { get; private set; }
        public FormShip()
        {
            InitializeComponent();
        }
-        
        private void Draw() 
        {
            Bitmap bmp = new Bitmap(pictureBoxShip.Width, pictureBoxShip.Height);
@@ -19,7 +18,6 @@ namespace Liner
            pictureBoxShip.Image = bmp;

        }
-
        private void SetData() 
        {
            Random rnd = new();
@@ -30,8 +28,13 @@ namespace Liner
        }
        private void ButtonCreate_Click(object sender, EventArgs e)
        {
-            Random rnd = new();
-            _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            Random random = new();
+            Color myColor = new Color();
+            ColorDialog MyDialog = new ColorDialog();
+            if (MyDialog.ShowDialog() == DialogResult.OK)
+                myColor = MyDialog.Color;
+            _ship = new DrawingShip(random.Next(30, 50), random.Next(1000, 2000),
+                myColor);
            SetData();
            Draw();
        }
@@ -56,19 +59,32 @@ namespace Liner
            }
            Draw();
        }
-
        private void PictureBoxShip_Resize(object sender, EventArgs e)
        {
            _ship?.ChangeBorders(pictureBoxShip.Width, pictureBoxShip.Height);
            Draw();
        }
-
        private void ButtonCreateModif_Click(object sender, EventArgs e)
        {
-            Random rnd = new();
-            _ship = new DrawningLiner(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            Random random = new();
+            Color firstColor = new Color();
+            Color secondColor = new Color();
+            ColorDialog MyDialog = new ColorDialog();
+            if (MyDialog.ShowDialog() == DialogResult.OK)
+                firstColor = MyDialog.Color;
+            MyDialog = new ColorDialog();
+            if (MyDialog.ShowDialog() == DialogResult.OK)
+                secondColor = MyDialog.Color;
+            _ship = new DrawningLiner(random.Next(30, 50), random.Next(1000, 2000),
+                firstColor, secondColor, Convert.ToBoolean(random.Next(0, 2)),
+                Convert.ToBoolean(random.Next(0, 2)));
            SetData();
            Draw();
        }
+        private void ButtonSelectShip_Click(object sender, EventArgs e)
+        {
+            SelectedShip = _ship;
+            DialogResult = DialogResult.OK;
+        }
    }
 }
--- a/Liner/Liner/FormShipConfig.Designer.cs
+++ b/Liner/Liner/FormShipConfig.Designer.cs
@@ -0,0 +1,381 @@
+namespace Liner
+{
+    partial class FormShipConfig
+    {
+        /// <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.groupBoxConfig = new System.Windows.Forms.GroupBox();
+            this.labelModifObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelCyan = new System.Windows.Forms.Panel();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxDopDeck = new System.Windows.Forms.CheckBox();
+            this.checkBoxPool = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.labelWeight = new System.Windows.Forms.Label();
+            this.labelSpeed = new System.Windows.Forms.Label();
+            this.panelObject = new System.Windows.Forms.Panel();
+            this.LabelDopColor = new System.Windows.Forms.Label();
+            this.LabelBaseColor = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBoxConfig.SuspendLayout();
+            this.groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            this.panelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelModifObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Controls.Add(this.checkBoxDopDeck);
+            this.groupBoxConfig.Controls.Add(this.checkBoxPool);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+            this.groupBoxConfig.Controls.Add(this.labelWeight);
+            this.groupBoxConfig.Controls.Add(this.labelSpeed);
+            this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Size = new System.Drawing.Size(492, 243);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifObject
+            // 
+            this.labelModifObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifObject.Location = new System.Drawing.Point(366, 159);
+            this.labelModifObject.Name = "labelModifObject";
+            this.labelModifObject.Size = new System.Drawing.Size(115, 46);
+            this.labelModifObject.TabIndex = 8;
+            this.labelModifObject.Text = "Продвинутый";
+            this.labelModifObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelModifObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(258, 159);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(102, 46);
+            this.labelSimpleObject.TabIndex = 7;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // groupBoxColors
+            // 
+            this.groupBoxColors.Controls.Add(this.panelBlack);
+            this.groupBoxColors.Controls.Add(this.panelPurple);
+            this.groupBoxColors.Controls.Add(this.panelCyan);
+            this.groupBoxColors.Controls.Add(this.panelWhite);
+            this.groupBoxColors.Controls.Add(this.panelBlue);
+            this.groupBoxColors.Controls.Add(this.panelGreen);
+            this.groupBoxColors.Controls.Add(this.panelYellow);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Location = new System.Drawing.Point(258, 23);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(223, 134);
+            this.groupBoxColors.TabIndex = 6;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(172, 75);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(45, 45);
+            this.panelBlack.TabIndex = 1;
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(121, 77);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(45, 45);
+            this.panelPurple.TabIndex = 1;
+            // 
+            // panelCyan
+            // 
+            this.panelCyan.BackColor = System.Drawing.Color.Cyan;
+            this.panelCyan.Location = new System.Drawing.Point(57, 77);
+            this.panelCyan.Name = "panelCyan";
+            this.panelCyan.Size = new System.Drawing.Size(45, 45);
+            this.panelCyan.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(6, 76);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(45, 45);
+            this.panelWhite.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(172, 25);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(45, 45);
+            this.panelBlue.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(121, 25);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(45, 45);
+            this.panelGreen.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(57, 26);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(45, 45);
+            this.panelYellow.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(6, 25);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(45, 45);
+            this.panelRed.TabIndex = 0;
+            // 
+            // checkBoxDopDeck
+            // 
+            this.checkBoxDopDeck.AutoSize = true;
+            this.checkBoxDopDeck.Location = new System.Drawing.Point(6, 159);
+            this.checkBoxDopDeck.Name = "checkBoxDopDeck";
+            this.checkBoxDopDeck.Size = new System.Drawing.Size(243, 24);
+            this.checkBoxDopDeck.TabIndex = 5;
+            this.checkBoxDopDeck.Text = "Признак наличия доп. палубы";
+            this.checkBoxDopDeck.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxPool
+            // 
+            this.checkBoxPool.AutoSize = true;
+            this.checkBoxPool.Location = new System.Drawing.Point(6, 119);
+            this.checkBoxPool.Name = "checkBoxPool";
+            this.checkBoxPool.Size = new System.Drawing.Size(223, 24);
+            this.checkBoxPool.TabIndex = 4;
+            this.checkBoxPool.Text = "Признак наличия бассейна";
+            this.checkBoxPool.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(88, 66);
+            this.numericUpDownWeight.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(150, 27);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(88, 33);
+            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(150, 27);
+            this.numericUpDownSpeed.TabIndex = 2;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(6, 73);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(36, 20);
+            this.labelWeight.TabIndex = 1;
+            this.labelWeight.Text = "Вес:";
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(0, 40);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(76, 20);
+            this.labelSpeed.TabIndex = 0;
+            this.labelSpeed.Text = "Скорость:";
+            // 
+            // panelObject
+            // 
+            this.panelObject.AllowDrop = true;
+            this.panelObject.Controls.Add(this.LabelDopColor);
+            this.panelObject.Controls.Add(this.LabelBaseColor);
+            this.panelObject.Controls.Add(this.pictureBoxObject);
+            this.panelObject.Location = new System.Drawing.Point(510, 21);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(250, 204);
+            this.panelObject.TabIndex = 1;
+            this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
+            this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
+            // 
+            // LabelDopColor
+            // 
+            this.LabelDopColor.AllowDrop = true;
+            this.LabelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelDopColor.Location = new System.Drawing.Point(130, 8);
+            this.LabelDopColor.Name = "LabelDopColor";
+            this.LabelDopColor.Size = new System.Drawing.Size(117, 46);
+            this.LabelDopColor.TabIndex = 8;
+            this.LabelDopColor.Text = "Доп. цвет";
+            this.LabelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+            this.LabelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
+            // 
+            // LabelBaseColor
+            // 
+            this.LabelBaseColor.AllowDrop = true;
+            this.LabelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelBaseColor.Location = new System.Drawing.Point(3, 8);
+            this.LabelBaseColor.Name = "LabelBaseColor";
+            this.LabelBaseColor.Size = new System.Drawing.Size(117, 46);
+            this.LabelBaseColor.TabIndex = 8;
+            this.LabelBaseColor.Text = "Цвет";
+            this.LabelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+            this.LabelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(3, 57);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(244, 144);
+            this.pictureBoxObject.TabIndex = 0;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(513, 231);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(94, 29);
+            this.buttonAdd.TabIndex = 2;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(663, 231);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
+            this.buttonCancel.TabIndex = 3;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormShipConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(770, 267);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonAdd);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormShipConfig";
+            this.Text = "Создание объекта";
+            this.groupBoxConfig.ResumeLayout(false);
+            this.groupBoxConfig.PerformLayout();
+            this.groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            this.panelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelModifObject;
+        private Label labelSimpleObject;
+        private GroupBox groupBoxColors;
+        private Panel panelBlack;
+        private Panel panelPurple;
+        private Panel panelCyan;
+        private Panel panelWhite;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelYellow;
+        private Panel panelRed;
+        private CheckBox checkBoxDopDeck;
+        private CheckBox checkBoxPool;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelWeight;
+        private Label labelSpeed;
+        private Panel panelObject;
+        private Label LabelDopColor;
+        private Label LabelBaseColor;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+    }
+}
--- a/Liner/Liner/FormShipConfig.cs
+++ b/Liner/Liner/FormShipConfig.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Liner
+{
+    public partial class FormShipConfig : Form
+    {
+        DrawingShip _ship=null;
+        private event Action<DrawingShip> EventAddShip;
+        public FormShipConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.MouseDown += PanelColor_MouseDown;
+            panelCyan.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
+            buttonCancel.Click += (s, a) => Close();
+        }
+        public void DrawShip()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _ship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+            _ship?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        public void AddEvent(Action<DrawingShip> ev)
+        {
+            if (EventAddShip == null)
+            {
+                EventAddShip = new Action<DrawingShip>(ev);
+            }
+            else
+            {
+                EventAddShip += ev;
+            }
+        }
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e) 
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _ship = new DrawingShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifObject":
+                    _ship = new DrawningLiner((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                        checkBoxDopDeck.Checked, checkBoxPool.Checked);
+                    break;
+            }
+            DrawShip();
+        }
+        private void LabelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_ship == null) 
+            {
+                return;
+            }
+            _ship.Ship.BodyColor=(Color)e.Data.GetData(typeof(Color));
+            DrawShip();
+        }   
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_ship == null || _ship.Ship is not EntityLiner liner)
+            {
+                return;
+            }
+            liner.DopColor=(Color)e.Data.GetData(typeof(Color));
+            DrawShip();
+        }
+        private void ButtonAdd_Click(object sender, EventArgs e)
+        {
+            EventAddShip?.Invoke(_ship);
+            Close();
+        }
+    }
+}
--- a/Liner/Liner/FormShipConfig.resx
+++ b/Liner/Liner/FormShipConfig.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>
--- a/Liner/Liner/IDrawingObject.cs
+++ b/Liner/Liner/IDrawingObject.cs
@@ -13,8 +13,6 @@ namespace Liner
        void MoveObject(Direction direction);
        void DrawningObject(Graphics g);

-
-
        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
    }
 }
--- a/Liner/Liner/MapWithSetShipsGeneric.cs
+++ b/Liner/Liner/MapWithSetShipsGeneric.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Liner
+{
+    internal class MapWithSetShipsGeneric<T, U>
+        where T : class, IDrawingObject
+        where U : AbstractMap
+    {
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        private readonly int _placeSizeWidth = 170;
+        private readonly int _placeSizeHeight = 90;
+        private readonly SetShipsGeneric<T> _setShips;
+        private readonly U _map;
+        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;
+        }
+        public static int operator +(MapWithSetShipsGeneric<T, U> map, T ship)
+        {
+            return map._setShips.Insert(ship);
+        }
+        public static T operator -(MapWithSetShipsGeneric<T, U> map, int position)
+        {
+            return map._setShips.Remove(position);
+        }
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawShips(gr);
+            return bmp;
+        }
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var ship in _setShips.GetShips())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        private void Shaking()
+        {
+            int j = _setShips.Count - 1;
+            for (int i = 0; i < _setShips.Count; i++)
+            {
+                if (_setShips[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var ship = _setShips[j];
+                        if (ship != null)
+                        {
+                            _setShips.Insert(ship, i);
+                            _setShips.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Sienna, 3);
+            Brush brush = new SolidBrush(Color.DodgerBlue);
+            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, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth - 4, 0, i * _placeSizeWidth - 4, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        private void DrawShips(Graphics g)
+        {
+            int widthEl = _pictureWidth / _placeSizeWidth;
+            int heightEl = _pictureHeight / _placeSizeHeight;
+            int curWidth = 1;
+            int curHeight = 0;
+            foreach (var ship in _setShips.GetShips())
+            {
+                ship?.SetObject(_pictureWidth - _placeSizeWidth * curWidth - 10,
+                    curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
+                ship?.DrawningObject(g);
+
+                if (curWidth < widthEl)
+                    curWidth++;
+                else
+                {
+                    curWidth = 1;
+                    curHeight++;
+                }
+                if (curHeight > heightEl)
+                {
+                    return;
+                }
+
+            }
+        }
+    }
+}
--- a/Liner/Liner/MapsCollection.cs
+++ b/Liner/Liner/MapsCollection.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Liner
+{
+    internal class MapsCollection
+    {
+        readonly Dictionary<string, MapWithSetShipsGeneric<DrawingObjectShip, AbstractMap>> _mapStorages;
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetShipsGeneric<DrawingObjectShip, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        public void AddMap(string name, AbstractMap map)
+        {
+            if (!_mapStorages.ContainsKey(name))
+            {
+                _mapStorages.Add(name, new MapWithSetShipsGeneric<DrawingObjectShip, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            }
+        }
+        public void DelMap(string name)
+        {
+            if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
+        }
+        public MapWithSetShipsGeneric<DrawingObjectShip, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (_mapStorages.ContainsKey(ind))
+                {
+                    return _mapStorages[ind];
+                }
+                return null;
+            }
+        }
+    }
+}
--- a/Liner/Liner/Program.cs
+++ b/Liner/Liner/Program.cs
@@ -11,7 +11,7 @@ namespace Liner
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            Application.Run(new FormMap());
+            Application.Run(new FormMapWithSetShips());
        }
    }
 }
--- a/Liner/Liner/SeaMap.cs
+++ b/Liner/Liner/SeaMap.cs
@@ -9,9 +9,7 @@ namespace Liner
    internal class SeaMap : AbstractMap
    {
        private readonly Brush barrierColor = new SolidBrush(Color.White);
-
        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, i * (_size_x + 1), j * (_size_y + 1));
--- a/Liner/Liner/SetShipsGeneric.cs
+++ b/Liner/Liner/SetShipsGeneric.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Liner
+{
+    internal class SetShipsGeneric<T>
+        where T : class
+    {
+        private readonly List<T> _places;
+        public int Count => _places.Count;
+        private readonly int _maxCount;
+        public SetShipsGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+        public int Insert(T ship)
+        {
+            return Insert(ship, 0);
+        }
+        public int Insert(T ship, int position)
+        {
+            if (position < 0 || position > Count || _maxCount == Count) return -1;
+            _places.Insert(position, ship);
+            return position;
+        }
+        public T Remove(int position)
+        {
+            if (position >= Count || position < 0)
+            {
+                return null;
+            }
+            T ship = _places[position];
+            _places.RemoveAt(position);
+            return ship;
+        }
+        public T this[int position]
+        {
+            get
+            {
+                if (position >= Count || position < 0)
+                {
+                    return null;
+                }
+                return _places[position];
+            }
+            set
+            {
+                if (position >= Count || position < 0)
+                {
+                    return;
+                }
+                Insert(value, position);
+
+            }
+        }
+        public IEnumerable<T> GetShips()
+        {
+            foreach (var ship in _places)
+            {
+                if (ship != null)
+                {
+                    yield return ship;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}
--- a/Liner/Liner/SimpleMap.cs
+++ b/Liner/Liner/SimpleMap.cs
@@ -9,9 +9,7 @@ namespace Liner
    internal class SimpleMap : AbstractMap
    {
        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-
        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));
--- a/Liner/Liner/SwampMap.cs
+++ b/Liner/Liner/SwampMap.cs
@@ -9,9 +9,7 @@ namespace Liner
    internal class SwampMap : AbstractMap
    {
        private readonly Brush barrierColor = new SolidBrush(Color.DarkGreen);
-
        private readonly Brush roadColor = new SolidBrush(Color.AliceBlue);
-
        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));
Author	SHA1	Message	Date
Евгений Эгов	431c247238	Merge pull request 'Sorokin_P.V. Lab Work 5' (#5 ) from LabWork05 into LabWork04 Reviewed-on: http://student.git.athene.tech/Pavel_Sorokin/PIbd-21_Sorokin_P.V._Liner._Base/pulls/5	2022-11-07 10:10:55 +04:00
Pavel_Sorokin	f4343ce125	Лишние пробелы убраны.	2022-11-03 14:32:17 +04:00
Pavel_Sorokin	cc7aadb10d	Еще немного изменений.	2022-11-03 14:31:20 +04:00
Pavel_Sorokin	7132f8f322	Правки(Drag drop)	2022-11-03 14:01:55 +04:00
Pavel_Sorokin	a576085d7a	Небольшие изменения.	2022-11-02 10:33:43 +04:00
Pavel_Sorokin	6999084ee6	Event work	2022-11-01 11:58:16 +04:00
Pavel_Sorokin	9120b18814	Add config form	2022-11-01 11:36:52 +04:00
Pavel_Sorokin	2d1622a1b6	Убраны лишние строчки.	2022-10-26 15:21:35 +04:00
Pavel_Sorokin	0449822d9e	Лишние строчки кода убраны.	2022-10-19 18:03:48 +04:00
Pavel_Sorokin	dd17a5a4e9	Этап 3. Форма.	2022-10-19 17:55:30 +04:00
Pavel_Sorokin	b61cfee9fb	Этап 2. Класс MapsCollection.	2022-10-19 17:25:11 +04:00
Pavel_Sorokin	a23192133f	Этап 1. Смена массива на список.	2022-10-19 17:20:36 +04:00
Pavel_Sorokin	50d81bcc08	Исправление названий и логики. Убраны лишние строчки(пустые)	2022-10-19 16:49:18 +04:00
Pavel_Sorokin	c8a7dece5b	Переделаны названия	2022-10-19 16:11:11 +04:00
Pavel_Sorokin	976db2fa2b	Changes forms.	2022-10-10 07:58:16 +04:00
Pavel_Sorokin	889177b47c	Generic classes.	2022-10-10 07:17:57 +04:00