From d59414bed400d3f7465a647033560525895c3d09 Mon Sep 17 00:00:00 2001
From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com>
Date: Sat, 6 Apr 2024 14:14:10 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CollectionGenericObjects/AbstractCompany.cs     |  6 +++---
 .../MassiveGenericObjects.cs                        | 13 ++-----------
 .../CollectionGenericObjects/TankBase.cs            |  4 ++--
 .../ProjectTank/Drawning/DrawningBattleTank.cs      |  2 +-
 ProjectTank/ProjectTank/FormBattleTankCollection.cs |  8 ++++----
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs
index 09e1d06..b8b8f2f 100644
--- a/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs
@@ -2,7 +2,7 @@
 using ProjectTank.CollectionGenericObjects;
 
 /// <summary>
-/// Абстракция компании, хранящий коллекцию автомобилей
+/// Абстракция компании, хранящий Танковую базу
 /// </summary>
 public abstract class AbstractCompany
 {
@@ -27,7 +27,7 @@ public abstract class AbstractCompany
     protected readonly int _pictureHeight;
 
     /// <summary>
-    /// Коллекция автомобилей
+    /// Танковая база
     /// </summary>
     protected ICollectionGenericObjects<DrawningTank>? _collection = null;
 
@@ -41,7 +41,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<DrawningTank> collection)
     {
         _pictureWidth = picWidth;
diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs
index 4326cf4..f4fef06 100644
--- a/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -35,17 +35,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Insert(T obj)
     {
-        // вставка в свободное место набора
-        for (int i = 0; i < Count; i++)
-        {
-            if (_collection[i] == null)
-            {
-                _collection[i] = obj;
-                return i;
-            }
-        }
-
-        return -1;
+        // вставка в свободное место набора 
+       return Insert(obj, 0);
     }
 
     public int Insert(T obj, int position)
diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/TankBase.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/TankBase.cs
index 33919ad..3840c02 100644
--- a/ProjectTank/ProjectTank/CollectionGenericObjects/TankBase.cs
+++ b/ProjectTank/ProjectTank/CollectionGenericObjects/TankBase.cs
@@ -13,7 +13,7 @@ namespace ProjectTank.CollectionGenericObjects
             int width = _pictureWidth / _placeSizeWidth;
             int height = _pictureHeight / _placeSizeHeight;
             Pen pen = new(Color.Black, 2);
-            for (int i = 0; i < width; i++)
+            for (int i = 0; i < width+1; i++)
             {
                 for (int j = 0; j < height + 1; ++j)
                 {
@@ -39,7 +39,7 @@ namespace ProjectTank.CollectionGenericObjects
                     _collection.Get(i)?.SetPosition(_placeSizeWidth * TankWidth + 20, TankHeight * _placeSizeHeight + 5);
                 }
 
-                if (TankWidth < width - 1)
+                if (TankWidth < width)
                     TankWidth++;
                 else
                 {
diff --git a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs
index 289bdec..f090df9 100644
--- a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs
+++ b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs
@@ -1,4 +1,4 @@
-namespace ProjectTank.Drawning;
+namespace ProjectTank.Drawning;
 /// <summary>
 /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
 /// </summary>
diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.cs
index 96e3df3..0457743 100644
--- a/ProjectTank/ProjectTank/FormBattleTankCollection.cs
+++ b/ProjectTank/ProjectTank/FormBattleTankCollection.cs
@@ -4,12 +4,12 @@ using ProjectTank.Drawning;
 namespace ProjectTank
 {
     /// <summary>
-    /// 
+    /// Форма работы с компанией и её коллекцией
     /// </summary>
     public partial class FormBattleTankCollection : Form
     {
         /// <summary>
-        /// 
+        /// Компания
         /// </summary>
         private AbstractCompany? _company = null;
 
@@ -22,7 +22,7 @@ namespace ProjectTank
         }
 
         /// <summary>
-        /// 
+        /// Выбор компании
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -123,7 +123,7 @@ namespace ProjectTank
             if (_company == null) return;
 
             DrawningTank? tank = null;
-            int coutner = 1;
+            int coutner = 100;
 
             while (tank == null)
             {