From 3290b589552abd883668c1a5dc1b94f0828a9dad Mon Sep 17 00:00:00 2001
From: Danil Kargin <danilkargin16@gmail.com>
Date: Sat, 29 Oct 2022 18:17:32 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BA=D0=BE=D0=BD=D1=87=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AirFighter/AirFighter/FormAirFighter.cs       | 24 +++++++++++--
 .../MapWithSetAirFightersGeneric.cs           |  6 ++--
 .../AirFighter/SetAirFightersGeneric.cs       | 36 +++++--------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/AirFighter/AirFighter/FormAirFighter.cs b/AirFighter/AirFighter/FormAirFighter.cs
index d4ecf43..a8bec1a 100644
--- a/AirFighter/AirFighter/FormAirFighter.cs
+++ b/AirFighter/AirFighter/FormAirFighter.cs
@@ -40,7 +40,13 @@ namespace AirFighter
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new Random();
-            _airFighter = new DrawningAirFighter(rnd.Next(200, 500), rnd.Next(2000, 5000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            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;
+            }
+            _airFighter = new DrawningAirFighter(rnd.Next(200, 500), rnd.Next(2000, 5000), color);
             SetData();
             Draw();
         }
@@ -87,8 +93,20 @@ namespace AirFighter
         private void ButtonUpgrade_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _airFighter = new DrawningUpgradeAirFighter(rnd.Next(300, 600), rnd.Next(2000, 5000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+            _airFighter = new DrawningUpgradeAirFighter(rnd.Next(300, 600), rnd.Next(2000, 5000), color,
+                dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
             SetData();
             Draw();
         }
diff --git a/AirFighter/AirFighter/MapWithSetAirFightersGeneric.cs b/AirFighter/AirFighter/MapWithSetAirFightersGeneric.cs
index 4fadcae..3f8684e 100644
--- a/AirFighter/AirFighter/MapWithSetAirFightersGeneric.cs
+++ b/AirFighter/AirFighter/MapWithSetAirFightersGeneric.cs
@@ -129,10 +129,10 @@ namespace AirFighter
                 {
                     for (; j > i; j--)
                     {
-                        var car = _setAirFighters.Get(j);
-                        if (car != null)
+                        var airFighter = _setAirFighters.Get(j);
+                        if (airFighter != null)
                         {
-                            _setAirFighters.Insert(car, i);
+                            _setAirFighters.Insert(airFighter, i);
                             _setAirFighters.Remove(j);
                             break;
                         }
diff --git a/AirFighter/AirFighter/SetAirFightersGeneric.cs b/AirFighter/AirFighter/SetAirFightersGeneric.cs
index b96994a..4496e04 100644
--- a/AirFighter/AirFighter/SetAirFightersGeneric.cs
+++ b/AirFighter/AirFighter/SetAirFightersGeneric.cs
@@ -57,29 +57,7 @@ namespace AirFighter
         /// <returns></returns>
         public int Insert(T airFighter)
         {
-            if (!CheckNullPosition(0))
-            {
-                return -1;
-            }
-            else
-            {
-                T temp = airFighter;
-                for(int i = 0; i < _places.Length; i++)
-                {
-                    if (_places[i] == null)
-                    {
-                        _places[i] = temp;
-                        break;
-                    }
-                    else
-                    {
-                        T temp2 = _places[i];
-                        _places[i] = temp;
-                        temp = temp2;
-                    }
-                }
-                return 0;
-            }
+           return Insert(airFighter, 0);
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -89,6 +67,10 @@ namespace AirFighter
         /// <returns></returns>
         public int Insert(T airFighter, int position)
         {
+            if(airFighter == null)
+            {
+                return -1;
+            }
             if (_places[position] == null)
             {
                 _places[position] = airFighter;
@@ -97,19 +79,19 @@ namespace AirFighter
             {
                 if(CheckNullPosition(position + 1))
                 {
-                    T temp = airFighter;
+                    T tempMain = airFighter;
                     for (int i = position; i < _places.Length; i++)
                     {
                         if (_places[i] == null)
                         {
-                            _places[i] = temp;
+                            _places[i] = tempMain;
                             break;
                         }
                         else
                         {
                             T temp2 = _places[i];
-                            _places[i] = temp;
-                            temp = temp2;
+                            _places[i] = tempMain;
+                            tempMain = temp2;
                         }
                     }
                 }