Merge pull request 'Eliseev E.E. LabWork04' (#5) from LabWork04 into LabWork03

Reviewed-on: http://student.git.athene.tech/ElEgEv/PIbd-21_Eliseev_E.E._Airbus_Base/pulls/5

Airbus/Airbus/AbstractMap.cs

@@ -0,0 +1,173 @@
+using Microsoft.VisualBasic.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal abstract class AbstractMap
+    {
+        private IDrawningObject _drawningObject = 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, IDrawningObject drawningObject)
+        {
+            _width = width;
+            _height = height;
+            _drawningObject = drawningObject;
+
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+
+            return DrawMapWithObject();
+        }
+
+        //проверка на "накладывание"
+        protected bool CheckPosition(float Left, float Right, float Top, float Bottom)
+        {
+            int x_start = (int)(Left / _size_x);
+            int y_start = (int)(Right / _size_y);
+            int x_end = (int)(Top / _size_x);
+            int y_end = (int)(Bottom / _size_y);
+
+            for(int i = x_start; i <= x_end; i++)
+            {
+                for(int j = y_start; j <= y_end; j++)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public Bitmap MoveObject(Direction direction)
+        {
+            _drawningObject.MoveObject(direction);
+            (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
+
+            if (CheckPosition(Left, Right, Top, Bottom))
+            {
+                _drawningObject.MoveObject(MoveObjectBack(direction));
+            }
+
+            return DrawMapWithObject();
+        }
+
+        private Direction MoveObjectBack(Direction direction)
+        {
+            switch (direction)
+            {
+                case Direction.Up:
+                    return Direction.Down;
+                    break;
+                case Direction.Down:
+                    return Direction.Up;
+                    break;
+                case Direction.Left:
+                    return Direction.Right;
+                    break;
+                case Direction.Right:
+                    return Direction.Left;
+                    break;
+            }
+
+            return Direction.None;
+        }
+
+        private bool SetObjectOnMap()
+        {
+            if(_drawningObject == null || _map == null)
+            {
+                return false;
+            }
+
+            int x = _random.Next(0, 10);
+            int y = _random.Next(0, 10);
+            _drawningObject.SetObject(x, y, _width, _height);
+            (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
+            
+            if(!CheckPosition(Left, Right, Top, Bottom))
+            {
+                return true;
+            }
+
+            float x_start = Left;
+            float y_start = Right;
+            float x_length = Top - Left;
+            float y_length = Bottom - Right;
+            while(CheckPosition(x_start, y_start, x_start + x_length, y_start + y_length))
+            {
+                bool check;
+
+                do
+                {
+                    check = CheckPosition(x_start, y_start, x_start + x_length, y_start + y_length);
+
+                    if (!check)
+                    {
+                        _drawningObject.SetObject((int)x_start, (int)y_start, _width, _height);
+                        return true;
+                    } 
+                    else
+                    {
+                        x_start += _size_x;
+                    }
+                } while (check);
+            }
+
+            x_start = x;
+            y_start += _size_y;
+            return false;
+        }
+
+        private Bitmap DrawMapWithObject()
+        {
+            Bitmap bmp = new(_width, _height);
+
+            if(_drawningObject == 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);
+                    }
+                }
+            }
+
+            _drawningObject.DrawningObject(gr);
+            return bmp;
+        }
+
+        protected abstract void GenerateMap();
+        protected abstract void DrawRoadPart(Graphics g, int i, int j);
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

Airbus/Airbus/Airbus.csproj

@@ -23,4 +23,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="метк\" />
+  </ItemGroup>
+
 </Project>

Airbus/Airbus/DesertStormMap.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class DesertStormMap : AbstractMap
+    {
+        //цвет закрытого участка
+        Brush barriedColor = new SolidBrush(Color.DarkRed);
+
+        //цвет открытого участка
+        Brush roadColor = new SolidBrush(Color.DarkOrange);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillEllipse(barriedColor, i * _size_x, j * _size_y, _size_x, _size_x);
+        }
+
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

Airbus/Airbus/Direction.cs

@@ -7,11 +7,12 @@ using System.Threading.Tasks;
 namespace Airbus
 {
     //направление перемещения
-    internal enum Direction
+    public enum Direction
     {
         Up = 1,
         Down = 2,
         Left = 3,
-        Right = 4
+        Right = 4,
+        None = 5
     }
 }

Airbus/Airbus/DrawningAirbus.cs

@@ -6,14 +6,14 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    //класс, отвечающий за прорисовку и перемещение объект
-    internal class DrawingAirbus
+    //класс, отвечающий за прорисовку и перемещение объекта
+    public class DrawningAirbus
     {
-        public EntityAirbus Airbus { get; private set; } //класс-сущность
+        public EntityAirbus Airbus { get; protected set; } //класс-сущность
 
-        private float _startPosX; //левая координата отрисовки
+        protected float _startPosX; //левая координата отрисовки
 
-        private float _startPosY; //верхняя координата отрисовки
+        protected float _startPosY; //верхняя координата отрисовки
 
         private int? _pictureWidth = null; //ширина окна отрисовки
         
@@ -24,10 +24,16 @@ namespace Airbus
         protected readonly int _airbusHeight = 16; //высота отрисовки самолёта
 
         //инициализаци свойств
-        public void Initial(int speed, float weight, Color corpusColor)
+        public DrawningAirbus(int speed, float weight, Color corpusColor)
         {
-            Airbus = new EntityAirbus();
-            Airbus.Initial(speed, weight, corpusColor);
+            Airbus = new EntityAirbus(speed, weight, corpusColor);
+        }
+
+        protected DrawningAirbus(int speed, float weight, Color corpusColor, int airbusWidth, int airbusHeight) :
+            this(speed, weight, corpusColor)   
+        {
+            _airbusWidth = airbusWidth;
+            _airbusHeight = airbusHeight;
         }
 
         //установка координат позиции самолёта
@@ -88,7 +94,7 @@ namespace Airbus
         }
 
         //отрисовка самолёта
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
             {
@@ -96,23 +102,58 @@ namespace Airbus
             }
 
             Pen pen = new(Color.Black);
+            Brush selectedBrush = new SolidBrush(Airbus.CorpusColor);
+            Brush darcBlue = new SolidBrush(Color.DarkSlateBlue);
+            Brush darkBrush = new SolidBrush(Color.Black);
 
             //корпус
+            g.FillRectangle(selectedBrush, _startPosX, _startPosY + 10, 40, 10);
             g.DrawRectangle(pen, _startPosX, _startPosY + 10, 40, 10);
 
             //крыло
-            Brush darkBrush = new SolidBrush(Color.Black);
-            g.FillRectangle(darkBrush, _startPosX + 10, _startPosY + 13, 20, 2);
-            g.FillRectangle(darkBrush, _startPosX + 12, _startPosY + 15, 16, 2);
+            g.FillRectangle(selectedBrush, _startPosX + 10, _startPosY + 13, 20, 2);
+            g.FillRectangle(selectedBrush, _startPosX + 12, _startPosY + 15, 16, 2);
+            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 13, 20, 2);
+            g.DrawRectangle(pen, _startPosX + 12, _startPosY + 15, 16, 2);
 
             //хвостовое крыло
+            Point[] point_tailWing = new Point[]
+            {
+                new Point((int)_startPosX, (int)_startPosY + 10), 
+                new Point((int)_startPosX, (int)_startPosY),
+                new Point((int)_startPosX + 10, (int)_startPosY + 10), 
+                new Point((int)_startPosX, (int)_startPosY + 10)
+            };
+
+            g.FillPolygon(selectedBrush, point_tailWing);
             g.DrawLine(pen, _startPosX, _startPosY + 10, _startPosX, _startPosY);
             g.DrawLine(pen, _startPosX, _startPosY, _startPosX + 10, _startPosY + 10);
 
             //заднее поперечное крыло
-            g.FillEllipse(darkBrush, _startPosX - 3, _startPosY + 7, 10, 5);
+            g.FillEllipse(selectedBrush, _startPosX - 3, _startPosY + 7, 10, 5);
+            g.DrawEllipse(pen, _startPosX - 3, _startPosY + 7, 10, 5);
 
             //нос самолёта
+            //верхняя половина
+            Point[] point_upperBow = new Point[]
+            {
+                new Point((int)_startPosX + 40, (int)_startPosY + 15),
+                new Point((int)_startPosX + 50, (int)_startPosY + 16),
+                new Point((int)_startPosX + 40, (int)_startPosY + 10),
+                new Point((int)_startPosX + 40, (int)_startPosY + 15)
+            };
+
+            //нижняя половина
+            Point[] point_lowerBow = new Point[]
+            {
+                new Point((int)_startPosX + 40, (int)_startPosY + 15),
+                new Point((int)_startPosX + 40, (int)_startPosY + 20),
+                new Point((int)_startPosX + 50, (int)_startPosY + 16),
+                new Point((int)_startPosX + 40, (int)_startPosY + 15),
+            };
+
+            g.FillPolygon(darcBlue, point_upperBow);
+            g.FillPolygon(selectedBrush, point_lowerBow);
             g.DrawLine(pen, _startPosX + 40, _startPosY + 15, _startPosX + 50, _startPosY + 16);
             g.DrawLine(pen, _startPosX + 40, _startPosY + 10, _startPosX + 47, _startPosY + 15);
             g.DrawLine(pen, _startPosX + 40, _startPosY + 20, _startPosX + 50, _startPosY + 15);
@@ -121,10 +162,16 @@ namespace Airbus
             g.FillRectangle(darkBrush, _startPosX + 10, _startPosY + 21, 2, 2);
             g.FillRectangle(darkBrush, _startPosX + 12, _startPosY + 23, 4, 4);
             g.FillRectangle(darkBrush, _startPosX + 8, _startPosY + 23, 2, 4);
+            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 21, 2, 2);
+            g.DrawRectangle(pen, _startPosX + 12, _startPosY + 23, 4, 4);
+            g.DrawRectangle(pen, _startPosX + 8, _startPosY + 23, 2, 4);
 
             //переднее шасси
-            g.FillRectangle(darkBrush, _startPosX + 35, _startPosY + 21, 2, 2);
-            g.FillRectangle(darkBrush, _startPosX + 35, _startPosY + 23, 4, 4);
+            g.FillRectangle(darkBrush, _startPosX + 36, _startPosY + 21, 2, 2);
+            g.FillRectangle(darkBrush, _startPosX + 36, _startPosY + 23, 4, 4);
+            g.DrawRectangle(pen, _startPosX + 35, _startPosY + 21, 2, 2);
+            g.DrawRectangle(pen, _startPosX + 35, _startPosY + 23, 4, 4);
+            
         }
 
         //смена границ формы отрисовки
@@ -150,5 +197,11 @@ namespace Airbus
                 _startPosY = _pictureHeight.Value - _airbusHeight;
             }
         }
+
+        //получение текущей позиции объекта
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _airbusWidth, _startPosY + _airbusHeight);
+        }
     }
 }

Airbus/Airbus/DrawningObjectPlane.cs

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

Airbus/Airbus/DrawningSuperAirbus.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class DrawningSuperAirbus : DrawningAirbus
+    {
+        //Инициализаци свойств
+        public DrawningSuperAirbus(int speed, float weight, Color corpusColor, Color addColor, bool addCompartment, bool addEngine) :
+            base(speed, weight, corpusColor, 110, 60)
+        {
+            Airbus = new EntitySuperAirbus(speed, weight, corpusColor, addColor, addCompartment, addEngine);
+        }
+
+        public override void DrawTransport(Graphics g)
+        {
+            if (Airbus is not EntitySuperAirbus superAirbus)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Brush addBrush = new SolidBrush(superAirbus.AddColor);
+
+            //дополнительный пассажирский отсек
+            if (superAirbus.AddСompartment)
+            {
+                g.FillRectangle(addBrush, _startPosX + 30, _startPosY + 12, 14, 3);
+                g.DrawRectangle(pen, _startPosX + 30, _startPosY + 12, 14, 3);
+            }
+
+            _startPosX += 10;
+            _startPosY += 5;
+            base.DrawTransport(g);
+            _startPosX -= 10;
+            _startPosY -= 5;
+
+            //дополнительный двигатель
+            if (superAirbus.AddEngine)
+            {     
+                g.FillEllipse(addBrush, _startPosX + 24, _startPosY + 22, 10, 5);
+                g.DrawEllipse(pen, _startPosX + 24, _startPosY + 22, 10, 5);
+            }
+        }
+
+       
+    }
+}

Airbus/Airbus/EntityAirbus.cs

@@ -6,7 +6,8 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    internal class EntityAirbus
+    //класс-сущность аэробус
+    public class EntityAirbus
     {
         public int Speed { get; private set; } //скорость
 
@@ -16,7 +17,7 @@ namespace Airbus
 
         public float Step => Speed * 100 / Weight; //шаг перемещения самолёта
 
-        public void Initial(int speed, float weight, Color corpusColor)
+        public EntityAirbus(int speed, float weight, Color corpusColor)
         {
             Speed = speed;
             Weight = weight;

Airbus/Airbus/EntitySuperAirbus.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    //класс-сущность супер аэробус
+    internal class EntitySuperAirbus : EntityAirbus
+    {
+        //Дополнительный цвет
+        public Color AddColor { get; private set; }
+
+        //Признак наличия дополнительно пассажирского отсека
+        public bool AddСompartment { get; private set; }
+
+        //Признак наличия доплнительных двигателей
+        public bool AddEngine { get; private set; }
+
+        //Инициализация свойств
+        public EntitySuperAirbus(int speed, float weight, Color corpusColor, Color addColor, bool addCompartment, bool addEngine) : 
+            base(speed, weight, corpusColor)
+        {
+            AddColor = addColor;
+            AddСompartment = addCompartment;
+            AddEngine = addEngine;
+        }
+    }
+}

Airbus/Airbus/FormAirbus.Designer.cs

@@ -39,6 +39,8 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectPlane = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirbus)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -89,7 +91,7 @@
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.buttonCreate.Location = new System.Drawing.Point(12, 392);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+            this.buttonCreate.Size = new System.Drawing.Size(95, 30);
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -143,11 +145,34 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreateModif.Location = new System.Drawing.Point(112, 392);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(120, 30);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // buttonSelectPlane
+            // 
+            this.buttonSelectPlane.Location = new System.Drawing.Point(504, 392);
+            this.buttonSelectPlane.Name = "buttonSelectPlane";
+            this.buttonSelectPlane.Size = new System.Drawing.Size(94, 29);
+            this.buttonSelectPlane.TabIndex = 8;
+            this.buttonSelectPlane.Text = "Выбрать";
+            this.buttonSelectPlane.UseVisualStyleBackColor = true;
+            this.buttonSelectPlane.Click += new System.EventHandler(this.buttonSelectPlane_Click);
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.buttonSelectPlane);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -177,5 +202,7 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
+        private Button buttonCreateModif;
+        private Button buttonSelectPlane;
     }
 }

Airbus/Airbus/FormAirbus.cs

@@ -12,7 +12,10 @@ namespace Airbus
 {
     public partial class Form1 : Form
     {
-        private DrawingAirbus _airbus;
+        private DrawningAirbus _airbus;
+
+        //выбранный объект
+        public DrawningAirbus SelectedPlane { get; set; }
 
         public Form1()
         {
@@ -28,22 +31,36 @@ namespace Airbus
             pictureBoxAirbus.Image = bmp;
         }
         
+        //метод установки данных
+        private void SetData()
+        {
+            Random rnd = new();
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_airbus.Airbus?.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_airbus.Airbus?.Weight}";
+            toolStripStatusLabelCorpusColor.Text = $"Цвет: {_airbus.Airbus?.CorpusColor.Name}";
+            _airbus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height);
+        }
+
         //обработка нажатия кнопки "Создать"
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _airbus = new DrawingAirbus();
-            _airbus.Initial(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _airbus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_airbus.Airbus?.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_airbus.Airbus?.Weight}";
-            toolStripStatusLabelCorpusColor.Text = $"Цвет: {_airbus.Airbus?.CorpusColor.Name}";
+            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;
+            }
+
+            _airbus = new DrawningAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+            SetData();
             Draw();
         }
 
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            //получаем имя кнопки
+            //Получаем имя кнопки
             string name = ((Button)sender)?.Name ?? string.Empty;
             switch (name)
             {
@@ -63,11 +80,43 @@ namespace Airbus
             Draw();
         }
 
-        // Изменение размеров формы
+        //изменение размеров формы
         private void PictureBoxCar_Resize(object sender, EventArgs e)
         {
             _airbus?.ChangeBorders(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
             Draw();
         }
+
+        //обработка нажития кнопки "Модификация"
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+
+            if(dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+
+            Color addColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogAdd = new();
+
+            if(dialogAdd.ShowDialog() == DialogResult.OK)
+            {
+                addColor = dialogAdd.Color;
+            }
+
+            _airbus = new DrawningSuperAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), color, addColor,
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
+
+        private void buttonSelectPlane_Click(object sender, EventArgs e)
+        {
+            SelectedPlane = _airbus;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

Airbus/Airbus/FormAirbus.resx

@@ -64,7 +64,7 @@
   <data name="buttonLeft.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF////
-        AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOwAAADsABataJCQAAFsZJREFUeNrt
+        AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvAAADrwBlbxySQAAFsZJREFUeNrt
         nT2LJMkVRZNC0O4WNDtrptppWxS9rDkjBLLFMItcIRZkqmBBrtbS/mzNR+1OV1V+RGbGu++9yHO9O1bl
         HE69jIzI6u7pS/ruSxqs/eGvv3z389t2L/BrbfriPtc/nI8f86bdC/xam764z3l3/JzHVi/wVW364j7l
         +XjJvxu9wFe16Yv7lPNvMB8bvcCb+jGHyz+1VvuH4+952+IFvq5dyxf3qZy/wvxvixe4I5ivxTw+Hp6A
@@ -168,7 +168,7 @@
   <data name="buttonDown.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF////
-        AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOwAAADsABataJCQAAFodJREFUeNrt
+        AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvAAADrwBlbxySQAAFodJREFUeNrt
         nU2PHEd2RQsFAdy6BvRQy56GAf+AhgwvJcOA1gYhw1vD0KxbhhbeDgb632aTzSYZnVFVWRkf7508x6s3
         Xsx0HVxGRUTeysPhcLz/xOETA8affzvBeff7lA92/H/n8afTDni7C5l3u3D5ZHMHMr877YQf+TL3EswP
         0Rwv88PH+/wfPf8nvcfTbhj8wX6cx/53vjnthke8zL+cdsM/4GXit5hfeKdMDt/jZZ52BF3m8bQj7uAy
@@ -271,7 +271,7 @@
   <data name="buttonRight.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAA5gAAAOYBAMAAABC5kGOAAAABGdBTUEAALGPC/xhBQAAABtQTFRF////
-        AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOwAAADsABataJCQAAGCxJREFUeNrt
+        AAAA5ubmAP8Aq6urAP4AAI0AVVVVAEAANUbI4gAAAAlwSFlzAAAOvAAADrwBlbxySQAAGCxJREFUeNrt
         nU2LHEcWRdNFg2dbM7bby6LwP2jK6xEY/ANEe2+M963GMLM1xoN/9thSy5Ki4kXlV0S8G++c3dNGBIeb
         2ZWRN2M6n0/TO87vGG48Hb7/9Y9fTuMu8O8xgMzDm+Of3J+QqT+eXh3f8gUy9cfPjy88DbrAQDLfB/PP
         C+005ALPgWTeHY9JNJEpO372QeZLNJGpOn64yv4VzcN4C/x4HF7mm49k3p/GW+DH4/CX2ePHPA24wHNU

Airbus/Airbus/FormMapWithSetPlanes.Designer.cs

@@ -0,0 +1,279 @@
+namespace Airbus
+{
+    partial class FormMapWithSetPlanes
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemovePlane = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddPlane = new System.Windows.Forms.Button();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxTools.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
+            this.groupBoxTools.Controls.Add(this.buttonRight);
+            this.groupBoxTools.Controls.Add(this.buttonDown);
+            this.groupBoxTools.Controls.Add(this.buttonLeft);
+            this.groupBoxTools.Controls.Add(this.buttonUp);
+            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTools.Controls.Add(this.buttonRemovePlane);
+            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTools.Controls.Add(this.buttonAddPlane);
+            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTools.Location = new System.Drawing.Point(843, 0);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(250, 722);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "Инструменты";
+            // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Location = new System.Drawing.Point(12, 26);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(232, 335);
+            this.groupBoxMaps.TabIndex = 10;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(8, 278);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(218, 29);
+            this.buttonDeleteMap.TabIndex = 3;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.buttonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 20;
+            this.listBoxMaps.Location = new System.Drawing.Point(8, 128);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(218, 144);
+            this.listBoxMaps.TabIndex = 2;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(8, 93);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(218, 29);
+            this.buttonAddMap.TabIndex = 1;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click_1);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Буря в пустыне",
+            "Звёздные войны"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(8, 59);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(218, 28);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(8, 26);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(218, 27);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::Airbus.Properties.Resources.Right;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonRight.Location = new System.Drawing.Point(158, 657);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(45, 45);
+            this.buttonRight.TabIndex = 9;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::Airbus.Properties.Resources.Down;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonDown.Location = new System.Drawing.Point(107, 657);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(45, 45);
+            this.buttonDown.TabIndex = 8;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::Airbus.Properties.Resources.Left;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonLeft.Location = new System.Drawing.Point(56, 657);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(45, 45);
+            this.buttonLeft.TabIndex = 7;
+            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::Airbus.Properties.Resources.Up;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonUp.Location = new System.Drawing.Point(107, 606);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(45, 45);
+            this.buttonUp.TabIndex = 6;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 553);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(218, 29);
+            this.buttonShowOnMap.TabIndex = 5;
+            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, 500);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(218, 29);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemovePlane
+            // 
+            this.buttonRemovePlane.Location = new System.Drawing.Point(20, 446);
+            this.buttonRemovePlane.Name = "buttonRemovePlane";
+            this.buttonRemovePlane.Size = new System.Drawing.Size(218, 29);
+            this.buttonRemovePlane.TabIndex = 3;
+            this.buttonRemovePlane.Text = "Удалить самолёт";
+            this.buttonRemovePlane.UseVisualStyleBackColor = true;
+            this.buttonRemovePlane.Click += new System.EventHandler(this.ButtonRemovePlane_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(20, 413);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(218, 27);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddPlane
+            // 
+            this.buttonAddPlane.Location = new System.Drawing.Point(20, 378);
+            this.buttonAddPlane.Name = "buttonAddPlane";
+            this.buttonAddPlane.Size = new System.Drawing.Size(218, 29);
+            this.buttonAddPlane.TabIndex = 1;
+            this.buttonAddPlane.Text = "Добавить самолёт";
+            this.buttonAddPlane.UseVisualStyleBackColor = true;
+            this.buttonAddPlane.Click += new System.EventHandler(this.ButtonAddPlane_Click);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(843, 722);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetPlanes
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1093, 722);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTools);
+            this.Name = "FormMapWithSetPlanes";
+            this.Text = "FormMapWithSetPlanes";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemovePlane;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddPlane;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+        private GroupBox groupBoxMaps;
+        private Button buttonDeleteMap;
+        private ListBox listBoxMaps;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
+    }
+}

Airbus/Airbus/FormMapWithSetPlanes.cs

@@ -0,0 +1,209 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Airbus
+{
+    public partial class FormMapWithSetPlanes : Form
+    {
+        //словарь для выпадающего списка
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            {"Простая карта", new SimpleMap() },
+            {"Буря в пустыне", new DesertStormMap() },
+            {"Звёздные войны", new StarWarsMap() }
+        };
+
+        //объект от коллекции карт
+        private readonly MapsCollection _mapsCollection;
+
+        public FormMapWithSetPlanes()
+        {
+            InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var element in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(element.Key);
+            }
+        }
+
+        //заполнение ListBoxMaps
+        private void ReloadMaps()
+        {
+            int index = listBoxMaps.SelectedIndex;
+
+            listBoxMaps.Items.Clear();
+
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+            }
+
+            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+            {
+                listBoxMaps.SelectedIndex = 0;
+            }
+            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
+            {
+                listBoxMaps.SelectedIndex = index;
+            }
+        }
+
+        //добавление карты
+        private void ButtonAddMap_Click_1(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+                return;
+            }
+
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+                return;
+            }
+
+            _mapsCollection.AddMap(textBoxNewMapName.Text,
+           _mapsDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+        }
+
+        //Выбор карты
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        // Удаление карты
+        private void buttonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+
+                ReloadMaps();
+            }
+        }
+
+        //добавление объекта
+        private void ButtonAddPlane_Click(object sender, EventArgs e)
+        {
+            if(_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty] == null)
+            {
+                return;
+            }
+
+            Form1 form = new();
+
+            if(form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectPlane plane = new(form.SelectedPlane);
+
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty] + plane != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+
+        //удаление объекта
+        private void ButtonRemovePlane_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+
+            if(MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, 
+                MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+
+            if(_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty] - pos != null)
+            {
+                MessageBox.Show("Объект удалён");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty].ShowSet();
+            } 
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+
+        //вывод набора
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if(_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty] == null)
+            {
+                return;
+            }
+
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty].ShowSet();
+        }
+
+        //вывод карты
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty] == null)
+            {
+                return;
+            }
+
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty].ShowOnMap();
+        }
+
+        //перемещение
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if(_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty] == null)
+            {
+                return;
+            }
+
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty].MoveObject(dir);
+        }
+    }
+}

Airbus/Airbus/FormMapWithSetPlanes.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>

Airbus/Airbus/IDrawningObject.cs

@@ -0,0 +1,27 @@
+using Microsoft.VisualBasic.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal interface IDrawningObject
+    {
+        //шаг перемещения объекта
+        public float Step { get; }
+
+        //установка позиции объекта
+        void SetObject(int x, int y, int width, int height);
+
+        //изменение направления перемещения объекта
+        void MoveObject(Direction direction);
+
+        //отрисовка объекта
+        void DrawningObject(Graphics g);
+
+        //получение текущей позиции объекта
+        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+    }
+}

Airbus/Airbus/MapWithSetPlanesGeneric.cs

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Runtime.Intrinsics.Arm;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    //карта с набором объектов под неё
+    internal class MapWithSetPlanesGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        //ширина окна отрисовки
+        private readonly int _pictureWidth;
+
+        //высота окна отрисовки
+        private readonly int _pictureHeight;
+
+        //размер занимаемого объектом места (ширина)
+        private readonly int _placeSizeWidth = 210;
+
+        //размер занимаемого объектом места (высота)
+        private readonly int _placeSizeHeight = 90;
+
+        //набор объектов 
+        private readonly SetPlanesGeneric<T> _setPlanes;
+
+        //карта
+        private readonly U _map;
+
+        //конструктор
+        public MapWithSetPlanesGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setPlanes = new SetPlanesGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+
+        //пеергрузка оператора сложения
+        public static int operator +(MapWithSetPlanesGeneric<T, U> map, T plane)
+        {   
+            return map._setPlanes.Insert(plane);
+        }
+
+        //перегрузка оператора вычитания
+        public static T operator -(MapWithSetPlanesGeneric<T, U> map, int position)
+        {
+            return map._setPlanes.Remove(position);
+        }
+
+        //вывод всего набора объектов
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawPlanes(gr);
+            return bmp;
+        }
+
+        //просмотр объекта на карте
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+
+            foreach(var plane in _setPlanes.GetAirbus())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, plane);
+            }
+
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        //пеермещение объекта по карте
+        public Bitmap MoveObject(Direction direction)
+        {
+            if(_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        //"взламываем" набор, чтобы все элементы оказались в начале
+        private void Shaking()
+        {
+            int j = _setPlanes.Count - 1;
+
+            for (int i = 0; i < _setPlanes.Count; i++)
+            {
+                if (_setPlanes[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var plane = _setPlanes[j];
+
+                        if (plane != null)
+                        {
+                            _setPlanes.Insert(plane, i);
+                            _setPlanes.Remove(j);
+                            break;
+                        }
+                    }
+
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+
+        //метод отрисовки фона
+        public void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            Pen marcupPen = new(Color.White, 5);
+            Pen signalFirePen = new(Color.OrangeRed, 5);
+            Brush concreteBrush = new SolidBrush(Color.LightGray);
+            Brush asphaltBrush = new SolidBrush(Color.DarkGray);
+            Brush marcupBrush = new SolidBrush(Color.White);
+
+            //заливаем область в цвет бетона
+            g.FillRectangle(concreteBrush, 0, 0, _pictureWidth, _pictureHeight);
+
+            for(int i = 0; i < _pictureWidth / _placeSizeWidth - 1; i++)
+            {
+                //линия разметки места
+                for (int j = 2; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth - 20, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 + 5, j * _placeSizeHeight);
+                }
+
+                g.DrawLine(pen, i * _placeSizeWidth - 20, _placeSizeHeight * 2, i * _placeSizeWidth - 20, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+
+            //отрисовка разметки взлётной полосы
+            g.FillRectangle(marcupBrush, _placeSizeWidth * 3 + 10, 0, 185, _pictureHeight);
+            g.FillRectangle(asphaltBrush, _placeSizeWidth * 3 + 15, 0, 175, _pictureHeight);
+            g.DrawLine(marcupPen, _placeSizeWidth * 3 + 190, 0, _placeSizeWidth * 3 + 190, _pictureHeight);
+            g.DrawLine(marcupPen, _placeSizeWidth * 3 + 15, 0, _placeSizeWidth * 3 + 15, _pictureHeight);
+            g.DrawLine(marcupPen, _placeSizeWidth * 3 + 195, 0, _placeSizeWidth * 3 + 195, _pictureHeight);
+            g.DrawLine(marcupPen, _placeSizeWidth * 3 + 10, 0, _placeSizeWidth * 3 + 10, _pictureHeight);
+
+            for (int i = 0; i < _pictureHeight / _placeSizeHeight; ++i) 
+            {
+                g.DrawLine(marcupPen, _placeSizeWidth * 3 + 105, 20 + i * _placeSizeHeight, _placeSizeWidth * 3 + 105, (i + 1) * _placeSizeHeight - 20);
+            }
+
+            for(int i = 0; i < _pictureHeight / 20; i++)
+            {
+                g.DrawLine(signalFirePen, _placeSizeWidth * 3 - 5, 20 + i * _placeSizeHeight / 2, _placeSizeWidth * 3 - 5, (i + 1) * _placeSizeHeight / 2 - 20);
+                g.DrawLine(signalFirePen, _placeSizeWidth * 4, 20 + i * _placeSizeHeight / 2, _placeSizeWidth * 4, (i + 1) * _placeSizeHeight / 2 - 20);
+            }
+
+            //отрисовка сочков
+            Brush pinkBrush = new SolidBrush(Color.LightPink);
+            for(int i = 1; i < 6; i++)
+            {
+                Point[] point = new Point[]
+                {
+                    new Point((i * 70 - 10) + 45, 30),
+                    new Point(i * 70 - 10, 50),
+                    new Point( i * 70 - 10 , 10)
+                };
+                g.FillPolygon(pinkBrush, point);
+
+                g.DrawLine(pen, i * 70 - 10, 10, i * 70 - 10, 80);
+                g.DrawLine(pen, i * 70 - 10, 10, (i * 70 - 10) + 45, 30);
+                g.DrawLine(pen, i * 70 - 10, 50, (i * 70 - 10) + 45, 30);
+
+            }
+        }
+
+        //метод прорисовки объеков
+        public void DrawPlanes(Graphics g)
+        {
+            int currentWidth = 2;
+            int currentHeight = 7;
+
+            foreach (var plane in _setPlanes.GetAirbus())
+            {
+                plane.SetObject(currentWidth * _placeSizeWidth + 20, currentHeight * _placeSizeHeight + 20, _pictureWidth, _pictureHeight);
+                plane.DrawningObject(g);
+
+                if(currentWidth != 0)
+                {
+                    currentWidth--;
+                }
+                else
+                {
+                    currentWidth = 2;
+                    currentHeight--;
+                }
+            }
+        }
+    }
+}

Airbus/Airbus/MapsCollection.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    //класс для хранения коллекции карт
+    internal class MapsCollection
+    {
+        //словарь (хранилище) с картами
+        readonly Dictionary<string, MapWithSetPlanesGeneric<DrawningObjectPlane, AbstractMap>> _mapStorage;
+
+        //возвращение списка названий карт
+        public List<string> Keys => _mapStorage.Keys.ToList();
+
+        //ширина окна отрисовки
+        private readonly int _pictureWidth;
+
+        //высота окна отрисовки
+        private readonly int _pictureHeight;
+
+        //конструктор
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorage = new Dictionary<string, MapWithSetPlanesGeneric<DrawningObjectPlane, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+
+        //добавление карты
+        public void AddMap(string name, AbstractMap map)
+        {
+            var NewElem = new MapWithSetPlanesGeneric<DrawningObjectPlane, AbstractMap>(
+            _pictureWidth, _pictureHeight, map);
+            _mapStorage.Add(name, NewElem);
+        }
+
+        //удаление карты
+        public void DelMap(string name)
+        {
+            _mapStorage.Remove(name);
+        }
+
+        //Доступ к аэродрому
+        public MapWithSetPlanesGeneric<DrawningObjectPlane, AbstractMap> this[string ind]
+        {
+            get
+            {
+                return _mapStorage[ind];
+            }
+        }
+    }
+}

Airbus/Airbus/Program.cs

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

Airbus/Airbus/SetPlanesGeneric.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class SetPlanesGeneric<T>
+        where T: class 
+    {
+        //список объектов, которые храним
+        private readonly List<T> _places;
+
+        //количество объектов в массиве
+        public int Count => _places.Count;
+
+        //ограничение по кол-ву объектов
+        private readonly int _maxCount;
+
+        //конструктор
+        public SetPlanesGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+
+        //добавление объекта в набор
+        public int Insert(T plane)
+        {
+            if (Count + 1 <= _maxCount) return Insert(plane, 0);
+            else return -1;
+        }
+
+        //добавление объекта в набор на конкретную позицию
+        public int Insert(T plane, int position)
+        {
+            if (position >= _maxCount && position < 0)
+            {
+                return -1;
+            }
+
+            _places.Insert(position, plane);
+
+            return position;
+        }
+
+        //удаление объекта из набора с конкретной позиции
+        public T Remove(int position)
+        {
+            if (position < _maxCount && position >= 0)
+            {
+
+                if (_places.ElementAt(position) != null)
+                {
+                    T result = _places.ElementAt(position);
+
+                    _places.RemoveAt(position);
+
+                    return result;
+                }
+
+                return null;
+            }
+
+            return null;
+        }
+
+        //получение объекта из набора по позиции
+        public T this[int position]
+        {
+            get
+            {
+                if (position >= _places.Count || position < 0)
+                {
+                    return null;
+                }
+                else if (_places[position] == null)
+                {
+                    return null;
+                }
+
+                return _places[position];
+            }
+			
+            set
+            {
+                if (position < _maxCount && position >= 0)
+                {
+                    Insert(this[position], position);
+                }
+            }
+        }
+
+        //проход по набору до первого пустого
+        public IEnumerable<T> GetAirbus()
+        {
+            foreach(var plane in _places)
+            {
+                if(plane != null)
+                {
+                    yield return plane;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

Airbus/Airbus/SimpleMap.cs

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

Airbus/Airbus/StarWarsMap.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class StarWarsMap : AbstractMap
+    {
+
+        Random rnd = new Random();
+
+        //цвет выстрела из лазера
+        Color randomColor = new Color();
+
+        //цвет закрытого участка
+        Brush barriedColor;
+
+        //цвет открытого участка
+        Brush roadColor = new SolidBrush(Color.DarkBlue);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        { 
+            randomColor = Color.FromArgb(rnd.Next(256), rnd.Next(256), rnd.Next(256));
+            barriedColor = new SolidBrush(randomColor);
+            g.FillRectangle(barriedColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}