последний вариант

AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs

@@ -3,7 +3,7 @@
 namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
-/// Абстракция компании, хранящий коллекцию военных самолётов
+/// Абстракция компании, хранящий коллекцию автомобилей
 /// </summary>
 public abstract class AbstractCompany
 {
@@ -28,7 +28,7 @@ public abstract class AbstractCompany
     protected readonly int _pictureHeight;
 
     /// <summary>
-    /// Коллекция военных самолётов
+    /// Коллекция автомобилей
     /// </summary>
     protected ICollectionGenericObjects<DrawningMilitaryAircraft>? _collection = null;
 
@@ -42,7 +42,7 @@ public abstract class AbstractCompany
     /// </summary>
     /// <param name="picWidth">Ширина окна</param>
     /// <param name="picHeight">Высота окна</param>
-    /// <param name="collection">Коллекция военных самолётов</param>
+    /// <param name="collection">Коллекция автомобилей</param>
     public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningMilitaryAircraft> collection)
     {
         _pictureWidth = picWidth;

AirFighter/AirFighter/CollectionGenericObjects/Angar.cs

@@ -3,7 +3,7 @@
 namespace ProjectAirFighter.CollectionGenericObjects;
 
 /// <summary>
-/// Реализация абстрактной компании - ангар
+/// Реализация абстрактной компании - каршеринг 
 /// </summary>
 public class Angar : AbstractCompany
 {

AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -31,12 +31,15 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
+        // TODO проверка позиции
         if (position >= Count || position < 0) return null;
         return _collection[position];
     }
 
     public int Insert(T obj)
     {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO вставка в конец набора
         if (Count + 1 > _maxCount) return -1;
         _collection.Add(obj);
         return Count;
@@ -44,6 +47,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj, int position)
     {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
         if (Count + 1 > _maxCount) return -1;
         if (position < 0 || position > Count) return -1;
         _collection.Insert(position, obj);
@@ -52,6 +58,8 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Remove(int position)
     {
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
         if (position < 0 || position > Count) return null;
         T? pos = _collection[position];
         _collection.RemoveAt(position);

AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -42,6 +42,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
+        // TODO проверка позиции
         if (position >= _collection.Length || position < 0)
         { return null; }
         return _collection[position];
@@ -49,6 +50,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj)
     {
+        // TODO вставка в свободное место набора
         int index = 0;
         while (index < _collection.Length)
         {
@@ -65,6 +67,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj, int position)
     {
+        // TODO проверка позиции
+        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+        //		ищется свободное место после этой позиции и идет вставка туда
+        //		если нет после, ищем до
+        // TODO вставка
         if (position >= _collection.Length || position < 0)
         { return -1; }
 
@@ -97,9 +104,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Remove(int position)
     {
+        // TODO проверка позиции
+        // TODO удаление объекта из массива, присвоив элементу массива значение null
         if (position >= _collection.Length || position < 0)
-        {
-            return null;
+        { 
+            return null; 
         }
         T obj = _collection[position];
         _collection[position] = null;

AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -22,7 +22,7 @@ public class StorageCollection<T>
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>(); //вот тут какое-то свойство 
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
     /// <summary>
@@ -32,6 +32,8 @@ public class StorageCollection<T>
     /// <param name="collectionType">тип коллекции</param>
     public void AddCollection(string name, CollectionType collectionType)
     {
+        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+        // TODO Прописать логику для добавления
         if (name == null || _storages.ContainsKey(name)) { return; }
         switch (collectionType)
 
@@ -53,6 +55,7 @@ public class StorageCollection<T>
     /// <param name="name">Название коллекции</param>
     public void DelCollection(string name)
     {
+        // TODO Прописать логику для удаления коллекции
         if (_storages.ContainsKey(name))
             _storages.Remove(name);
     }
@@ -66,6 +69,7 @@ public class StorageCollection<T>
     {
         get
         {
+            // TODO Продумать логику получения объекта
             if (name == null || !_storages.ContainsKey(name)) { return null; }
             return _storages[name];
         }

AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs

@@ -17,24 +17,24 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="wings">Признак наличия доп крыльев</param>
     /// <param name="rockets">Признак наличия ракет</param>
-    public DrawningAirFighter(int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base(70, 70)
+    public DrawningAirFighter (int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base (70, 70)
     {
         EntityMilitaryAircraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets);
     }
 
     public override void DrawTransport(Graphics g)
     {
-        if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter militaryAircraftFighter || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(airFighter.AdditionalColor);
+        Brush additionalBrush = new SolidBrush(militaryAircraftFighter.AdditionalColor);
 
         base.DrawTransport(g);
 
-        if (airFighter.Wings)
+        if (militaryAircraftFighter.Wings)
         {
             Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30);
             Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15);
@@ -53,7 +53,7 @@ public class DrawningAirFighter : DrawningMilitaryAircraft
             g.DrawPolygon(pen, DownWing);
         }
 
-        if (airFighter.Rockets)
+        if (militaryAircraftFighter.Rockets)
         {
             Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5);
             Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5);

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs

@@ -23,22 +23,22 @@ public class DrawningMilitaryAircraft
     private int? _pictureHeight;
 
     /// <summary>
-	/// Левая координата прорисовки  самолёта
+	/// Левая координата прорисовки самолёта
 	/// </summary>
     protected int? _startPosX;
 
     /// <summary>
-	/// Верхняя кооридната прорисовки военного самолёта
+	/// Верхняя кооридната прорисовки самолёта
 	/// </summary>
     protected int? _startPosY;
 
     /// <summary>
-	/// Ширина прорисовки военного самолёта
+	/// Ширина прорисовки самолёта
 	/// </summary>
     private readonly int _drawningMilitaryAircraftWidth = 70;
 
     /// <summary>
-	/// Высота прорисовки военного самолёта
+	/// Высота прорисовки самолёта
 	/// </summary>
     private readonly int _drawningMilitaryAircraftHeight = 70;
 
@@ -79,7 +79,7 @@ public class DrawningMilitaryAircraft
 	/// <param name="speed">Скорость</param>
 	/// <param name="weight">Вес</param>
 	/// <param name="bodyColor">Основной цвет</param>
-    public DrawningMilitaryAircraft(int speed, double weight, Color bodyColor) : this()
+    public DrawningMilitaryAircraft (int speed, double weight, Color bodyColor) : this()
     {
         EntityMilitaryAircraft = new EntityMilitaryAircraft(speed, weight, bodyColor);
     }
@@ -87,9 +87,9 @@ public class DrawningMilitaryAircraft
     /// <summary>
 	/// Конструктор для наследников
 	/// </summary>
-	/// <param name="drawningCarWidth">Ширина прорисовки военного самолёта</param>
-	/// <param name="drawningCarHeight">Высота прорисовки военного самолёта</param>
-    protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this()
+	/// <param name="drawningCarWidth">Ширина прорисовки самолёта</param>
+	/// <param name="drawningCarHeight">Высота прорисовки самолёта</param>
+    protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this() 
     {
         _drawningMilitaryAircraftWidth = drawningMilitaryAircraftWidth;
         _drawningMilitaryAircraftHeight = drawningMilitaryAircraftHeight;

AirFighter/AirFighter/Entities/EntityAirFighter.cs

@@ -7,6 +7,11 @@ public class EntityAirFighter : EntityMilitaryAircraft
 {
     public Color AdditionalColor { get; private set; }
 
+    public void SetAdditionalColor(Color additionalColor)
+    {
+        AdditionalColor = additionalColor;
+    }
+
     public bool Wings { get; private set; }
 
     public bool Rockets { get; private set; }

AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs

@@ -1,7 +1,7 @@
 namespace ProjectAirFighter.Entities;
 
 /// <summary>
-/// Класс-сущность "Военный самолёт"
+/// Класс-сущность "Истребитель"
 /// </summary>
 public class EntityMilitaryAircraft
 {
@@ -11,6 +11,11 @@ public class EntityMilitaryAircraft
 
     public Color BodyColor { get; private set; }
 
+    public void SetBodyColor(Color bodyColor)
+    {
+        BodyColor = bodyColor;
+    }
+
     public double Step => Speed * 100 / Weight;
 
     /// <summary>
@@ -20,7 +25,7 @@ public class EntityMilitaryAircraft
 	/// <param name="weight">Вес автомобиля</param>
 	/// <param name="bodyColor">Основной цвет</param>
 
-    public EntityMilitaryAircraft(int speed, double weight, Color bodyColor)
+    public EntityMilitaryAircraft (int speed, double weight, Color bodyColor)
     {
         Speed = speed;
         Weight = weight;

AirFighter/AirFighter/FormAirFighter.resx

@@ -28,7 +28,7 @@
     </data>
 
     There are any number of "resheader" rows that contain simple
-    name/value pairs.
+    name/value pmilitaryAircrafts.
 
     Each data row contains a name, and value. The row also contains a
     type or mimetype. Type corresponds to a .NET class that support

AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs

@@ -28,77 +28,61 @@
         /// </summary>
         private void InitializeComponent()
         {
-            groupBoxTools = new GroupBox();
-            buttonCreateCompany = new Button();
+            pictureBox = new PictureBox();
             panelStorage = new Panel();
             buttonCollectionDel = new Button();
             listBoxCollection = new ListBox();
             buttonCollectionAdd = new Button();
-            textBoxCollectionName = new TextBox();
-            radioButtonMassive = new RadioButton();
             radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
             labelCollectionName = new Label();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveMilitaryAircraft = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddAirFighter = new Button();
-            buttonAddMilitaryAircraft = new Button();
             comboBoxSelectorCompany = new ComboBox();
-            pictureBox = new PictureBox();
             panelCompanyTools = new Panel();
-            groupBoxTools.SuspendLayout();
-            panelStorage.SuspendLayout();
+            buttonRefresh = new Button();
+            buttonAddMilitaryAircraft = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveAir = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonCreateCompany = new Button();
+            groupBoxTools = new GroupBox();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            panelStorage.SuspendLayout();
             panelCompanyTools.SuspendLayout();
+            groupBoxTools.SuspendLayout();
             SuspendLayout();
             // 
-            // groupBoxTools
+            // pictureBox
             // 
-            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
-            groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(744, 0);
-            groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 667);
-            groupBoxTools.TabIndex = 0;
-            groupBoxTools.TabStop = false;
-            groupBoxTools.Text = "Инструменты";
-            // 
-            // buttonCreateCompany
-            // 
-            buttonCreateCompany.Location = new Point(7, 322);
-            buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(191, 29);
-            buttonCreateCompany.TabIndex = 9;
-            buttonCreateCompany.Text = "Создание компании";
-            buttonCreateCompany.UseVisualStyleBackColor = true;
-            buttonCreateCompany.Click += buttonCreateCompany_Click;
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(712, 602);
+            pictureBox.TabIndex = 3;
+            pictureBox.TabStop = false;
             // 
             // panelStorage
             // 
             panelStorage.Controls.Add(buttonCollectionDel);
             panelStorage.Controls.Add(listBoxCollection);
             panelStorage.Controls.Add(buttonCollectionAdd);
-            panelStorage.Controls.Add(textBoxCollectionName);
-            panelStorage.Controls.Add(radioButtonMassive);
             panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
             panelStorage.Controls.Add(labelCollectionName);
             panelStorage.Dock = DockStyle.Top;
             panelStorage.Location = new Point(3, 23);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(200, 256);
+            panelStorage.Size = new Size(200, 270);
             panelStorage.TabIndex = 8;
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(6, 224);
+            buttonCollectionDel.Location = new Point(7, 239);
             buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(189, 29);
+            buttonCollectionDel.Size = new Size(182, 27);
             buttonCollectionDel.TabIndex = 6;
-            buttonCollectionDel.Text = "Удаление коллекции";
+            buttonCollectionDel.Text = "Удалить коллекцию";
             buttonCollectionDel.UseVisualStyleBackColor = true;
             buttonCollectionDel.Click += buttonCollectionDel_Click;
             // 
@@ -106,32 +90,36 @@
             // 
             listBoxCollection.FormattingEnabled = true;
             listBoxCollection.ItemHeight = 20;
-            listBoxCollection.Location = new Point(6, 131);
+            listBoxCollection.Location = new Point(11, 129);
             listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(189, 84);
+            listBoxCollection.Size = new Size(180, 104);
             listBoxCollection.TabIndex = 5;
             // 
             // buttonCollectionAdd
             // 
-            buttonCollectionAdd.Location = new Point(6, 96);
+            buttonCollectionAdd.Location = new Point(9, 96);
             buttonCollectionAdd.Name = "buttonCollectionAdd";
-            buttonCollectionAdd.Size = new Size(189, 29);
+            buttonCollectionAdd.Size = new Size(182, 27);
             buttonCollectionAdd.TabIndex = 4;
             buttonCollectionAdd.Text = "Добавить коллекцию";
             buttonCollectionAdd.UseVisualStyleBackColor = true;
             buttonCollectionAdd.Click += buttonCollectionAdd_Click;
             // 
-            // textBoxCollectionName
+            // radioButtonList
             // 
-            textBoxCollectionName.Location = new Point(6, 33);
-            textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(189, 27);
-            textBoxCollectionName.TabIndex = 3;
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(117, 66);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(80, 24);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
             // 
             // radioButtonMassive
             // 
             radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(6, 66);
+            radioButtonMassive.Location = new Point(9, 66);
             radioButtonMassive.Name = "radioButtonMassive";
             radioButtonMassive.Size = new Size(82, 24);
             radioButtonMassive.TabIndex = 2;
@@ -139,165 +127,159 @@
             radioButtonMassive.Text = "Массив";
             radioButtonMassive.UseVisualStyleBackColor = true;
             // 
-            // radioButtonList
+            // textBoxCollectionName
             // 
-            radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(115, 66);
-            radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(80, 24);
-            radioButtonList.TabIndex = 1;
-            radioButtonList.TabStop = true;
-            radioButtonList.Text = "Список";
-            radioButtonList.UseVisualStyleBackColor = true;
+            textBoxCollectionName.Location = new Point(9, 33);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(188, 27);
+            textBoxCollectionName.TabIndex = 1;
             // 
             // labelCollectionName
             // 
             labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(17, 10);
+            labelCollectionName.Location = new Point(24, 10);
             labelCollectionName.Name = "labelCollectionName";
             labelCollectionName.Size = new Size(158, 20);
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции:";
             // 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 252);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(192, 49);
-            buttonRefresh.TabIndex = 7;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += buttonRefresh_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 197);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(192, 49);
-            buttonGoToCheck.TabIndex = 6;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += buttonGoToCheck_Click;
-            // 
-            // buttonRemoveMilitaryAircraft
-            // 
-            buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveMilitaryAircraft.Location = new Point(4, 142);
-            buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
-            buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
-            buttonRemoveMilitaryAircraft.TabIndex = 5;
-            buttonRemoveMilitaryAircraft.Text = "Удаление военного самолёта";
-            buttonRemoveMilitaryAircraft.UseVisualStyleBackColor = true;
-            buttonRemoveMilitaryAircraft.Click += buttonRemoveMilitaryAircraft_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 109);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(192, 27);
-            maskedTextBoxPosition.TabIndex = 4;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // 
-            // buttonAddAirFighter
-            // 
-            buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddAirFighter.Location = new Point(3, 54);
-            buttonAddAirFighter.Name = "buttonAddAirFighter";
-            buttonAddAirFighter.Size = new Size(192, 49);
-            buttonAddAirFighter.TabIndex = 2;
-            buttonAddAirFighter.Text = "Добавление истребителя";
-            buttonAddAirFighter.UseVisualStyleBackColor = true;
-            buttonAddAirFighter.Click += buttonAddAirFighter_Click;
-            // 
-            // buttonAddMilitaryAircraft
-            // 
-            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddMilitaryAircraft.Location = new Point(4, 3);
-            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
-            buttonAddMilitaryAircraft.Size = new Size(191, 49);
-            buttonAddMilitaryAircraft.TabIndex = 1;
-            buttonAddMilitaryAircraft.Text = "Добавление военного самолёта";
-            buttonAddMilitaryAircraft.UseVisualStyleBackColor = true;
-            buttonAddMilitaryAircraft.Click += buttonAddMilitaryAircraft_Click;
-            // 
             // comboBoxSelectorCompany
             // 
             comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(7, 285);
+            comboBoxSelectorCompany.Location = new Point(8, 299);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(193, 28);
+            comboBoxSelectorCompany.Size = new Size(182, 28);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
             // 
-            // pictureBox
-            // 
-            pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
-            pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(744, 667);
-            pictureBox.TabIndex = 3;
-            pictureBox.TabStop = false;
-            // 
             // panelCompanyTools
             // 
             panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft);
             panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft);
-            panelCompanyTools.Controls.Add(buttonAddAirFighter);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveAir);
             panelCompanyTools.Controls.Add(maskedTextBoxPosition);
             panelCompanyTools.Dock = DockStyle.Bottom;
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 357);
+            panelCompanyTools.Location = new Point(3, 362);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 307);
+            panelCompanyTools.Size = new Size(200, 237);
             panelCompanyTools.TabIndex = 10;
             // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(6, 199);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(179, 29);
+            buttonRefresh.TabIndex = 7;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
+            // 
+            // buttonAddMilitaryAircraft
+            // 
+            buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddMilitaryAircraft.Location = new Point(5, 12);
+            buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
+            buttonAddMilitaryAircraft.Size = new Size(193, 29);
+            buttonAddMilitaryAircraft.TabIndex = 1;
+            buttonAddMilitaryAircraft.Text = "Добавление самолёта";
+            buttonAddMilitaryAircraft.Click += ButtonAddMilitaryAircraft_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(6, 161);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(194, 29);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
+            // 
+            // buttonRemoveAir
+            // 
+            buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveAir.Location = new Point(9, 110);
+            buttonRemoveAir.Name = "buttonRemoveAir";
+            buttonRemoveAir.Size = new Size(182, 29);
+            buttonRemoveAir.TabIndex = 5;
+            buttonRemoveAir.Text = "Удаление самолёта";
+            buttonRemoveAir.UseVisualStyleBackColor = true;
+            buttonRemoveAir.Click += buttonRemoveAir_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(11, 62);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(194, 27);
+            maskedTextBoxPosition.TabIndex = 4;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(7, 329);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(182, 27);
+            buttonCreateCompany.TabIndex = 9;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += buttonCreateCompany_Click;
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(712, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(206, 602);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
             // FormMilitaryAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(950, 667);
+            ClientSize = new Size(918, 602);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Name = "FormMilitaryAircraftCollection";
-            Text = "Коллекция военных самолётов";
-            groupBoxTools.ResumeLayout(false);
+            Text = "Коллекция самолётов";
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             panelCompanyTools.ResumeLayout(false);
             panelCompanyTools.PerformLayout();
+            groupBoxTools.ResumeLayout(false);
             ResumeLayout(false);
         }
 
         #endregion
-
-        private GroupBox groupBoxTools;
-        private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddAirFighter;
-        private Button buttonAddMilitaryAircraft;
-        private MaskedTextBox maskedTextBoxPosition;
         private PictureBox pictureBox;
-        private Button buttonRefresh;
-        private Button buttonGoToCheck;
-        private Button buttonRemoveMilitaryAircraft;
         private Panel panelStorage;
-        private TextBox textBoxCollectionName;
-        private RadioButton radioButtonMassive;
-        private RadioButton radioButtonList;
-        private Label labelCollectionName;
         private Button buttonCollectionDel;
         private ListBox listBoxCollection;
         private Button buttonCollectionAdd;
-        private Button buttonCreateCompany;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private ComboBox comboBoxSelectorCompany;
         private Panel panelCompanyTools;
+        private Button buttonRefresh;
+        private Button buttonAddMilitaryAircraft;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveAir;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonCreateCompany;
+        private GroupBox groupBoxTools;
     }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.cs

@@ -24,54 +24,35 @@ public partial class FormMilitaryAircraftCollection : Form
         _storageCollection = new();
     }
 
-    /// <summary>
-    /// Выбор компании
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
     private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
         panelCompanyTools.Enabled = false;
     }
 
     /// <summary>
-    /// Добавление самолёта
+    /// Добавление военного самолёта
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void buttonAddMilitaryAircraft_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryAircraft));
+    private void ButtonAddMilitaryAircraft_Click(object sender, EventArgs e)
+    {
+        FormMilitaryAircraftConfig form = new();
+        form.Show();
+        form.AddEvent(SetMilitaryAircraft);
+    }
 
     /// <summary>
-    /// Добавление истребителя
+    /// Добавление военного самолёта в коллекцию
     /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void buttonAddAirFighter_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirFighter));
-
-    private void CreateObject(string type)
+    /// <param name="militaryAircraft"></param>
+    private void SetMilitaryAircraft(DrawningMilitaryAircraft? militaryAircraft)
     {
-        if (_company == null)
+        if (_company == null || militaryAircraft == null)
         {
             return;
         }
 
-        Random random = new();
-        DrawningMilitaryAircraft drawningMilitaryAircraft;
-        switch (type)
-        {
-            case nameof(DrawningMilitaryAircraft):
-                drawningMilitaryAircraft = new DrawningMilitaryAircraft(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                break;
-            case nameof(DrawningAirFighter):
-                drawningMilitaryAircraft = new DrawningAirFighter(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random), GetColor(random),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                break;
-            default:
-                return;
-        }
-
-        if (_company + drawningMilitaryAircraft != -1)
+        if (_company + militaryAircraft != -1)
         {
             MessageBox.Show("Объект добавлен");
             pictureBox.Image = _company.Show();
@@ -82,30 +63,12 @@ public partial class FormMilitaryAircraftCollection : Form
         }
     }
 
-    /// <summary>
-	/// Получение цвета
-	/// </summary>
-	/// <param name="random">Генератор случайных чисел</param>
-	/// <returns></returns>
-	private static Color GetColor(Random random)
-    {
-        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-        ColorDialog dialog = new();
-        if (dialog.ShowDialog() == DialogResult.OK)
-        {
-            color = dialog.Color;
-        }
-
-        return color;
-    }
-
-
     /// <summary>
     /// Удаление объекта
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    private void buttonRemoveMilitaryAircraft_Click(object sender, EventArgs e)
+    private void buttonRemoveAir_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
         {
@@ -180,6 +143,11 @@ public partial class FormMilitaryAircraftCollection : Form
         pictureBox.Image = _company.Show();
     }
 
+    /// <summary>
+    /// Добавление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void buttonCollectionAdd_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
@@ -201,7 +169,11 @@ public partial class FormMilitaryAircraftCollection : Form
         _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
         RerfreshListBoxItems();
     }
-
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void buttonCollectionDel_Click(object sender, EventArgs e)
     {
         if (listBoxCollection.SelectedItem == null)
@@ -217,6 +189,9 @@ public partial class FormMilitaryAircraftCollection : Form
         RerfreshListBoxItems();
     }
 
+    /// <summary>
+    /// Обновление списка в listBoxCollection
+    /// </summary>
     private void RerfreshListBoxItems()
     {
         listBoxCollection.Items.Clear();
@@ -231,6 +206,12 @@ public partial class FormMilitaryAircraftCollection : Form
 
     }
 
+
+    /// <summary>
+    /// Создание компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
     private void buttonCreateCompany_Click(object sender, EventArgs e)
     {
         if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)

AirFighter/AirFighter/FormMilitaryAircraftConfig.Designer.cs

@@ -0,0 +1,357 @@
+namespace ProjectAirFighter
+{
+    partial class FormMilitaryAircraftConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelBlueViolet = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxRockets = new CheckBox();
+            checkBoxWings = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxRockets);
+            groupBoxConfig.Controls.Add(checkBoxWings);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(604, 207);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelBlueViolet);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(347, 12);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(250, 125);
+            groupBoxColors.TabIndex = 1;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelBlueViolet
+            // 
+            panelBlueViolet.BackColor = Color.BlueViolet;
+            panelBlueViolet.Location = new Point(196, 83);
+            panelBlueViolet.Name = "panelBlueViolet";
+            panelBlueViolet.Size = new Size(36, 36);
+            panelBlueViolet.TabIndex = 9;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(136, 83);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(36, 36);
+            panelBlack.TabIndex = 11;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(77, 83);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(36, 36);
+            panelGray.TabIndex = 10;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(15, 83);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(36, 36);
+            panelWhite.TabIndex = 9;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(196, 26);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(36, 36);
+            panelYellow.TabIndex = 9;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(136, 26);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(36, 36);
+            panelBlue.TabIndex = 9;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(77, 26);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(36, 36);
+            panelGreen.TabIndex = 9;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(15, 26);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(36, 36);
+            panelRed.TabIndex = 8;
+            // 
+            // checkBoxRockets
+            // 
+            checkBoxRockets.AutoSize = true;
+            checkBoxRockets.Location = new Point(6, 154);
+            checkBoxRockets.Name = "checkBoxRockets";
+            checkBoxRockets.Size = new Size(339, 24);
+            checkBoxRockets.TabIndex = 7;
+            checkBoxRockets.Text = "Признак наличия дополнительных крыльев";
+            checkBoxRockets.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxWings
+            // 
+            checkBoxWings.AutoSize = true;
+            checkBoxWings.Location = new Point(6, 124);
+            checkBoxWings.Name = "checkBoxWings";
+            checkBoxWings.Size = new Size(318, 24);
+            checkBoxWings.TabIndex = 6;
+            checkBoxWings.Text = "Признак наличия дополнительных ракет";
+            checkBoxWings.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(102, 75);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(126, 27);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 75);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(102, 32);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(126, 27);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 34);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(466, 154);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(113, 36);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(347, 154);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(113, 36);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(3, 49);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(185, 99);
+            pictureBoxObject.TabIndex = 0;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(610, 166);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(85, 29);
+            buttonAdd.TabIndex = 1;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(716, 166);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(85, 29);
+            buttonCancel.TabIndex = 2;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(610, 0);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(191, 160);
+            panelObject.TabIndex = 3;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(100, 9);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(88, 36);
+            labelAdditionalColor.TabIndex = 2;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += LabelColors_DragDrop;
+            labelAdditionalColor.DragEnter += LabelColors_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(3, 9);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(88, 36);
+            labelBodyColor.TabIndex = 1;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += LabelColors_DragDrop;
+            labelBodyColor.DragEnter += LabelColors_DragEnter;
+            // 
+            // FormMilitaryAircraftConfig
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 207);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormMilitaryAircraftConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private CheckBox checkBoxRockets;
+        private CheckBox checkBoxWings;
+        private GroupBox groupBoxColors;
+        private Panel panelRed;
+        private Panel panelBlueViolet;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

AirFighter/AirFighter/FormMilitaryAircraftConfig.cs

@@ -0,0 +1,169 @@
+using ProjectAirFighter.Drawnings;
+using ProjectAirFighter.Entities;
+namespace ProjectAirFighter;
+
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormMilitaryAircraftConfig : Form
+{
+    /// <summary>
+    /// Объект - прорисовка автомобиля
+    /// </summary>
+    private DrawningMilitaryAircraft? _militaryAircraft;
+
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    private event Action<DrawningMilitaryAircraft>? MilitaryAircraftDelegate;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormMilitaryAircraftConfig()
+    {
+        InitializeComponent();
+        panelRed.MouseDown += Panel_MouseDown;
+        panelGreen.MouseDown += Panel_MouseDown;
+        panelBlue.MouseDown += Panel_MouseDown;
+        panelYellow.MouseDown += Panel_MouseDown;
+        panelWhite.MouseDown += Panel_MouseDown;
+        panelGray.MouseDown += Panel_MouseDown;
+        panelBlack.MouseDown += Panel_MouseDown;
+        panelBlueViolet.MouseDown += Panel_MouseDown;
+
+        buttonCancel.Click += (sender, e) => Close();
+    }
+
+    /// <summary>
+    /// Привязка внешнего метода к событию
+    /// </summary>
+    /// <param name="militaryAircraftDelegate"></param>
+    public void AddEvent(Action<DrawningMilitaryAircraft> militaryAircraftDelegate)
+    {
+        MilitaryAircraftDelegate += militaryAircraftDelegate;
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _militaryAircraft.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _militaryAircraft?.SetPosition(15, 15);
+        _militaryAircraft?.DrawTransport(gr);
+        pictureBoxObject.Image = bmp;
+    }
+
+    /// <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 ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+    /// Проверка получаемой информации (ее типа на соответствие требуемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void PanelObject_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : 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":
+                _militaryAircraft = new DrawningMilitaryAircraft((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.Black);
+                break;
+            case "labelModifiedObject":
+                _militaryAircraft = new DrawningAirFighter((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                    Color.Black, checkBoxRockets.Checked, checkBoxWings.Checked);
+                break;
+        }
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Передаем информацию при нажатии на Panel
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>2
+    private void Panel_MouseDown(object sender, MouseEventArgs e)
+    {
+        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+
+
+
+    /// <summary>
+    /// Проверка получаемой информации (ее типа на соответствие требуемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelColors_DragEnter(object sender, DragEventArgs e)
+    {
+        e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+    }
+
+    /// <summary>
+    /// Действия при приеме перетаскиваемой информации
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LabelColors_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_militaryAircraft == null)
+        {
+            return;
+        }
+        Label label = (Label)sender;
+        Color newColor = (Color)e.Data.GetData(typeof(Color).ToString());
+        switch (label.Name)
+        {
+            case "labelBodyColor":
+                _militaryAircraft.EntityMilitaryAircraft.SetBodyColor(newColor);
+                DrawObject();
+                break;
+            case "labelAdditionalColor":
+                if (_militaryAircraft is DrawningAirFighter)
+                {
+                    (_militaryAircraft.EntityMilitaryAircraft as EntityAirFighter).SetAdditionalColor(newColor);
+                    DrawObject();
+                }
+                break;
+        }
+    }
+
+
+    //конец туду
+
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAdd_Click(object sender, EventArgs e)
+    {
+        if (_militaryAircraft != null)
+        {
+            MilitaryAircraftDelegate?.Invoke(_militaryAircraft);
+            Close();
+        }
+    }
+}

AirFighter/AirFighter/FormMilitaryAircraftConfig.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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>

AirFighter/AirFighter/MilitaryAircraftDelegate.cs

@@ -0,0 +1,9 @@
+using ProjectAirFighter.Drawnings;
+
+namespace ProjectAirFighter;
+
+/// <summary>
+/// Делегат передачи объекта класса-прорисовки
+/// </summary>
+/// <param name="militaryAircraft"></param>
+public delegate void MilitaryAircraftDelegate(DrawningMilitaryAircraft militaryAircraft);

AirFighter/AirFighter/MovementStrategy/MoveToBorder.cs

@@ -10,10 +10,8 @@ public class MoveToBorder : AbstractStrategy
             return false;
         }
 
-        return objParams.RightBorder <= FieldWidth &&
-            objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder <= FieldHeight &&
-            objParams.DownBorder + GetStep() >= FieldHeight;
+        return objParams.RightBorder <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+            objParams.DownBorder <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
     }
 
     protected override void MoveToTarget()

AirFighter/AirFighter/MovementStrategy/MoveToCenter.cs

@@ -13,9 +13,9 @@ public class MoveToCenter : AbstractStrategy
             return false;
         }
 
-        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 &&
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && 
             objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && 
             objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
     }
 

AirFighter/AirFighter/MovementStrategy/MoveableMilitaryAircraft.cs

@@ -3,7 +3,7 @@
 namespace ProjectAirFighter.MovementStrategy;
 
 /// <summary>
-/// Класс-реализация IMoveableObject с использованием DrawningMilitaryAircraft
+/// Класс-реализация IMoveableObject с использованием DrawningCar
 /// </summary>
 public class MoveableMilitaryAircraft : IMoveableObject
 {

AirFighter/AirFighter/Properties/Resources.resx

@@ -28,7 +28,7 @@
     </data>
                 
     There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pmilitaryAircrafts.
     
     Each data row contains a name, and value. The row also contains a 
     type or mimetype. Type corresponds to a .NET class that support