в

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,115 @@
+using ProjectArtilleryUnit.Drawnings;
+
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    /// <summary>
+    /// Абстракция компании, хранящий коллекцию автомобилей
+    /// </summary>
+    public abstract class AbstractCompany
+    {
+        /// <summary>
+        /// Размер места (ширина)
+        /// </summary>
+        protected readonly int _placeSizeWidth = 180;
+
+        /// <summary>
+        /// Размер места (высота)
+        /// </summary>
+        protected readonly int _placeSizeHeight = 70;
+
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        protected readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        protected readonly int _pictureHeight;
+
+        /// <summary>
+        /// Коллекция танков
+        /// </summary>
+        protected ICollectionGenericObjects<DrawningArtilleryUnit>? _collection = null;
+
+        /// <summary>
+        /// Вычисление максимального количества элементов, который можно разместить в окне
+        /// </summary>
+        private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth">Ширина окна</param>
+        /// <param name="picHeight">Высота окна</param>
+        /// <param name="collection">Коллекция автомобилей</param>
+        public AbstractCompany(int picWidth, int picHeight,
+        ICollectionGenericObjects<DrawningArtilleryUnit> collection)
+        {
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = collection;
+            _collection.SetMaxCount = GetMaxCount;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="сruiser">Добавляемый объект</param>
+        /// <returns></returns>
+        public static int operator +(AbstractCompany company, DrawningArtilleryUnit  сruiser)
+        {
+            return company._collection.Insert(сruiser);
+        }
+
+        /// <summary>
+        /// Перегрузка оператора удаления для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="position">Номер удаляемого объекта</param>
+        /// <returns></returns>
+        public static DrawningArtilleryUnit operator -(AbstractCompany company, int position)
+        {
+            return company._collection?.Remove(position);
+        }
+
+        /// <summary>
+        /// Получение случайного объекта из коллекции
+        /// </summary>
+        /// <returns></returns>
+        public DrawningArtilleryUnit? GetRandomObject()
+        {
+            Random rnd = new();
+            return _collection?.Get(rnd.Next(GetMaxCount));
+        }
+
+        /// <summary>
+        /// Вывод всей коллекции
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap? Show()
+        {
+            Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+            Graphics graphics = Graphics.FromImage(bitmap);
+            DrawBackgound(graphics);
+            SetObjectsPosition();
+            for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+            {
+                DrawningArtilleryUnit? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            return bitmap;
+        }
+        /// <summary>
+        /// Вывод заднего фона
+        /// </summary>
+        /// <param name="g"></param>
+        protected abstract void DrawBackgound(Graphics g);
+
+        /// <summary>
+        /// Расстановка объектов
+        /// </summary>
+        protected abstract void SetObjectsPosition();
+    }
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ArtilleryUnitDockingService.cs

@@ -0,0 +1,65 @@
+using ProjectArtilleryUnit.Drawnings;
+
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    /// <summary>
+    /// Реализация абстрактной компании - каршеринг
+    /// </summary>
+    public class ArtilleryUnitDockingService : AbstractCompany
+    {
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="collection"></param>
+        public ArtilleryUnitDockingService(int picWidth, int picHeight,
+        ICollectionGenericObjects<DrawningArtilleryUnit> collection) : base(picWidth, picHeight, collection)
+        {
+        }
+        protected override void DrawBackgound(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+            Pen pen = new(Color.Black, 2);
+            for (int i = 0; i < width + 1; i++)
+            {
+                for (int j = 0; j < height + 1; ++j)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 20, j * _placeSizeHeight);
+                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth - 20, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 20, j * _placeSizeHeight + _placeSizeHeight);
+                }
+            }
+        }
+        protected override void SetObjectsPosition()
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+
+            int curWidth = 0;
+            int curHeight = 0;
+
+            for (int i = 0; i < (_collection?.Count ?? 0); i++)
+            {
+                if (_collection.Get(i) != null)
+                {
+                    _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                    _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 10, curHeight * _placeSizeHeight + 10);
+                }
+
+                if (curWidth < width )
+                    curWidth++;
+                else
+                {
+                    curWidth = 0; 
+                    curHeight ++;
+                }
+
+                if (curHeight >= height)
+                {
+                    return;
+                }
+            }
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,18 @@
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    public enum CollectionType
+    {
+        /// <summary>
+        /// Неопределено
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Массив
+        /// </summary>
+        Massive = 1,
+        /// <summary>
+        /// Список
+        /// </summary>
+        List = 2
+    }
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,50 @@
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    /// <summary>
+    /// Интерфейс описания действий для набора хранимых объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public interface ICollectionGenericObjects<T>
+    where T : class
+    {
+        /// <summary>
+        /// Количество объектов в коллекции
+        /// </summary>
+        int Count { get; }
+
+        /// <summary>
+        /// Установка максимального количества элементов
+        /// </summary>
+        int SetMaxCount { set; }
+
+        /// <summary>
+        /// Добавление объекта в коллекцию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        int Insert(T obj);
+
+        /// <summary>
+        /// Добавление объекта в коллекцию на конкретную позицию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        int Insert(T obj, int position);
+
+        /// <summary>
+        /// Удаление объекта из коллекции с конкретной позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+        T? Remove(int position);
+
+        /// <summary>
+        /// Получение объекта по позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>Объект</returns>
+        T? Get(int position);
+    }
+
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,65 @@
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T?> _collection;
+        /// <summary>
+        /// Максимально допустимое число объектов в списке
+        /// </summary>
+        private int _maxCount;
+        public int Count => _collection.Count;
+        public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public ListGenericObjects()
+        {
+            _collection = new();
+        }
+        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 == _maxCount) return -1;
+            _collection.Add(obj);
+            return Count;
+        }
+
+        public int Insert(T obj, int position)
+        {
+            // TODO проверка, что не превышено максимальное количество элементов
+            // TODO проверка позиции
+            // TODO вставка по позиции
+            if (Count == _maxCount) return -1;
+            if (position >= Count || position < 0) return -1;
+            _collection.Insert(position, obj);
+            return position;
+
+        }
+
+        public T Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из списка
+            if (position >= Count || position < 0) return null;
+            T obj = _collection[position];
+            _collection.RemoveAt(position);
+            return obj;
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,115 @@
+using ProjectArtilleryUnit.Drawnings;
+
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private T?[] _collection;
+        public int Count => _collection.Length;
+        public int SetMaxCount
+        {
+            set
+            {
+                if (value > 0)
+                {
+                    if (_collection.Length > 0)
+                    {
+                        Array.Resize(ref _collection, value);
+                    }
+                    else
+                    {
+                        _collection = new T?[value];
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public MassiveGenericObjects()
+        {
+            _collection = Array.Empty<T?>();
+        }
+        public T? Get(int position)
+        {
+            // TODO проверка позиции
+            if (position >= _collection.Length || position < 0)
+            { return null; }
+            return _collection[position];
+        }
+
+        public int Insert(T obj)
+        {
+            // TODO вставка в свободное место набора
+            int index = 0;
+            while (index < _collection.Length)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+
+                index++;
+            }
+            return -1;
+        }
+
+        public int Insert(T obj, int position)
+        {
+            // TODO проверка позиции
+            // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+            //		ищется свободное место после этой позиции и идет вставка туда
+            //		если нет после, ищем до
+            // TODO вставка
+            if (position >= _collection.Length || position < 0)
+            { return -1; }
+
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return position;
+            }
+            int index;
+
+            for (index = position + 1; index < _collection.Length; ++index)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[position] = obj;
+                    return position;
+                }
+            }
+
+            for (index = position - 1; index >= 0; --index)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[position] = obj;
+                    return position;
+                }
+            }
+            return -1;
+        }
+
+        public T Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из массива, присвоив элементу массива значение null
+            if (position >= _collection.Length || position < 0)
+            { return null; }
+            T obj = _collection[position];
+            _collection[position] = null;
+            return obj;
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,73 @@
+namespace ProjectArtilleryUnit.CollectionGenericObjects
+{
+    // Класс-хранилище коллекций
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class StorageCollection<T>
+        where T : class
+    {
+        /// <summary>
+        /// Словарь (хранилище) с коллекциями
+        /// </summary>
+        readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+        /// <summary>
+        /// Возвращение списка названий коллекций
+        /// </summary>
+        public List<string> Keys => _storages.Keys.ToList();
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public StorageCollection()
+        {
+            _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        }
+
+        /// <summary>
+        /// Добавление коллекции в хранилище
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        /// <param name="collectionType">тип коллекции</param>
+        public void AddCollection(string name, CollectionType collectionType)
+        {
+            // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+            // TODO Прописать логику для добавления
+
+            if (_storages.ContainsKey(name)) return;
+
+            if (collectionType == CollectionType.None) return;
+            else if (collectionType == CollectionType.Massive)
+                _storages[name] = new MassiveGenericObjects<T>();
+            else if (collectionType == CollectionType.List)
+                _storages[name] = new ListGenericObjects<T>();
+        }
+
+        /// <summary>
+        /// Удаление коллекции
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        public void DelCollection(string name)
+        {
+            // TODO Прописать логику для удаления коллекции
+            if (_storages.ContainsKey(name))
+                _storages.Remove(name);
+        }
+
+        /// <summary>
+        /// Доступ к коллекции
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        /// <returns></returns>
+        public ICollectionGenericObjects<T>? this[string name]
+        {
+            get
+            {
+                // TODO Продумать логику получения объекта
+                if (_storages.ContainsKey(name))
+                    return _storages[name];
+                return null;
+            }
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/Drawnings/DrawningMilitaryArtilleryUnit.cs

@@ -14,14 +14,14 @@ namespace ProjectArtilleryUnit.Drawnings
         /// <param name="weight">Вес</param>
         /// <param name="bodyColor">Основной цвет</param>
         /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="helicopterArea">Признак наличия вертолетной площадки</param>
-        /// <param name="gun">Признак наличия шлюпок</param>
-        /// <param name="luke">Признак наличия пушки</param>
+        /// <param name="muzzle">Признак наличия дула</param>
+        /// <param name="gun">Признак наличия ракетной установки</param>
+        /// <param name="luke">Признак наличия люка</param>
 
-        public DrawningMilitaryArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool helicopterArea, bool gun, bool luke)
+        public DrawningMilitaryArtilleryUnit(int speed, double weight, Color bodyColor, Color additionalColor, bool muzzle, bool gun, bool luke)
             : base(150, 50)
         {
-            EntityArtilleryUnit = new EntityMilitaryArtilleryUnit(speed, weight, bodyColor, additionalColor, helicopterArea, gun, luke);
+            EntityArtilleryUnit = new EntityMilitaryArtilleryUnit(speed, weight, bodyColor, additionalColor, muzzle, gun, luke);
         }
 
         public override void DrawTransport(Graphics g)

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.Designer.cs

@@ -30,13 +30,11 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormArtilleryUnit));
             pictureBoxArtilleryUnit = new PictureBox();
-            button1 = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
             buttonLeft = new Button();
             comboBoxStrategy = new ComboBox();
-            buttonCretaeArtilleryUnit = new Button();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).BeginInit();
             SuspendLayout();
@@ -45,34 +43,20 @@
             // 
             pictureBoxArtilleryUnit.Dock = DockStyle.Fill;
             pictureBoxArtilleryUnit.Location = new Point(0, 0);
-            pictureBoxArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
             pictureBoxArtilleryUnit.Name = "pictureBoxArtilleryUnit";
-            pictureBoxArtilleryUnit.Size = new Size(700, 338);
+            pictureBoxArtilleryUnit.Size = new Size(800, 450);
             pictureBoxArtilleryUnit.SizeMode = PictureBoxSizeMode.AutoSize;
             pictureBoxArtilleryUnit.TabIndex = 0;
             pictureBoxArtilleryUnit.TabStop = false;
             // 
-            // button1
-            // 
-            button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            button1.Location = new Point(10, 307);
-            button1.Margin = new Padding(3, 2, 3, 2);
-            button1.Name = "button1";
-            button1.Size = new Size(269, 22);
-            button1.TabIndex = 1;
-            button1.Text = "создать военную артиллерийскую установку";
-            button1.UseVisualStyleBackColor = true;
-            button1.Click += ButtonCreateArtilleryUnit_Click;
-            // 
             // buttonUp
             // 
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage");
             buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.Location = new Point(632, 280);
-            buttonUp.Margin = new Padding(3, 2, 3, 2);
+            buttonUp.Location = new Point(722, 373);
             buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(26, 22);
+            buttonUp.Size = new Size(30, 30);
             buttonUp.TabIndex = 2;
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
@@ -82,10 +66,9 @@
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage");
             buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.Location = new Point(632, 307);
-            buttonDown.Margin = new Padding(3, 2, 3, 2);
+            buttonDown.Location = new Point(722, 409);
             buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(26, 22);
+            buttonDown.Size = new Size(30, 30);
             buttonDown.TabIndex = 3;
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.Click += ButtonMove_Click;
@@ -95,10 +78,9 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage");
             buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.Location = new Point(663, 307);
-            buttonRight.Margin = new Padding(3, 2, 3, 2);
+            buttonRight.Location = new Point(758, 409);
             buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(26, 22);
+            buttonRight.Size = new Size(30, 30);
             buttonRight.TabIndex = 4;
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
@@ -108,10 +90,9 @@
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
             buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.Location = new Point(600, 307);
-            buttonLeft.Margin = new Padding(3, 2, 3, 2);
+            buttonLeft.Location = new Point(686, 409);
             buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(26, 22);
+            buttonLeft.Size = new Size(30, 30);
             buttonLeft.TabIndex = 5;
             buttonLeft.UseVisualStyleBackColor = true;
             buttonLeft.Click += ButtonMove_Click;
@@ -122,30 +103,16 @@
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxStrategy.FormattingEnabled = true;
             comboBoxStrategy.Items.AddRange(new object[] { "к центру", "к краю" });
-            comboBoxStrategy.Location = new Point(557, 9);
-            comboBoxStrategy.Margin = new Padding(3, 2, 3, 2);
+            comboBoxStrategy.Location = new Point(637, 12);
             comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(133, 23);
+            comboBoxStrategy.Size = new Size(151, 28);
             comboBoxStrategy.TabIndex = 6;
             // 
-            // buttonCretaeArtilleryUnit
-            // 
-            buttonCretaeArtilleryUnit.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCretaeArtilleryUnit.Location = new Point(285, 307);
-            buttonCretaeArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
-            buttonCretaeArtilleryUnit.Name = "buttonCretaeArtilleryUnit";
-            buttonCretaeArtilleryUnit.Size = new Size(224, 23);
-            buttonCretaeArtilleryUnit.TabIndex = 7;
-            buttonCretaeArtilleryUnit.Text = "создать артиллерийскую установку";
-            buttonCretaeArtilleryUnit.UseVisualStyleBackColor = true;
-            buttonCretaeArtilleryUnit.Click += buttonCretaeArtilleryUnit_Click;
-            // 
             // buttonStrategyStep
             // 
-            buttonStrategyStep.Location = new Point(607, 34);
-            buttonStrategyStep.Margin = new Padding(3, 2, 3, 2);
+            buttonStrategyStep.Location = new Point(694, 46);
             buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(82, 22);
+            buttonStrategyStep.Size = new Size(94, 29);
             buttonStrategyStep.TabIndex = 8;
             buttonStrategyStep.Text = "шаг";
             buttonStrategyStep.UseVisualStyleBackColor = true;
@@ -153,19 +120,16 @@
             // 
             // FormArtilleryUnit
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(700, 338);
+            ClientSize = new Size(800, 450);
             Controls.Add(buttonStrategyStep);
-            Controls.Add(buttonCretaeArtilleryUnit);
             Controls.Add(comboBoxStrategy);
             Controls.Add(buttonLeft);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
-            Controls.Add(button1);
             Controls.Add(pictureBoxArtilleryUnit);
-            Margin = new Padding(3, 2, 3, 2);
             Name = "FormArtilleryUnit";
             Text = "FormArtilleryUnit";
             Click += ButtonMove_Click;
@@ -177,13 +141,11 @@
         #endregion
 
         private PictureBox pictureBoxArtilleryUnit;
-        private Button button1;
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonLeft;
         private ComboBox comboBoxStrategy;
-        private Button buttonCretaeArtilleryUnit;
         private Button buttonStrategyStep;
     }
 }

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnit.cs

@@ -15,6 +15,25 @@ namespace ProjectArtilleryUnit
         /// </summary>
         private AbstractStrategy? _strategy;
 
+        /// <summary>
+        /// Получение объекта
+        /// </summary>
+        public DrawningArtilleryUnit SetArtilleryUnit
+        {
+            set
+            {
+                _drawningArtilleryUnit = value;
+                _drawningArtilleryUnit.SetPictureSize(pictureBoxArtilleryUnit.Width,
+                pictureBoxArtilleryUnit.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
+
+        /// <summary>
+        /// Конструктор формы
+        /// </summary>
         public FormArtilleryUnit()
         {
             InitializeComponent();
@@ -37,57 +56,6 @@ namespace ProjectArtilleryUnit
             pictureBoxArtilleryUnit.Image = bmp;
         }
 
-        /// <summary>
-        /// Создание объекта класса-перемещения
-        /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningArtilleryUnit):
-                    _drawningArtilleryUnit = new DrawningArtilleryUnit(random.Next(100, 300),
-                    random.Next(1000, 3000),
-                    Color.FromArgb(random.Next(0, 256),
-                    random.Next(0, 256), random.Next(0, 256)));
-                    break;
-                case nameof(DrawningMilitaryArtilleryUnit):
-                    _drawningArtilleryUnit = new DrawningMilitaryArtilleryUnit(random.Next(100,
-                    300), random.Next(1000, 3000),
-                    Color.FromArgb(random.Next(0, 256),
-                    random.Next(0, 256), random.Next(0, 256)),
-                    Color.FromArgb(random.Next(0, 256),
-                    random.Next(0, 256), random.Next(0, 256)),
-                    Convert.ToBoolean(random.Next(0, 2)),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    break;
-                default:
-                    return;
-            }
-            _drawningArtilleryUnit.SetPictureSize(pictureBoxArtilleryUnit.Width,
-            pictureBoxArtilleryUnit.Height);
-            _drawningArtilleryUnit.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true;
-            Draw();
-        }
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать военный танк"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryArtilleryUnit));
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать танк"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonCretaeArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtilleryUnit));
-
-
         /// <summary>
         /// Перемещение объекта по форме (нажатие кнопок навигации)
         /// </summary>
@@ -104,16 +72,13 @@ namespace ProjectArtilleryUnit
             switch (name)
             {
                 case "buttonUp":
-                    result =
-                    _drawningArtilleryUnit.MoveTransport(DirectionType.Up);
+                    result = _drawningArtilleryUnit.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result =
-                    _drawningArtilleryUnit.MoveTransport(DirectionType.Down);
+                    result = _drawningArtilleryUnit.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result =
-                    _drawningArtilleryUnit.MoveTransport(DirectionType.Left);
+                    result = _drawningArtilleryUnit.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
                     result =

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.Designer.cs

@@ -0,0 +1,326 @@
+namespace ProjectArtilleryUnit
+{
+    partial class FormArtilleryUnitsCollection
+    {
+        /// <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()
+        {
+            groupBoxTools = new GroupBox();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollecctionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            panelCompanyTools = new Panel();
+            ButtonAddArtilleryUnit = new Button();
+            ButtonAddMilitaryArtilleryUnit = new Button();
+            buttonRefresh = new Button();
+            ButtonRemoveArtilleryUnit = new Button();
+            maskedTextBoxPosision = new MaskedTextBox();
+            buttonGetToTest = new Button();
+            pictureBoxArtilleryUnit = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(531, 0);
+            groupBoxTools.Margin = new Padding(3, 2, 3, 2);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Padding = new Padding(3, 2, 3, 2);
+            groupBoxTools.Size = new Size(260, 490);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "инструменты";
+            groupBoxTools.Enter += groupBoxTools_Enter;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(6, 259);
+            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(245, 20);
+            buttonCreateCompany.TabIndex = 7;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollecctionAdd);
+            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, 18);
+            panelStorage.Margin = new Padding(3, 2, 3, 2);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(254, 212);
+            panelStorage.TabIndex = 6;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(3, 185);
+            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(245, 20);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(3, 103);
+            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(245, 79);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollecctionAdd
+            // 
+            buttonCollecctionAdd.Location = new Point(3, 78);
+            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
+            buttonCollecctionAdd.Name = "buttonCollecctionAdd";
+            buttonCollecctionAdd.Size = new Size(245, 20);
+            buttonCollecctionAdd.TabIndex = 4;
+            buttonCollecctionAdd.Text = "Добавить коллекцию";
+            buttonCollecctionAdd.UseVisualStyleBackColor = true;
+            buttonCollecctionAdd.Click += ButtonCollecctionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(108, 56);
+            radioButtonList.Margin = new Padding(3, 2, 3, 2);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(15, 56);
+            radioButtonMassive.Margin = new Padding(3, 2, 3, 2);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 24);
+            textBoxCollectionName.Margin = new Padding(3, 2, 3, 2);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(245, 23);
+            textBoxCollectionName.TabIndex = 1;
+            textBoxCollectionName.TextChanged += textBoxCollectionName_TextChanged;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(23, 7);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(122, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции";
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(6, 233);
+            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(245, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(ButtonAddArtilleryUnit);
+            panelCompanyTools.Controls.Add(ButtonAddMilitaryArtilleryUnit);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(ButtonRemoveArtilleryUnit);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosision);
+            panelCompanyTools.Controls.Add(buttonGetToTest);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(3, 284);
+            panelCompanyTools.Margin = new Padding(3, 2, 3, 2);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(251, 206);
+            panelCompanyTools.TabIndex = 8;
+            panelCompanyTools.Paint += panelCompanyTools_Paint;
+            // 
+            // ButtonAddArtilleryUnit
+            // 
+            ButtonAddArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonAddArtilleryUnit.BackgroundImageLayout = ImageLayout.Center;
+            ButtonAddArtilleryUnit.Location = new Point(3, 2);
+            ButtonAddArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddArtilleryUnit.Name = "ButtonAddArtilleryUnit";
+            ButtonAddArtilleryUnit.Size = new Size(245, 30);
+            ButtonAddArtilleryUnit.TabIndex = 1;
+            ButtonAddArtilleryUnit.Text = "добваление артиллерийской установки";
+            ButtonAddArtilleryUnit.UseVisualStyleBackColor = true;
+            ButtonAddArtilleryUnit.Click += ButtonAddArtilleryUnit_Click;
+            // 
+            // ButtonAddMilitaryArtilleryUnit
+            // 
+            ButtonAddMilitaryArtilleryUnit.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonAddMilitaryArtilleryUnit.Location = new Point(3, 37);
+            ButtonAddMilitaryArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddMilitaryArtilleryUnit.Name = "ButtonAddMilitaryArtilleryUnit";
+            ButtonAddMilitaryArtilleryUnit.Size = new Size(245, 38);
+            ButtonAddMilitaryArtilleryUnit.TabIndex = 2;
+            ButtonAddMilitaryArtilleryUnit.Text = "добваление военной артиллерийской установки";
+            ButtonAddMilitaryArtilleryUnit.UseVisualStyleBackColor = true;
+            ButtonAddMilitaryArtilleryUnit.Click += ButtonAddMilitaryArtilleryUnit_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(3, 170);
+            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(245, 31);
+            buttonRefresh.TabIndex = 5;
+            buttonRefresh.Text = "обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // ButtonRemoveArtilleryUnit
+            // 
+            ButtonRemoveArtilleryUnit.Anchor = AnchorStyles.Right;
+            ButtonRemoveArtilleryUnit.Location = new Point(3, 104);
+            ButtonRemoveArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveArtilleryUnit.Name = "ButtonRemoveArtilleryUnit";
+            ButtonRemoveArtilleryUnit.Size = new Size(245, 30);
+            ButtonRemoveArtilleryUnit.TabIndex = 3;
+            ButtonRemoveArtilleryUnit.Text = "удалить артиллерийскую установку";
+            ButtonRemoveArtilleryUnit.UseVisualStyleBackColor = true;
+            ButtonRemoveArtilleryUnit.Click += ButtonRemoveArtilleryUnit_Click;
+            // 
+            // maskedTextBoxPosision
+            // 
+            maskedTextBoxPosision.Location = new Point(3, 79);
+            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
+            maskedTextBoxPosision.Mask = "00";
+            maskedTextBoxPosision.Name = "maskedTextBoxPosision";
+            maskedTextBoxPosision.Size = new Size(245, 23);
+            maskedTextBoxPosision.TabIndex = 2;
+            maskedTextBoxPosision.ValidatingType = typeof(int);
+            // 
+            // buttonGetToTest
+            // 
+            buttonGetToTest.Anchor = AnchorStyles.Right;
+            buttonGetToTest.Location = new Point(3, 138);
+            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
+            buttonGetToTest.Name = "buttonGetToTest";
+            buttonGetToTest.Size = new Size(245, 30);
+            buttonGetToTest.TabIndex = 4;
+            buttonGetToTest.Text = "передать на тесты";
+            buttonGetToTest.UseVisualStyleBackColor = true;
+            buttonGetToTest.Click += ButtonGetToTest_Click;
+            // 
+            // pictureBoxArtilleryUnit
+            // 
+            pictureBoxArtilleryUnit.Dock = DockStyle.Fill;
+            pictureBoxArtilleryUnit.Location = new Point(0, 0);
+            pictureBoxArtilleryUnit.Margin = new Padding(3, 2, 3, 2);
+            pictureBoxArtilleryUnit.Name = "pictureBoxArtilleryUnit";
+            pictureBoxArtilleryUnit.Size = new Size(531, 490);
+            pictureBoxArtilleryUnit.TabIndex = 1;
+            pictureBoxArtilleryUnit.TabStop = false;
+            pictureBoxArtilleryUnit.Click += pictureBoxArtilleryUnit_Click;
+            // 
+            // FormArtilleryUnitsCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(791, 490);
+            Controls.Add(pictureBoxArtilleryUnit);
+            Controls.Add(groupBoxTools);
+            Margin = new Padding(3, 2, 3, 2);
+            Name = "FormArtilleryUnitsCollection";
+            Text = "FormArtilleryUnitsCollection";
+            Load += FormArtilleryUnitsCollection_Load;
+            groupBoxTools.ResumeLayout(false);
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxArtilleryUnit).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectorCompany;
+        private Button ButtonAddMilitaryArtilleryUnit;
+        private Button ButtonAddArtilleryUnit;
+        private Button ButtonRemoveArtilleryUnit;
+        private Button buttonRefresh;
+        private Button buttonGetToTest;
+        private PictureBox pictureBoxArtilleryUnit;
+        private MaskedTextBox maskedTextBoxPosision;
+        private Panel panelStorage;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private ListBox listBoxCollection;
+        private Button buttonCollecctionAdd;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private Panel panelCompanyTools;
+    }
+}

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.cs

@@ -0,0 +1,283 @@
+using ProjectArtilleryUnit.CollectionGenericObjects;
+using ProjectArtilleryUnit.Drawnings;
+
+namespace ProjectArtilleryUnit
+{
+    public partial class FormArtilleryUnitsCollection : Form
+    {
+        /// <summary>
+        /// Хранилише коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningArtilleryUnit> _storageCollection;
+
+        /// <summary>
+        /// Компания
+        /// </summary>
+        private AbstractCompany? _company = null;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormArtilleryUnitsCollection()
+        {
+            InitializeComponent();
+            _storageCollection = new();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
+        {
+            panelCompanyTools.Enabled = false;
+        }
+
+        /// <summary>
+        /// Создание объекта класса-перемещения
+        /// </summary>
+        /// <param name="type">Тип создаваемого объекта</param>
+        private void CreateObject(string type)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+            Random random = new();
+            DrawningArtilleryUnit drawningArtilleryUnit;
+            switch (type)
+            {
+                case nameof(DrawningArtilleryUnit):
+                    drawningArtilleryUnit = new DrawningArtilleryUnit(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                    break;
+                case nameof(DrawningMilitaryArtilleryUnit):
+                    // TODO вызов диалогового окна для выбора цвета
+                    drawningArtilleryUnit = new DrawningMilitaryArtilleryUnit(random.Next(100, 300), random.Next(1000, 3000),
+                    GetColor(random), GetColor(random),
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                    break;
+                default:
+                    return;
+            }
+            if (_company + drawningArtilleryUnit != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBoxArtilleryUnit.Image = _company.Show();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
+            }
+        }
+
+        /// <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;
+        }
+
+        //private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtilleryUnit));
+
+        //private void ButtonAddMilitaryArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryArtilleryUnit));
+        private void ButtonAddArtilleryUnit_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningArtilleryUnit));
+        }
+
+        private void ButtonAddMilitaryArtilleryUnit_Click(object sender, EventArgs e)
+        {
+            CreateObject(nameof(DrawningMilitaryArtilleryUnit));
+        }
+
+        private void ButtonRemoveArtilleryUnit_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)
+            {
+                return;
+            }
+            if (MessageBox.Show("удалить объект?", "удаление",
+            MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosision.Text);
+            if (_company - pos != null)
+            {
+                MessageBox.Show("объект удален");
+                pictureBoxArtilleryUnit.Image = _company.Show();
+            }
+            else
+            {
+                MessageBox.Show("не удалось удалить объект");
+            }
+        }
+
+        private void ButtonGetToTest_Click(object sender, EventArgs e)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+
+            DrawningArtilleryUnit? artilleryUnit = null;
+            int counter = 100;
+            while (artilleryUnit == null)
+            {
+                artilleryUnit = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
+            }
+            if (artilleryUnit == null)
+            {
+                return;
+            }
+            FormArtilleryUnit form = new()
+            {
+                SetArtilleryUnit = artilleryUnit
+            };
+            form.ShowDialog();
+
+        }
+
+        private void ButtonRefresh_Click(object sender, EventArgs e)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+
+            pictureBoxArtilleryUnit.Image = _company.Show();
+        }
+
+        /// <summary>
+        /// Добавление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollecctionAdd_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+            _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.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+            RerfreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Обновление списка в listBoxCollection
+        /// </summary>
+        private void RerfreshListBoxItems()
+        {
+            listBoxCollection.Items.Clear();
+            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+            {
+                string? colName = _storageCollection.Keys?[i];
+                if (!string.IsNullOrEmpty(colName))
+                {
+                    listBoxCollection.Items.Add(colName);
+                }
+            }
+        }
+
+        /// <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)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+            ICollectionGenericObjects<DrawningArtilleryUnit>? collection =
+                _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new ArtilleryUnitDockingService(pictureBoxArtilleryUnit.Width, pictureBoxArtilleryUnit.Height, collection);
+                    break;
+            }
+            panelCompanyTools.Enabled = true;
+
+        }
+
+        private void pictureBoxArtilleryUnit_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void FormArtilleryUnitsCollection_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void panelCompanyTools_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
+
+        private void groupBoxTools_Enter(object sender, EventArgs e)
+        {
+
+        }
+
+        private void textBoxCollectionName_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

ArtilleryUnit/ArtilleryUnit/FormArtilleryUnitsCollection.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>

ArtilleryUnit/ArtilleryUnit/MovementStrategy/MoveableArtilleryUnit.cs

@@ -10,36 +10,36 @@ namespace ProjectArtilleryUnit.MovementStrategy
         /// <summary>
         /// Поле-объект класса DrawningArtilleryUnit или его наследника
         /// </summary>
-        private readonly DrawningArtilleryUnit? _cruiser = null;
+        private readonly DrawningArtilleryUnit? _artilleryUnit = null;
         /// <summary>
         /// Конструктор
         /// </summary>
-        /// <param name="cruiser">Объект класса DrawningArtilleryUnit</param>
-        public MoveableArtilleryUnit(DrawningArtilleryUnit cruiser)
+        /// <param name="artilleryUnit">Объект класса DrawningArtilleryUnit</param>
+        public MoveableArtilleryUnit(DrawningArtilleryUnit artilleryUnit)
         {
-            _cruiser = cruiser;
+            _artilleryUnit = artilleryUnit;
         }
         public ObjectParameters? GetObjectPosition
         {
             get
             {
-                if (_cruiser == null || _cruiser.EntityArtilleryUnit == null ||
-                !_cruiser.GetPosX.HasValue || !_cruiser.GetPosY.HasValue)
+                if (_artilleryUnit == null || _artilleryUnit.EntityArtilleryUnit == null ||
+                !_artilleryUnit.GetPosX.HasValue || !_artilleryUnit.GetPosY.HasValue)
                 {
                     return null;
                 }
-                return new ObjectParameters(_cruiser.GetPosX.Value,
-                _cruiser.GetPosY.Value, _cruiser.GetWidth, _cruiser.GetHeight);
+                return new ObjectParameters(_artilleryUnit.GetPosX.Value,
+                _artilleryUnit.GetPosY.Value, _artilleryUnit.GetWidth, _artilleryUnit.GetHeight);
             }
         }
-        public int GetStep => (int)(_cruiser?.EntityArtilleryUnit?.Step ?? 0);
+        public int GetStep => (int)(_artilleryUnit?.EntityArtilleryUnit?.Step ?? 0);
         public bool TryMoveObject(MovementDirection direction)
         {
-            if (_cruiser == null || _cruiser.EntityArtilleryUnit == null)
+            if (_artilleryUnit == null || _artilleryUnit.EntityArtilleryUnit == null)
             {
                 return false;
             }
-            return _cruiser.MoveTransport(GetDirectionType(direction));
+            return _artilleryUnit.MoveTransport(GetDirectionType(direction));
         }
         /// <summary>
         /// Конвертация из MovementDirection в DirectionType

ArtilleryUnit/ArtilleryUnit/Program.cs

@@ -3,15 +3,14 @@ namespace ProjectArtilleryUnit
     internal static class Program
     {
         /// <summary>
-        ///  The main entry point for the application.
+        /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
+            // To customize application configuration such as set high DPI settings or default font, see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormArtilleryUnit());
+            Application.Run(new FormArtilleryUnitsCollection());
         }
     }
 }