From 66ada06a40bc534ba07bcc04387b26517ddfac65 Mon Sep 17 00:00:00 2001
From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com>
Date: Sun, 19 May 2024 22:23:08 +0400
Subject: [PATCH] =?UTF-8?q?labWork=5F5=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	ProjectTank/ProjectTank/FormBattleTankCollection.cs
#	ProjectTank/ProjectTank/FormTankConfig.cs
---
 .../ProjectTank/FormBattleTankCollection.cs   | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.cs
index 51c762e..d81e1d2 100644
--- a/ProjectTank/ProjectTank/FormBattleTankCollection.cs
+++ b/ProjectTank/ProjectTank/FormBattleTankCollection.cs
@@ -67,15 +67,20 @@ namespace ProjectTank
             {
                 return;
             }
-            FormTankConfig form = new();
-            form.AddEvent(SetTank);
-            form.Show();
+
+            return color;
         }
-        /// <summary>
-        /// Удаление танка
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+
+        private void ButtonAddTank_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningTank));
+        }
+
+        private void ButtonAddBattleTank_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningBattleTank));
+        }
+
         private void buttonRemoveTank_Click(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) return;