удаление NLog

AntiAircraftGun/AntiAircraftGun/AbstractMap.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    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 drawningObject)
+        {
+            _width = width;
+            _height = height;
+            _drawingObject = drawningObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (CheckCollision(direction))
+            {
+                _drawingObject.MoveObject(direction);
+            }
+            return DrawMapWithObject();
+        }
+        private bool CheckCollision(Direction direction)
+        {
+            (float left, float right, float top, float bottom) = _drawingObject.GetCurrentPosition();
+            float step = _drawingObject?.Step ?? 0;
+            int startX = 0, startY = 0, finishX = 0, finishY = 0;
+
+            switch (direction)
+            {
+                case Direction.Up:
+                    startX = (int)left;
+                    startY = (int)(top - step);
+                    finishX = (int)right;
+                    finishY = (int)top;
+                    break;
+                case Direction.Down:
+                    startX = (int)left;
+                    startY = (int)bottom;
+                    finishX = (int)right;
+                    finishY = (int)(bottom + step);
+                    break;
+                case Direction.Left:
+                    startX = (int)(left - step);
+                    startY = (int)top;
+                    finishX = (int)left;
+                    finishY = (int)bottom;
+                    break;
+                case Direction.Right:
+                    startX = (int)right;
+                    startY = (int)top;
+                    finishX = (int)(right + step);
+                    finishY = (int)bottom;
+                    break;
+            }
+
+            if (startX < 0 || finishX > _width || startY < 0 || finishY > _height) return false;
+
+            startX = (int)(startX / _size_x);
+            startY = (int)(startY / _size_y);
+            finishX = (int)(finishX / _size_x) + 1;
+            finishY = (int)(finishY / _size_y) + 1;
+
+            for (int i = startX; i < (finishX > _map.GetLength(0) ? _map.GetLength(0) : finishX); i++)
+                for (int j = startY; j < (finishY > _map.GetLength(1) ? _map.GetLength(1) : finishY); j++)
+                    if (_map[i, j] == _barrier) return false;
+            return true;
+        }
+        private bool CheckCollisionOnSpawn()
+        {
+            (float left, float right, float top, float bottom) = _drawingObject.GetCurrentPosition();
+            int spawnX = (int)(left / _size_x) - 1 < 0 ? 0 : (int)(left / _size_x);
+            int spawnY = (int)(top / _size_y) - 1 < 0 ? 0 : (int)(bottom / _size_y);
+
+            for (int i = spawnX; i <= (int)(right / _size_x) + 1; i++)
+                for (int j = spawnY; j <= (int)(bottom / _size_y) + 1; j++)
+                    if (_map[i, j] == _barrier)
+                    {
+                        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);
+            while (!CheckCollisionOnSpawn())
+            {
+                x += 10;
+                if (x > _width)
+                {
+                    if (y < _height)
+                    {
+                        y += 10;
+                        x = 0;
+                    }
+                    else
+                    {
+                        return false;
+                    }                        
+                }
+                _drawingObject.SetObject(x, y, _width, _height);
+            }
+            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.DrawingObjectAntiAircraftGun(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);
+    }
+}

AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj

@@ -8,6 +8,18 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

AntiAircraftGun/AntiAircraftGun/AntiAircraftGunNotFoundException.cs

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

AntiAircraftGun/AntiAircraftGun/Direction.cs

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

AntiAircraftGun/AntiAircraftGun/DrawingAntiAircraftGun.cs

@@ -9,20 +9,20 @@ namespace AntiAircraftGun
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawingAntiAircraftGun
+    public class DrawingAntiAircraftGun
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityAntiAircraftGun AntiAircraftGun { private set; get; }
+        public EntityAntiAircraftGun AntiAircraftGun { protected set; get; }
         /// <summary>
         /// Левая координата отрисовки зенитного орудия
         /// </summary>
-        private float _startPosX;
+        protected float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки зенитного орудия
         /// </summary>
-        private float _startPosY;
+        protected float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -45,10 +45,23 @@ namespace AntiAircraftGun
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес зенитного орудия</param>
         /// <param name="bodyColor">Цвет корпуса</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public DrawingAntiAircraftGun(int speed, float weight, Color bodyColor)
         {
-            AntiAircraftGun = new EntityAntiAircraftGun();
+            AntiAircraftGun = new EntityAntiAircraftGun(speed, weight, bodyColor);
-            AntiAircraftGun.Init(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес зенитного орудия</param>
+        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="_antiAircraftGunWidth">Ширина отрисовки зенитного орудия</param>
+        /// <param name="_antiAircraftGunHeight">Высота отрисовки зенитного орудия</param>
+        protected DrawingAntiAircraftGun(int speed, float weight, Color bodyColor, int antiAircrafGunWidth, int antiAircrafGunHeight) :
+        this(speed, weight, bodyColor)
+        {
+            _antiAircrafGunWidth = antiAircrafGunWidth;
+            _antiAircrafGunHeight = antiAircrafGunHeight;
         }
         /// <summary>
         /// Установка позиции зенитного орудия
@@ -113,7 +126,7 @@ namespace AntiAircraftGun
         /// Отрисовка зенитного орудия
         /// </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)
@@ -172,5 +185,12 @@ namespace AntiAircraftGun
                 _startPosY = _pictureHeight.Value - _antiAircrafGunHeight;
             }
         }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosX + _antiAircrafGunWidth, _startPosY, _startPosY + _antiAircrafGunHeight);
+        }
     }
 }

AntiAircraftGun/AntiAircraftGun/DrawingObjectAntiAircraftGun.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    internal class DrawingObjectAntiAircraftGun : IDrawingObject
+    {
+        private DrawingAntiAircraftGun _antiAircraftGun = null;
+        public DrawingObjectAntiAircraftGun(DrawingAntiAircraftGun antiAircraftGun)
+        {
+            _antiAircraftGun = antiAircraftGun;
+        }
+        public float Step => _antiAircraftGun?.AntiAircraftGun?.Step ?? 0;
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return _antiAircraftGun?.GetCurrentPosition() ?? default;
+        }
+
+        public void MoveObject(Direction direction)
+        {
+            _antiAircraftGun?.MoveTransport(direction);
+        }
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _antiAircraftGun.SetPosition(x, y, width, height);
+        }
+
+        void IDrawingObject.DrawingObjectAntiAircraftGun(Graphics g)
+        {
+            _antiAircraftGun?.DrawTransport(g);
+        }
+
+        public string GetInfo() => _antiAircraftGun?.GetDataForSave();
+        public static IDrawingObject Create(string data) => new DrawingObjectAntiAircraftGun(data.CreateDrawingAntiAircraftGun());
+    }
+}

AntiAircraftGun/AntiAircraftGun/DrawingUpdateAntiAircraftGun.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    internal class DrawingUpdateAntiAircraftGun : DrawingAntiAircraftGun
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес зенитного орудия</param>
+        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="gun">Признак наличия башни с орудием</param>
+        /// <param name="radar">Признак наличия радара</param>
+        public DrawingUpdateAntiAircraftGun(int speed, float weight, Color bodyColor, Color dopColor, bool gun, bool radar) :
+        base(speed, weight, bodyColor, 110, 75)
+        {
+            AntiAircraftGun = new EntityUpdateAntiAircraftGun(speed, weight, bodyColor, dopColor, gun, radar);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (AntiAircraftGun is not EntityUpdateAntiAircraftGun updateAntiAircraftGun)
+            {
+                return;
+            }
+            Pen dopPen = new(updateAntiAircraftGun.DopColor, 4);
+            Brush dopBrush = new SolidBrush(updateAntiAircraftGun.DopColor);
+            _startPosY += 35;
+            base.DrawTransport(g);
+            _startPosY -= 35;
+            if (updateAntiAircraftGun.Gun)
+            {
+                g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 20, 25, 15);
+                g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 25, 50, 5);
+                g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 30, 20, 5);
+            }
+            if (updateAntiAircraftGun.Radar)
+            {
+                g.DrawLine(dopPen, _startPosX + 27, _startPosY + 35, _startPosX + 27, _startPosY + 20);
+                g.FillPie(dopBrush, _startPosX + 3, _startPosY, 30, 30, -45, 180);
+                g.DrawLine(dopPen, _startPosX + 20, _startPosY + 15, _startPosX + 15, _startPosY + 10);
+                g.FillEllipse(dopBrush, _startPosX + 10, _startPosY + 5, 10, 10);
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AntiAircraftGun
 {
-    internal class EntityAntiAircraftGun
+    public class EntityAntiAircraftGun
     {
         /// <summary>
         /// Скорость
@@ -19,7 +19,7 @@ namespace AntiAircraftGun
         /// <summary>
         /// Цвет зенитнго орудия
         /// </summary>
-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get; set; }
         /// <summary>
         /// Шаг перемещения зенитного орудия
         /// </summary>
@@ -31,7 +31,7 @@ namespace AntiAircraftGun
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityAntiAircraftGun(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

AntiAircraftGun/AntiAircraftGun/EntityUpdateAntiAircraftGun.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    internal class EntityUpdateAntiAircraftGun : EntityAntiAircraftGun
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; set; }
+        /// <summary>
+        /// Признак наличия башни с орудием
+        /// </summary>
+        public bool Gun { get; private set; }
+        /// <summary>
+        /// Признак наличия радара
+        /// </summary>
+        public bool Radar { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес зенитного орудия</param>
+        /// <param name="bodyColor">Цвет корпуса</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="gun">Признак наличия башни с орудием</param>
+        /// <param name="radar">Признак наличия радара</param>
+        public EntityUpdateAntiAircraftGun(int speed, float weight, Color bodyColor, Color dopColor, bool gun, bool radar) :
+        base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            Gun = gun;
+            Radar = radar;
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/ExtentionAntiAircraftGun.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    /// <summary>
+    /// Расширение для класса DrawingAntiAircraftGun
+    /// </summary>
+    internal static class ExtentionAntiAircraftGun
+    {
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly char _separatorForObject = ':';
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public static DrawingAntiAircraftGun CreateDrawingAntiAircraftGun(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawingAntiAircraftGun(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 6)
+            {
+                return new DrawingUpdateAntiAircraftGun(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
+                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
+                Convert.ToBoolean(strs[5]));
+            }
+            return null;
+        }
+        /// <summary>
+        /// Получение данных для сохранения в файл
+        /// </summary>
+        /// <param name="drawingAntiAircraftGun"></param>
+        /// <returns></returns>
+        public static string GetDataForSave(this DrawingAntiAircraftGun drawingAntiAircraftGun)
+        {
+            var antiAircraftGun = drawingAntiAircraftGun.AntiAircraftGun;
+            var str = $"{antiAircraftGun.Speed}{_separatorForObject}{antiAircraftGun.Weight}{_separatorForObject}{antiAircraftGun.BodyColor.Name}";
+            if (antiAircraftGun is not EntityUpdateAntiAircraftGun updateAntiAircraftGun)
+            {
+                return str;
+            }
+            return $"{str}{_separatorForObject}{updateAntiAircraftGun.DopColor.Name}{_separatorForObject}{updateAntiAircraftGun.Gun}{_separatorForObject}{updateAntiAircraftGun.Radar}";
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs

@@ -38,6 +38,8 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonCreareModif = new System.Windows.Forms.Button();
+            this.buttonSelect = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -142,11 +144,35 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // buttonCreareModif
+            // 
+            this.buttonCreareModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreareModif.Location = new System.Drawing.Point(111, 381);
+            this.buttonCreareModif.Name = "buttonCreareModif";
+            this.buttonCreareModif.Size = new System.Drawing.Size(125, 29);
+            this.buttonCreareModif.TabIndex = 7;
+            this.buttonCreareModif.Text = "Модификация";
+            this.buttonCreareModif.UseVisualStyleBackColor = true;
+            this.buttonCreareModif.Click += new System.EventHandler(this.ButtonCreareModif_Click);
+            // 
+            // buttonSelect
+            // 
+            this.buttonSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSelect.Location = new System.Drawing.Point(578, 379);
+            this.buttonSelect.Name = "buttonSelect";
+            this.buttonSelect.Size = new System.Drawing.Size(94, 29);
+            this.buttonSelect.TabIndex = 8;
+            this.buttonSelect.Text = "Выбрать";
+            this.buttonSelect.UseVisualStyleBackColor = true;
+            this.buttonSelect.Click += new System.EventHandler(this.ButtonSelect_Click);
+            // 
             // FormAntiAircraftGun
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 451);
+            this.Controls.Add(this.buttonSelect);
+            this.Controls.Add(this.buttonCreareModif);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonLeft);
@@ -178,5 +204,7 @@
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonDown;
+        private Button buttonCreareModif;
+        private Button buttonSelect;
     }
 }

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs

@@ -5,6 +5,10 @@ namespace AntiAircraftGun
     public partial class FormAntiAircraftGun : Form
     {
         private DrawingAntiAircraftGun _antiAircrafGun;
+        /// <summary>
+        /// Âûáðàííîå îáúåêò
+        /// </summary>
+        public DrawingAntiAircraftGun SelectedAntiAircraftGun { get; private set; }
 
         public FormAntiAircraftGun()
         {
@@ -23,6 +27,17 @@ namespace AntiAircraftGun
                 pictureBoxAntiAircraftGun.Image = bmp;
             }
         }
+        /// <summary>
+        /// Ìåòîä óñòàíîâêè äàííûõ
+        /// </summary>
+        private void SetData()
+        {
+            Random rnd = new();
+            _antiAircrafGun.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_antiAircrafGun.AntiAircraftGun.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_antiAircrafGun.AntiAircraftGun.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}";
+        }
 
         /// <summary>
         /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
@@ -32,18 +47,18 @@ namespace AntiAircraftGun
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-                _antiAircrafGun = new DrawingAntiAircraftGun();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-                _antiAircrafGun.Init(rnd.Next(100, 300), rnd.Next(1000, 2000),
+            ColorDialog dialog = new();
-               Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            if (dialog.ShowDialog() == DialogResult.OK)
-                _antiAircrafGun.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
+            {
-               pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
+                color = dialog.Color;
-                toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_antiAircrafGun.AntiAircraftGun.Speed}";
+            }
-                toolStripStatusLabelWeight.Text = $"Âåñ: {_antiAircrafGun.AntiAircraftGun.Weight}";
+            _antiAircrafGun = new DrawingAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-                toolStripStatusLabelBodyColor.Text = $"Öâåò: {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}";
+            SetData();
             Draw();
         }
         /// <summary>
-        /// Èçìåíåíèå ðàçìåðîâ ôîðìû
+        /// Îïðåäåëåíèå íàïðàâëåíèÿ
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -78,5 +93,36 @@ namespace AntiAircraftGun
             _antiAircrafGun?.ChangeBorders(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
             Draw();
         }
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreareModif_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;
+            }
+            _antiAircrafGun = new DrawingUpdateAntiAircraftGun(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 ButtonSelect_Click(object sender, EventArgs e)
+        {
+            SelectedAntiAircraftGun = _antiAircrafGun;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.resx

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

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGunConfig.Designer.cs

@@ -0,0 +1,361 @@
+namespace AntiAircraftGun
+{
+    partial class FormAntiAircraftGunConfig
+    {
+        /// <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.labelModifiedObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxRadar = new System.Windows.Forms.CheckBox();
+            this.checkBoxGun = 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.buttonOk = 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.labelModifiedObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Controls.Add(this.checkBoxRadar);
+            this.groupBoxConfig.Controls.Add(this.checkBoxGun);
+            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(538, 240);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(397, 165);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(127, 50);
+            this.labelModifiedObject.TabIndex = 8;
+            this.labelModifiedObject.Text = "Продвинутый";
+            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelModifiedObject.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(254, 165);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(123, 50);
+            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.panelPurple);
+            this.groupBoxColors.Controls.Add(this.panelBlack);
+            this.groupBoxColors.Controls.Add(this.panelGray);
+            this.groupBoxColors.Controls.Add(this.panelWhite);
+            this.groupBoxColors.Controls.Add(this.panelYellow);
+            this.groupBoxColors.Controls.Add(this.panelBlue);
+            this.groupBoxColors.Controls.Add(this.panelGreen);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Location = new System.Drawing.Point(254, 14);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Size = new System.Drawing.Size(270, 140);
+            this.groupBoxColors.TabIndex = 6;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(204, 78);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(45, 45);
+            this.panelPurple.TabIndex = 8;
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(141, 78);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(45, 45);
+            this.panelBlack.TabIndex = 8;
+            // 
+            // panelGray
+            // 
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(78, 78);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(45, 45);
+            this.panelGray.TabIndex = 8;
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(17, 78);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(45, 45);
+            this.panelWhite.TabIndex = 8;
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(204, 26);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(45, 45);
+            this.panelYellow.TabIndex = 8;
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(141, 26);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(45, 45);
+            this.panelBlue.TabIndex = 8;
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(78, 26);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(45, 45);
+            this.panelGreen.TabIndex = 8;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(17, 26);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(45, 45);
+            this.panelRed.TabIndex = 7;
+            // 
+            // checkBoxRadar
+            // 
+            this.checkBoxRadar.AutoSize = true;
+            this.checkBoxRadar.Location = new System.Drawing.Point(12, 191);
+            this.checkBoxRadar.Name = "checkBoxRadar";
+            this.checkBoxRadar.Size = new System.Drawing.Size(208, 24);
+            this.checkBoxRadar.TabIndex = 5;
+            this.checkBoxRadar.Text = "Признак наличия радара";
+            this.checkBoxRadar.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxGun
+            // 
+            this.checkBoxGun.AutoSize = true;
+            this.checkBoxGun.Location = new System.Drawing.Point(12, 140);
+            this.checkBoxGun.Name = "checkBoxGun";
+            this.checkBoxGun.Size = new System.Drawing.Size(208, 24);
+            this.checkBoxGun.TabIndex = 4;
+            this.checkBoxGun.Text = "Признак наличия орудия";
+            this.checkBoxGun.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(105, 78);
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(95, 27);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(105, 28);
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(95, 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(12, 80);
+            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(12, 30);
+            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(576, 12);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(291, 190);
+            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(153, 8);
+            this.labelDopColor.Name = "labelDopColor";
+            this.labelDopColor.Size = new System.Drawing.Size(123, 42);
+            this.labelDopColor.TabIndex = 9;
+            this.labelDopColor.Text = "Доп. цвет";
+            this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LableDopColor_DragDrop);
+            this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // labelBaseColor
+            // 
+            this.labelBaseColor.AllowDrop = true;
+            this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelBaseColor.Location = new System.Drawing.Point(14, 8);
+            this.labelBaseColor.Name = "labelBaseColor";
+            this.labelBaseColor.Size = new System.Drawing.Size(123, 42);
+            this.labelBaseColor.TabIndex = 8;
+            this.labelBaseColor.Text = "Цвет";
+            this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LableBaseColor_DragDrop);
+            this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(14, 53);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(262, 124);
+            this.pictureBoxObject.TabIndex = 0;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(590, 208);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(123, 44);
+            this.buttonOk.TabIndex = 2;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(729, 208);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(123, 44);
+            this.buttonCancel.TabIndex = 3;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormAntiAircraftGunConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(896, 273);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormAntiAircraftGunConfig";
+            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 labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelWeight;
+        private CheckBox checkBoxRadar;
+        private CheckBox checkBoxGun;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Panel panelObject;
+        private Label labelDopColor;
+        private Label labelBaseColor;
+        private PictureBox pictureBoxObject;
+        private Button buttonOk;
+        private Button buttonCancel;
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGunConfig.cs

@@ -0,0 +1,178 @@
+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.VisualStyles.VisualStyleElement.ToolTip;
+
+namespace AntiAircraftGun
+{
+    public partial class FormAntiAircraftGunConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранная машина
+        /// </summary>
+        DrawingAntiAircraftGun _antiAircraftGun = null;
+        /// <summary>
+        /// Событие
+        /// </summary>
+        private event Action<DrawingAntiAircraftGun> EventAddAntiAircraftGun;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormAntiAircraftGunConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.MouseDown += PanelColor_MouseDown;
+            panelGray.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 += (sender, e) => { Close(); };
+        }
+        /// <summary>
+        /// Отрисовать орудие
+        /// </summary>
+        private void DrawAntiAircraftGun()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _antiAircraftGun?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+            _antiAircraftGun?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev"></param>
+        public void AddEvent(Action<DrawingAntiAircraftGun> ev)
+        {
+            if (EventAddAntiAircraftGun == null)
+            {
+                EventAddAntiAircraftGun = ev;
+            }
+            else
+            {
+                EventAddAntiAircraftGun += ev;
+            }
+        }
+        ///
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _antiAircraftGun = new DrawingAntiAircraftGun((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _antiAircraftGun = new DrawingUpdateAntiAircraftGun((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                    checkBoxGun.Checked, checkBoxRadar.Checked);
+                    break;
+            }
+            DrawAntiAircraftGun();
+        }
+        /// <summary>
+        /// Отправляем цвет с панели
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>labelModifiedObject
+        /// Принимаем основной цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LableBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_antiAircraftGun == null || !e.Data.GetDataPresent(typeof(Color)))
+            {
+                return;
+            }
+            _antiAircraftGun.AntiAircraftGun.BodyColor = (Color)e.Data.GetData(typeof(Color));
+            DrawAntiAircraftGun();
+        }
+        /// <summary>
+        /// Принимаем дополнительный цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LableDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_antiAircraftGun == null || _antiAircraftGun.GetType() != typeof(DrawingUpdateAntiAircraftGun) || !e.Data.GetDataPresent(typeof(Color)))
+            {
+                return;
+            }
+            if (_antiAircraftGun.AntiAircraftGun is EntityUpdateAntiAircraftGun upGun)
+            {
+                upGun.DopColor = (Color)e.Data.GetData(typeof(Color));
+            }
+            DrawAntiAircraftGun();
+        }
+        /// <summary>
+        /// Добавление орудия
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddAntiAircraftGun?.Invoke(_antiAircraftGun);
+            Close();
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGunConfig.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>

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.Designer.cs

@@ -0,0 +1,339 @@
+namespace AntiAircraftGun
+{
+    partial class FormMapWithSetAntiAircraftGuns
+    {
+        /// <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.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveAntiAircraftGun = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddAntiAircraftGun = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.menuStrip = new System.Windows.Forms.MenuStrip();
+            this.файлToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.groupBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.groupBoxMaps.SuspendLayout();
+            this.menuStrip.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox
+            // 
+            this.groupBox.Controls.Add(this.buttonShowOnMap);
+            this.groupBox.Controls.Add(this.buttonShowStorage);
+            this.groupBox.Controls.Add(this.buttonRemoveAntiAircraftGun);
+            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox.Controls.Add(this.buttonAddAntiAircraftGun);
+            this.groupBox.Controls.Add(this.buttonDown);
+            this.groupBox.Controls.Add(this.buttonRight);
+            this.groupBox.Controls.Add(this.buttonLeft);
+            this.groupBox.Controls.Add(this.buttonUp);
+            this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox.Location = new System.Drawing.Point(574, 28);
+            this.groupBox.Name = "groupBox";
+            this.groupBox.Size = new System.Drawing.Size(238, 579);
+            this.groupBox.TabIndex = 0;
+            this.groupBox.TabStop = false;
+            this.groupBox.Text = "Инструменты";
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 465);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(194, 29);
+            this.buttonShowOnMap.TabIndex = 16;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(20, 430);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(194, 29);
+            this.buttonShowStorage.TabIndex = 15;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveAntiAircraftGun
+            // 
+            this.buttonRemoveAntiAircraftGun.Location = new System.Drawing.Point(20, 395);
+            this.buttonRemoveAntiAircraftGun.Name = "buttonRemoveAntiAircraftGun";
+            this.buttonRemoveAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
+            this.buttonRemoveAntiAircraftGun.TabIndex = 14;
+            this.buttonRemoveAntiAircraftGun.Text = "Удалить орудие";
+            this.buttonRemoveAntiAircraftGun.UseVisualStyleBackColor = true;
+            this.buttonRemoveAntiAircraftGun.Click += new System.EventHandler(this.ButtonRemoveAntiAircraftGun_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 362);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(194, 27);
+            this.maskedTextBoxPosition.TabIndex = 13;
+            // 
+            // buttonAddAntiAircraftGun
+            // 
+            this.buttonAddAntiAircraftGun.Location = new System.Drawing.Point(20, 327);
+            this.buttonAddAntiAircraftGun.Name = "buttonAddAntiAircraftGun";
+            this.buttonAddAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
+            this.buttonAddAntiAircraftGun.TabIndex = 12;
+            this.buttonAddAntiAircraftGun.Text = "Добавить орудие";
+            this.buttonAddAntiAircraftGun.UseVisualStyleBackColor = true;
+            this.buttonAddAntiAircraftGun.Click += new System.EventHandler(this.ButtonAddAntiAircraftGun_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(108, 537);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 29);
+            this.buttonDown.TabIndex = 10;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(143, 537);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 29);
+            this.buttonRight.TabIndex = 9;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(71, 537);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(108, 499);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 29);
+            this.buttonUp.TabIndex = 7;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Простая карта 2"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(14, 59);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(194, 28);
+            this.comboBoxSelectorMap.TabIndex = 11;
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 28);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(574, 579);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(580, 26);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(220, 277);
+            this.groupBoxMaps.TabIndex = 17;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 20;
+            this.listBoxMaps.Location = new System.Drawing.Point(14, 126);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(194, 104);
+            this.listBoxMaps.TabIndex = 14;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(14, 236);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(194, 29);
+            this.buttonDeleteMap.TabIndex = 13;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(14, 93);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(194, 29);
+            this.buttonAddMap.TabIndex = 12;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(14, 26);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(194, 27);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // menuStrip
+            // 
+            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.файлToolStripMenuItem});
+            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip.Name = "menuStrip";
+            this.menuStrip.Size = new System.Drawing.Size(812, 28);
+            this.menuStrip.TabIndex = 18;
+            // 
+            // файлToolStripMenuItem
+            // 
+            this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+            this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            this.файлToolStripMenuItem.Size = new System.Drawing.Size(59, 24);
+            this.файлToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+            this.SaveToolStripMenuItem.Text = "Сохранение";
+            this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+            // 
+            // LoadToolStripMenuItem
+            // 
+            this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+            this.LoadToolStripMenuItem.Text = "Загрузка";
+            this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // FormMapWithSetAntiAircraftGuns
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(812, 607);
+            this.Controls.Add(this.groupBoxMaps);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox);
+            this.Controls.Add(this.menuStrip);
+            this.MainMenuStrip = this.menuStrip;
+            this.Name = "FormMapWithSetAntiAircraftGuns";
+            this.Text = "FormMapWithSetAntiAircraftGuns";
+            this.groupBox.ResumeLayout(false);
+            this.groupBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
+            this.menuStrip.ResumeLayout(false);
+            this.menuStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox;
+        private PictureBox pictureBox;
+        private Button buttonDown;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemoveAntiAircraftGun;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddAntiAircraftGun;
+        private ComboBox comboBoxSelectorMap;
+        private GroupBox groupBoxMaps;
+        private ListBox listBoxMaps;
+        private Button buttonDeleteMap;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.cs

@@ -0,0 +1,312 @@
+using Microsoft.Extensions.Logging;
+using Serilog.Filters;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.DataFormats;
+
+namespace AntiAircraftGun
+{
+    public partial class FormMapWithSetAntiAircraftGuns : Form
+    {
+        /// <summary>
+        /// Словарь для выпадающего списка
+        /// </summary>
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap()},  { "Простая карта2", new SimpleMap2()}
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
+        /// <summary>
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetAntiAircraftGuns(ILogger<FormMapWithSetAntiAircraftGuns> logger)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        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;
+            }
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogInformation("При добавлении карты {0}", comboBoxSelectorMap.SelectedIndex == -1 ? "не была выбрана карта" : "не была названа карта");
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogInformation($"Попытка добавить несуществующую карту: {textBoxNewMapName.Text}");
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+            _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation($"Переход на карту: {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                _logger.LogInformation($"Попытка удалить несуществующую карту: {textBoxNewMapName.Text}");
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+                _logger.LogInformation($"Удалена карта: {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddAntiAircraftGun_Click(object sender, EventArgs e)
+        {
+            var formAntiAircraftGunConfig = new FormAntiAircraftGunConfig();
+            formAntiAircraftGunConfig.AddEvent(AddAntiAircraftGun);
+            formAntiAircraftGunConfig.Show();
+        }
+        private void AddAntiAircraftGun(DrawingAntiAircraftGun drawingAntiAircraftGuns)
+        {
+            try
+            {
+                if (listBoxMaps.SelectedIndex == -1)
+                {
+                    _logger.LogInformation($"Попытка добавления объекта на невыбранную карту");
+                    return;
+                }
+                if (drawingAntiAircraftGuns == null)
+                {
+                    MessageBox.Show("Нужно выбрать объект перед добавлением");
+                    _logger.LogInformation($"Не выбран объект для добавления на карту");
+                    return;
+                }
+                DrawingObjectAntiAircraftGun antiAircraftGun = new DrawingObjectAntiAircraftGun(drawingAntiAircraftGuns);
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + antiAircraftGun != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    _logger.LogInformation($"Добавлен объект {drawingAntiAircraftGuns} на карту ");
+                }
+                else
+                {
+                    MessageBox.Show("Не получилось добавить объект");
+                    _logger.LogInformation($"Не получилось добавить объект {drawingAntiAircraftGuns} на карту ");
+                }
+            }
+            catch (StorageOverflowException ex)
+            {
+                _logger.LogWarning($"Ошибка переполнения хранилища: {ex.Message}");
+                MessageBox.Show($"Ошибка переполнения хранилища: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveAntiAircraftGun_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);
+            try
+            {
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    _logger.LogInformation($"Удален объект {pos}");
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось удалить объект");
+                    _logger.LogInformation($"Не удалось удалить объект {pos}");
+                }
+            }
+            catch (AntiAircraftGunNotFoundException ex)
+            {
+                _logger.LogWarning($"Ошибка удаления: {ex.Message}");
+                MessageBox.Show($"Ошибка удаления {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
+                MessageBox.Show($"Неизвестная ошибка {ex.Message}");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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);
+        }
+        /// <summary>
+        /// Обработка нажатия "Сохранение"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Успешно сохранено в файл: {saveFileDialog.FileName}");
+                }
+                catch(Exception ex)
+                {
+                    MessageBox.Show($"Не сохранилось {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Ошибка сохранения в файл: {saveFileDialog.FileName}");
+                }
+            }
+        }
+        /// <summary>
+        /// Обработка нажатия "Загрузка"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    ReloadMaps();
+                    _logger.LogInformation($"Успешная загрузка из файла: {openFileDialog.FileName}");
+                }
+                catch(Exception ex)
+                {
+                    MessageBox.Show($"Не загрузилось {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Ошибка загрузки из файла: {openFileDialog.FileName}");
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.resx

@@ -0,0 +1,72 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>144, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>311, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
+</root>

AntiAircraftGun/AntiAircraftGun/IDrawingObject.cs

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

AntiAircraftGun/AntiAircraftGun/MapWithSetAntiAircraftGunsGeneric.cs

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    /// <summary>
+    /// Карта с набром объектов под нее
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class MapWithSetAntiAircraftGunsGeneric<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 = 150;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetAntiAircraftGunsGeneric<T> _setAntiAircraftGuns;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetAntiAircraftGunsGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setAntiAircraftGuns = new SetAntiAircraftGunsGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="antiAircraftGuns"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetAntiAircraftGunsGeneric<T, U> map, T antiAircraftGuns)
+        {
+            return map._setAntiAircraftGuns.Insert(antiAircraftGuns);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static T operator -(MapWithSetAntiAircraftGunsGeneric<T, U> map, int position)
+        {
+            return map._setAntiAircraftGuns.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawAntiAircraftGuns(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var antiAircraftGun in _setAntiAircraftGuns.GetAntiAircraftGuns())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, antiAircraftGun);
+            }
+            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>
+        /// <param name="sep"></param>
+        /// <returns></returns>
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var antiAircraftGun in _setAntiAircraftGuns.GetAntiAircraftGuns())
+            {
+                data += $"{antiAircraftGun.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+        /// <summary>
+        /// Загрузка списка из массива строк
+        /// </summary>
+        /// <param name="records"></param>
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setAntiAircraftGuns.Insert(DrawingObjectAntiAircraftGun.Create(rec) as T);
+            }
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setAntiAircraftGuns.Count - 1;
+            for (int i = 0; i < _setAntiAircraftGuns.Count; i++)
+            {
+                if (_setAntiAircraftGuns[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var antiAircraftGun = _setAntiAircraftGuns[j];
+                        if (antiAircraftGun != null)
+                        {
+                            _setAntiAircraftGuns.Insert(antiAircraftGun, i);
+                            _setAntiAircraftGuns.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Brush brushGreen = new SolidBrush(Color.Green);
+            Brush brushLightGray = new SolidBrush(Color.LightGray);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight; ++j)
+                {
+                    g.FillRectangle(brushGreen, i * _placeSizeWidth, j * _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+                    g.FillRectangle(brushLightGray, i * _placeSizeWidth + _placeSizeWidth / 10, j * _placeSizeHeight + _placeSizeHeight / 10, _placeSizeWidth * 8 / 10, _placeSizeHeight * 8 / 10);
+                }
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawAntiAircraftGuns(Graphics g)
+        {
+            int xPositionInStorage = _placeSizeWidth / 10;
+            int yPositionInStorage = _placeSizeHeight / 10;
+            foreach (var antiAircraftGun in _setAntiAircraftGuns.GetAntiAircraftGuns())
+            {
+                antiAircraftGun.SetObject(xPositionInStorage, yPositionInStorage, _pictureWidth, _pictureHeight);
+                antiAircraftGun.DrawingObjectAntiAircraftGun(g);
+                xPositionInStorage += _placeSizeWidth;
+                if (xPositionInStorage > _pictureWidth - _placeSizeWidth)
+                {
+                    xPositionInStorage = _placeSizeWidth / 10;
+                    yPositionInStorage += _placeSizeHeight;
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/MapsCollection.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetAntiAircraftGunsGeneric<IDrawingObject, AbstractMap>> _mapStorages;
+        /// <summary>
+        /// Возвращение списка названий карт
+        /// </summary>
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Разделитель для записи по элементу словаря в файл
+        /// </summary>
+        private readonly char separatorDict = '|';
+        /// <summary>
+        /// Разделитель для записи колекции данных в файл
+        /// </summary>
+        private readonly char separatorData = ';';
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetAntiAircraftGunsGeneric<IDrawingObject, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        /// <param name="map">Карта</param>
+        public void AddMap(string name, AbstractMap map)
+        {
+            if(!_mapStorages.ContainsKey(name)) _mapStorages.Add(name, new MapWithSetAntiAircraftGunsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            _mapStorages.Remove(name);
+        }
+        /// <summary>
+        /// Доступ к парковке
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetAntiAircraftGunsGeneric<IDrawingObject, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (_mapStorages.TryGetValue(ind, out var map)) return map;
+                return null;
+            }
+        }
+        /// <summary>
+        /// Сохранение информации по орудиям в хранилище в файл
+        /// </summary>
+        /// <param name="filename">Путь и имя файла</param>
+        /// <returns></returns>
+        public void SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            using (StreamWriter sw = new StreamWriter(filename))
+            {
+                sw.WriteLine($"MapsCollection");
+                foreach (var storage in _mapStorages)
+                {
+                    sw.WriteLine($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}");
+                }
+            }
+        }
+        /// <summary>
+        /// Загрузка нформации по орудиям на парковках из файла
+        /// </summary>
+        /// <param name="filename"></param>
+        /// <returns></returns>
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не найден");
+            }
+            using (StreamReader sr = new StreamReader(filename))
+            {
+                string str;
+                _mapStorages.Clear();
+                str = sr.ReadLine();
+                if (!str.Contains("MapsCollection"))
+                {
+                    throw new FileFormatException($"Неправильный формат данных в файле {filename}");
+                }
+                while ((str = sr.ReadLine()) != null)
+                {
+                    var elem = str.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "SimpleMap2":
+                            map = new SimpleMap2();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetAntiAircraftGunsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace AntiAircraftGun
 {
     internal static class Program
@@ -11,7 +16,28 @@ namespace AntiAircraftGun
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormAntiAircraftGun());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetAntiAircraftGuns>());
+            }
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormMapWithSetAntiAircraftGuns>()
+            .AddLogging(option =>
+            {
+                var configuration = new ConfigurationBuilder()
+                .AddJsonFile("C:\\Óíèâåðñèòåò\\2 êóðñ\\ÐÏÏ\\AntiAircraftGun\\AntiAircraftGun\\AntiAircraftGun\\seriLog.json")
+                .Build();
+
+                var Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(Logger);
+            });
         }
     }
 }

AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs

@@ -0,0 +1,108 @@
+using Serilog.Filters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetAntiAircraftGunsGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T> _places;
+        /// <summary>
+        /// Количество объектов в списке
+        /// </summary>
+        public int Count => _places.Count;
+        private readonly int _maxCount;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetAntiAircraftGunsGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="antiAircraftGun">Добавляемое орудие</param>
+        /// <returns></returns>
+        public int Insert(T antiAircraftGun)
+        {
+            if (_places.Count < _maxCount) return Insert(antiAircraftGun, 0);
+            else throw new StorageOverflowException(_maxCount);
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="antiAircraftGun">Добавляемое орудие</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T antiAircraftGun, int position)
+        {
+            if (position >= _maxCount) throw new StorageOverflowException(_maxCount);
+            _places.Insert(position, antiAircraftGun);
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Remove(int position)
+        {
+            if (position >= _places.Count) throw new AntiAircraftGunNotFoundException(position);
+            if (_places[position] == null) throw new AntiAircraftGunNotFoundException(position);
+            T removed = _places[position];
+            _places.RemoveAt(position);
+            return removed;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= _places.Count) return null;
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position >= _places.Count) return;
+                _places.Insert(position, value);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetAntiAircraftGuns()
+        {
+            foreach (var antiAircraftGun in _places)
+            {
+                if (antiAircraftGun != null)
+                {
+                    yield return antiAircraftGun;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/SimpleMap.cs

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

AntiAircraftGun/AntiAircraftGun/SimpleMap2.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    internal class SimpleMap2 : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.LightGreen);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 25)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/StorageOverflowException.cs

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

AntiAircraftGun/AntiAircraftGun/seriLog.json

@@ -0,0 +1,12 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": { "path": "C:\\Университет\\2 курс\\РПП\\AntiAircraftGun\\AntiAircraftGun\\AntiAircraftGun\\bin\\Debug\\net6.0-windows\\Log.txt" }
+      }
+    ]
+  }
+}