пока не работает

Reviewed-on: #3

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,117 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+/// <summary>
+/// Абстракция компании, хранящий коллекцию автомобилей
+/// </summary>
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 210;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 120;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция автомобилей
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningPropelledArtillery>? _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<DrawningPropelledArtillery> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.MaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="propelledartillery">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningPropelledArtillery propelledartillery)
+    {
+        return company._collection.Insert(propelledartillery);
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningPropelledArtillery operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position);
+    }
+
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningPropelledArtillery? 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)
+        {
+            DrawningPropelledArtillery? 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();
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ArtilleryBase.cs

@@ -0,0 +1,62 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+/// <summary>
+/// Реализация абстрактной базы
+/// </summary>
+public class ArtilleryBase : AbstractCompany
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    /// <param name="collection"></param>
+    public ArtilleryBase(int picWidth, int picHeight, ICollectionGenericObjects<DrawningPropelledArtillery> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        Pen pen = new(Color.Black, 3);
+        for (int i = 0; i < width; i++)
+        {
+            for (int j = 0; j < height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 5, j * _placeSizeHeight);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int curWidth = width - 1;
+        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 + 40, curHeight * _placeSizeHeight + 4);
+            }
+            if (curWidth > 0)
+                curWidth--;
+            else
+            {
+                curWidth = width - 1;
+                curHeight++;
+            }
+            if (curHeight > height)
+            {
+                return;
+            }
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/CollectionType.cs

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

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,52 @@
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public interface ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Количество объектов в коллекции
+    /// </summary>
+    int Count { get; }
+    /// <summary>
+    /// Установка максимального количества элементов
+    /// </summary>
+    int MaxCount { get; 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);
+    /// <summary>
+    /// Получение типа коллекции
+    /// </summary>
+    CollectionType GetCollectionType { get; }
+    /// <summary>
+    /// Получение объектов коллекции по одному
+    /// </summary>
+    /// <returns>Поэлементый вывод элементов коллекции</returns>
+    IEnumerable<T?> GetItems();
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,79 @@
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+
+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 MaxCount
+    {
+        get
+        {
+            return Count;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
+    /// <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;
+    }
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,115 @@
+namespace SelfPropelledArtilleryUnit.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 CollectionType GetCollectionType => CollectionType.Massive;
+    public int MaxCount
+    {
+        get
+        {
+            return _collection.Length;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+    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 = position + 1;
+        while (index < _collection.Length)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            ++index;
+        }
+        index = position - 1;
+        while (index >= 0)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            --index;
+        }
+        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;
+    }
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,205 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using System.Text;
+
+namespace SelfPropelledArtilleryUnit.CollectionGenericObjects;
+public class StorageCollection<T>
+    where T : DrawningPropelledArtillery
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+	/// Ключевое слово, с которого должен начинаться файл
+	/// </summary>
+	private readonly string _collectionKey = "CollectionsStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
+
+    /// <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;
+        }
+    }
+    /// <summary>
+    /// Сохранение информации по автомобилям в хранилище в файл
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+    public bool SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            return false;
+        }
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+            {
+                StringBuilder sb = new();
+                sb.Append(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+                sb.Append(value.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.GetCollectionType);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+                writer.Write(sb);
+            }
+
+        }
+        return true;
+    }
+
+    /// <summary>
+    /// Загрузка информации по автомобилям в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+    public bool LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            return false;
+        }
+        using (StreamReader fs = File.OpenText(filename))
+        {
+            string str = fs.ReadLine();
+            if (str == null || str.Length == 0)
+            {
+                return false;
+            }
+            if (!str.StartsWith(_collectionKey))
+            {
+                return false;
+            }
+            _storages.Clear();
+            string strs = "";
+            while ((strs = fs.ReadLine()) != null)
+            {
+                //по идее этого произойти не должно
+                //if (strs == null)
+                //{
+                //    return false;
+                //}
+                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 4)
+                {
+                    continue;
+                }
+                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                if (collection == null)
+                {
+                    return false;
+                }
+                collection.MaxCount = Convert.ToInt32(record[2]);
+                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningPropelledArtillery() is T ship)
+                    {
+                        if (collection.Insert(ship) == -1)
+                        {
+                            return false;
+                        }
+                    }
+                }
+                _storages.Add(record[0], collection);
+            }
+            return true;
+        }
+    }
+
+    /// <summary>
+    /// Создание коллекции по типу
+    /// </summary>
+    /// <param name="collectionType"></param>
+    /// <returns></returns>
+    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningPropelledArtillery.cs

@@ -99,7 +99,10 @@ public class DrawningPropelledArtillery
         _drawningPropelledArtilleryWidth = drawningPropelledArtilleryWidth;
         _drawningPropelledArtilleryHeight = drawningPropelledArtilleryHeight;       
     }
-
+    public DrawningPropelledArtillery(EntityPropelledArtillery propelledArtillery) : this()
+    {
+        EntityPropelledArtillery = new EntityPropelledArtillery(propelledArtillery.Speed, propelledArtillery.Weight, propelledArtillery.BodyColor);
+    }
     /// <summary>
 	/// Установка границ поля
 	/// </summary>

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/DrawningSelfPropelledArtilleryUnit.cs

@@ -18,6 +18,10 @@ public class DrawningSelfPropelledArtilleryUnit : DrawningPropelledArtillery
         EntityPropelledArtillery = new EntitySelfPropelledArtilleryUnit(speed, weight, bodyColor, additionalColor, turretCannon, launchBattery);
         //дописать  
     }
+    public DrawningSelfPropelledArtilleryUnit(EntitySelfPropelledArtilleryUnit ship) : base(135, 105)
+    {
+        EntityPropelledArtillery = new EntitySelfPropelledArtilleryUnit(ship.Speed, ship.Weight, ship.BodyColor, ship.AdditionalColor, ship.TurretCannon, ship.LaunchBattery);
+    }
 
     public override void DrawTransport(Graphics g)
     {

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Drawnings/ExtentionDrawningPropelledArtillery.cs

@@ -0,0 +1,50 @@
+using SelfPropelledArtilleryUnit.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit.Drawnings;
+
+public static class ExtentionDrawningPropelledArtillery
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningPropelledArtillery? CreateDrawningPropelledArtillery(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityPropelledArtillery? propelledArtillery = EntitySelfPropelledArtilleryUnit.CreateEntitySelfPropelledArtilleryUnit(strs);
+        if (propelledArtillery != null)
+        {
+            return new DrawningSelfPropelledArtilleryUnit((EntitySelfPropelledArtilleryUnit)propelledArtillery);
+        }
+        propelledArtillery = EntityPropelledArtillery.CreateEntityPropelledArtillery(strs);
+        if (propelledArtillery != null)
+        {
+            return new DrawningPropelledArtillery(propelledArtillery);
+        }
+        return null;
+    }
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningCar">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningPropelledArtillery drawningPropelledArtillery)
+    {
+        string[]? array = drawningPropelledArtillery?.EntityPropelledArtillery?.GetStringRepresentation();
+        if (array == null)
+        {
+            return string.Empty;
+        }
+        return string.Join(_separatorForObject, array);
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityPropelledArtillery.cs

@@ -16,6 +16,10 @@ public class EntityPropelledArtillery
     /// Основной цвет
     /// </summary>
     public Color BodyColor { get; private set; }
+    public void setBodyColor(Color color)
+    {
+        BodyColor = color;
+    }
     /// <summary>
     /// Шаг перемещения артеллерийской установки
     /// </summary>
@@ -32,4 +36,26 @@ public class EntityPropelledArtillery
         Weight = weight;
         BodyColor = bodyColor;
     }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityPropelledArtillery), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityPropelledArtillery? CreateEntityPropelledArtillery(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityPropelledArtillery))
+        {
+            return null;
+        }
+        return new EntityPropelledArtillery(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntitySelfPropelledArtilleryUnit.cs

@@ -8,6 +8,10 @@ public class EntitySelfPropelledArtilleryUnit : EntityPropelledArtillery
     /// Дополнительный цвет (для опциональных элементов)
     /// </summary>
     public Color AdditionalColor { get; private set; }
+    public void setAdditionalColor(Color color)
+    {
+        AdditionalColor = color;
+    }
     /// <summary>
     /// Признак - Башня с орудием
     /// </summary>
@@ -33,5 +37,28 @@ public class EntitySelfPropelledArtilleryUnit : EntityPropelledArtillery
         TurretCannon = turretcannon;
         LaunchBattery = launchbattery;
     }
+    /// <summary>
+    /// Получение строк со значениями свойств продвинутого объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntitySelfPropelledArtilleryUnit), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
+                        TurretCannon.ToString(), LaunchBattery.ToString()};
+    }
+    /// <summary>
+    /// Создание продвинутого объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntitySelfPropelledArtilleryUnit? CreateEntitySelfPropelledArtilleryUnit(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntitySelfPropelledArtilleryUnit))
+        {
+            return null;
+        }
+        return new EntitySelfPropelledArtilleryUnit(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
+                                    Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+    }
 }
 

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.Designer.cs

@@ -0,0 +1,348 @@
+namespace SelfPropelledArtilleryUnit
+{
+    partial class FormPropelledArtilleryCollection
+    {
+        /// <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();
+            panelCompanyTools = new Panel();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddPropelledArtillery = new Button();
+            buttonRefresh = new Button();
+            buttonRemovePropelledArtillery = new Button();
+            buttonGoToCheck = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonColectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
+            groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(736, 24);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(200, 585);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonAddPropelledArtillery);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonRemovePropelledArtillery);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(6, 343);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(200, 213);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBox.Location = new Point(0, 95);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(188, 23);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            maskedTextBox.MaskInputRejected += maskedTextBox_MaskInputRejected;
+            // 
+            // buttonAddPropelledArtillery
+            // 
+            buttonAddPropelledArtillery.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddPropelledArtillery.Location = new Point(0, 3);
+            buttonAddPropelledArtillery.Name = "buttonAddPropelledArtillery";
+            buttonAddPropelledArtillery.Size = new Size(188, 40);
+            buttonAddPropelledArtillery.TabIndex = 1;
+            buttonAddPropelledArtillery.Text = "Добавление бронированной машины";
+            buttonAddPropelledArtillery.UseVisualStyleBackColor = true;
+            buttonAddPropelledArtillery.Click += buttonAddPropelledArtillery_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(0, 185);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(188, 22);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
+            // 
+            // buttonRemovePropelledArtillery
+            // 
+            buttonRemovePropelledArtillery.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemovePropelledArtillery.Location = new Point(0, 123);
+            buttonRemovePropelledArtillery.Name = "buttonRemovePropelledArtillery";
+            buttonRemovePropelledArtillery.Size = new Size(188, 24);
+            buttonRemovePropelledArtillery.TabIndex = 4;
+            buttonRemovePropelledArtillery.Text = "Удаление";
+            buttonRemovePropelledArtillery.UseVisualStyleBackColor = true;
+            buttonRemovePropelledArtillery.Click += buttonRemovePropelledArtillery_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(0, 153);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(188, 26);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(6, 308);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(188, 23);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += buttonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonColectionAdd);
+            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, 19);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(194, 239);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(3, 206);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(188, 23);
+            buttonCollectionDel.TabIndex = 5;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += buttonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(3, 106);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(188, 94);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonColectionAdd
+            // 
+            buttonColectionAdd.Location = new Point(3, 77);
+            buttonColectionAdd.Name = "buttonColectionAdd";
+            buttonColectionAdd.Size = new Size(188, 23);
+            buttonColectionAdd.TabIndex = 4;
+            buttonColectionAdd.Text = "Добавить коллекцию";
+            buttonColectionAdd.UseVisualStyleBackColor = true;
+            buttonColectionAdd.Click += buttonColectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(107, 52);
+            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(19, 52);
+            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, 15);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(188, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(33, 1);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(125, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
+            // 
+            // 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(6, 279);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(188, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 24);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(736, 585);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // menuStrip
+            // 
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(936, 24);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(48, 20);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(181, 22);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(181, 22);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.FileName = "openFileDialog1";
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // FormPropelledArtilleryCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(936, 609);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
+            Name = "FormPropelledArtilleryCollection";
+            Text = "Коллекция установок";
+            groupBoxTools.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddPropelledArtillery;
+        private ComboBox comboBoxSelectorCompany;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonGoToCheck;
+        private Button buttonRemovePropelledArtillery;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private Button buttonColectionAdd;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.cs

@@ -0,0 +1,282 @@
+ using SelfPropelledArtilleryUnit.CollectionGenericObjects;
+using SelfPropelledArtilleryUnit.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace SelfPropelledArtilleryUnit;
+
+public partial class FormPropelledArtilleryCollection : Form
+{
+    /// <summary>
+	/// Хранилише коллекций
+	/// </summary>
+	private readonly StorageCollection<DrawningPropelledArtillery> _storageCollection;
+
+    /// <summary>
+	/// Компания
+	/// </summary>
+	private AbstractCompany? _company = null;
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+    public FormPropelledArtilleryCollection()
+    {
+        InitializeComponent();
+        _storageCollection = new();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        panelCompanyTools.Enabled = false;
+    }
+
+    private void buttonAddPropelledArtillery_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        FormPropelledArtilleryConfig form = new();
+        form.PropelledArtilleryDelegate += SetCar;
+        form.Show();
+    }
+
+    /// <summary>
+    /// Добавление 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddSelfPropelledArtilleryUnit_Click(object sender, EventArgs e)
+    {
+
+    }
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void SetCar(DrawningPropelledArtillery propelledArtilleryk)
+    {
+
+        if (_company == null || propelledArtilleryk == null)
+        {
+            return;
+        }
+        if (_company + propelledArtilleryk != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+
+    private void maskedTextBox_MaskInputRejected(object sender, MaskInputRejectedEventArgs e)
+    {
+
+    }
+
+    /// <summary>
+	/// Удаление объекта
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonRemovePropelledArtillery_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+        {
+            return;
+        }
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+        {
+            return;
+        }
+        int pos = Convert.ToInt32(maskedTextBox.Text);
+        if (_company - pos != null)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningPropelledArtillery? propelledartillery = null;
+        int counter = 100;
+        while (propelledartillery == null)
+        {
+            propelledartillery = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (propelledartillery == null)
+        {
+            return;
+        }
+
+        SelfPropelledArtilleryUnit form = new()
+        {
+            SetPropelledArtillery = propelledartillery
+        };
+        form.ShowDialog();
+    }
+
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        pictureBox.Image = _company.Show();
+    }
+
+    private void buttonColectionAdd_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();
+    }
+    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);
+            }
+        }
+    }
+    private void buttonCollectionDel_Click(object sender, EventArgs e)
+    {
+        // TODO прописать логику удаления элемента из коллекции
+        // нужно убедиться, что есть выбранная коллекция
+        // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
+        // удалить и обновить ListBox
+        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();
+    }
+
+    private void buttonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        ICollectionGenericObjects<DrawningPropelledArtillery>? collection =
+            _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new ArtilleryBase(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+
+    private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (saveFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            if (_storageCollection.SaveData(saveFileDialog.FileName))
+            {
+                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+
+    private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            if (_storageCollection.LoadData(openFileDialog.FileName))
+            {
+                MessageBox.Show("Загрузка прошла успешно",
+                "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                RerfreshListBoxItems();
+            }
+            else
+            {
+                MessageBox.Show("Не сохранилось", "Результат",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}
+
+

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryCollection.resx

@@ -0,0 +1,129 @@
+<?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>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>128, 21</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>261, 17</value>
+  </metadata>
+</root>

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.Designer.cs

@@ -0,0 +1,366 @@
+namespace SelfPropelledArtilleryUnit
+{
+    partial class FormPropelledArtilleryConfig
+    {
+        /// <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();
+            panelPurple = new Panel();
+            panelYellow = new Panel();
+            panelBlack = new Panel();
+            panelBlue = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxLaunchBattery = new CheckBox();
+            checkBoxTurretCannon = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            panelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxLaunchBattery);
+            groupBoxConfig.Controls.Add(checkBoxTurretCannon);
+            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(575, 260);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(276, 22);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(244, 141);
+            groupBoxColors.TabIndex = 8;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            groupBoxColors.Enter += groupBoxColors_Enter;
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(182, 89);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(33, 32);
+            panelPurple.TabIndex = 4;
+            panelPurple.MouseDown += Panel_MouseDown;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(182, 37);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(33, 32);
+            panelYellow.TabIndex = 1;
+            panelYellow.MouseDown += Panel_MouseDown;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(130, 89);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(33, 32);
+            panelBlack.TabIndex = 6;
+            panelBlack.MouseDown += Panel_MouseDown;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(130, 37);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(33, 32);
+            panelBlue.TabIndex = 2;
+            panelBlue.MouseDown += Panel_MouseDown;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(82, 89);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(33, 32);
+            panelGray.TabIndex = 5;
+            panelGray.MouseDown += Panel_MouseDown;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(31, 89);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(33, 32);
+            panelWhite.TabIndex = 3;
+            panelWhite.MouseDown += Panel_MouseDown;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(82, 37);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(33, 32);
+            panelGreen.TabIndex = 1;
+            panelGreen.MouseDown += Panel_MouseDown;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(31, 37);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(33, 32);
+            panelRed.TabIndex = 0;
+            panelRed.MouseDown += Panel_MouseDown;
+            // 
+            // checkBoxLaunchBattery
+            // 
+            checkBoxLaunchBattery.AutoSize = true;
+            checkBoxLaunchBattery.Location = new Point(12, 169);
+            checkBoxLaunchBattery.Name = "checkBoxLaunchBattery";
+            checkBoxLaunchBattery.Size = new Size(215, 19);
+            checkBoxLaunchBattery.TabIndex = 7;
+            checkBoxLaunchBattery.Text = "Признак - Залповая батарея сзади";
+            checkBoxLaunchBattery.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxTurretCannon
+            // 
+            checkBoxTurretCannon.AutoSize = true;
+            checkBoxTurretCannon.Location = new Point(12, 144);
+            checkBoxTurretCannon.Name = "checkBoxTurretCannon";
+            checkBoxTurretCannon.Size = new Size(181, 19);
+            checkBoxTurretCannon.TabIndex = 6;
+            checkBoxTurretCannon.Text = "Признак - Башня с орудием";
+            checkBoxTurretCannon.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(80, 88);
+            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(74, 23);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 90);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(29, 15);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(80, 59);
+            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(74, 23);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 61);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(406, 190);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(114, 32);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(276, 190);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(115, 32);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(586, 12);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(200, 205);
+            panelObject.TabIndex = 1;
+            panelObject.DragDrop += panelObject_DragDrop;
+            panelObject.DragEnter += panelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(101, 10);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(80, 36);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(20, 10);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(80, 36);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(20, 49);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(161, 138);
+            pictureBoxObject.TabIndex = 0;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(589, 223);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(99, 25);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(713, 224);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(75, 23);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormPropelledArtilleryConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(863, 260);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(panelObject);
+            Controls.Add(groupBoxConfig);
+            Name = "FormPropelledArtilleryConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            panelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private CheckBox checkBoxTurretCannon;
+        private CheckBox checkBoxLaunchBattery;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelYellow;
+        private Panel panelBlack;
+        private Panel panelBlue;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Panel panelObject;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.cs

@@ -0,0 +1,184 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using SelfPropelledArtilleryUnit.Entities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace SelfPropelledArtilleryUnit;
+//SelfPropelledArtilleryUnit
+//PropelledArtillery
+public partial class FormPropelledArtilleryConfig : Form
+{
+
+    public FormPropelledArtilleryConfig()
+    {
+        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;
+        panelPurple.MouseDown += Panel_MouseDown;
+        buttonCancel.Click += (sender, e) => Close();
+    }
+
+    /// <summary>
+    /// Объект - прорисовка автомобиля
+    /// </summary>
+    private DrawningPropelledArtillery? _propelledArtillery;
+
+    /// <summary>
+    /// Событие для передачи объекта
+    /// </summary>
+    public event Action<DrawningPropelledArtillery>? PropelledArtilleryDelegate;
+
+
+    /// <summary>
+    /// Привязка внешнего метода к событию
+    /// </summary>
+    /// <param name="propelledArtilleryDelegate"></param>
+    public void AddEvent(Action<DrawningPropelledArtillery> propelledArtilleryDelegate)
+    {
+        PropelledArtilleryDelegate += propelledArtilleryDelegate;
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _propelledArtillery?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _propelledArtillery?.SetPosition(15, 15);
+        _propelledArtillery?.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":
+                _propelledArtillery = new DrawningPropelledArtillery((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.Aqua);
+                break;
+            case "labelModifiedObject":
+                _propelledArtillery = new DrawningSelfPropelledArtilleryUnit((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                    Color.Black, checkBoxTurretCannon.Checked, checkBoxLaunchBattery.Checked);
+                break;
+        }
+
+        DrawObject();
+    }
+
+
+    private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data.GetDataPresent(typeof(Color)))
+        {
+            e.Effect = DragDropEffects.Copy;
+        }
+        else
+        {
+            e.Effect = DragDropEffects.None;
+        }
+    }
+    private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_propelledArtillery != null)
+        {
+            _propelledArtillery.EntityPropelledArtillery.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawObject();
+        }
+    }
+
+    private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+    {
+        if (_propelledArtillery.EntityPropelledArtillery is EntitySelfPropelledArtilleryUnit _selfPropelledArtilleryUnit)
+        {
+            _selfPropelledArtilleryUnit.setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+        }
+        DrawObject();
+    }
+    private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+    {
+        if (_propelledArtillery is DrawningSelfPropelledArtilleryUnit)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Передаем информацию при нажатии на Panel
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void Panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        if (_propelledArtillery != null)
+        {
+            PropelledArtilleryDelegate?.Invoke(_propelledArtillery);
+            Close();
+        }
+    }
+
+
+
+    private void groupBoxColors_Enter(object sender, EventArgs e)
+    {
+
+    }
+}
+

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormPropelledArtilleryConfig.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>

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs

@@ -11,7 +11,7 @@ namespace SelfPropelledArtilleryUnit
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new SelfPropelledArtilleryUnit());
+            Application.Run(new FormPropelledArtilleryCollection());
         }
     }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/PropelledArtilleryDelegate.cs

@@ -0,0 +1,11 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit
+{
+    public delegate void PropelledArtilleryDelegate(DrawningPropelledArtillery propelledArtillery);
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.Designer.cs

@@ -29,12 +29,10 @@
         private void InitializeComponent()
         {
             pictureBoxSelfPropelledArtilleryUnit = new PictureBox();
-            buttonCreate = new Button();
             buttonLeft = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
-            button1 = new Button();
             comboBoxStrategy = new ComboBox();
             buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxSelfPropelledArtilleryUnit).BeginInit();
@@ -49,17 +47,6 @@
             pictureBoxSelfPropelledArtilleryUnit.TabIndex = 0;
             pictureBoxSelfPropelledArtilleryUnit.TabStop = false;
             // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 446);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(226, 35);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать самоходную арт. установку";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += buttonCreateSelfPropelledArtilleryUnit_Click;
-            // 
             // buttonLeft
             // 
             buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -108,17 +95,6 @@
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // button1
-            // 
-            button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            button1.Location = new Point(253, 446);
-            button1.Name = "button1";
-            button1.Size = new Size(226, 35);
-            button1.TabIndex = 6;
-            button1.Text = "Создать бронированную машину";
-            button1.UseVisualStyleBackColor = true;
-            button1.Click += buttonCreatePropelledArtillery_Click;
-            // 
             // comboBoxStrategy
             // 
             comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -147,12 +123,10 @@
             ClientSize = new Size(923, 493);
             Controls.Add(buttonStrategyStep);
             Controls.Add(comboBoxStrategy);
-            Controls.Add(button1);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
             Controls.Add(pictureBoxSelfPropelledArtilleryUnit);
             Name = "SelfPropelledArtilleryUnit";
             Text = "Самоходная арт. установка";
@@ -163,12 +137,10 @@
         #endregion
 
         private PictureBox pictureBoxSelfPropelledArtilleryUnit;
-        private Button buttonCreate;
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonRight;
-        private Button button1;
         private ComboBox comboBoxStrategy;
         private Button buttonStrategyStep;
     }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit.cs

@@ -21,6 +21,21 @@ namespace SelfPropelledArtilleryUnit
         /// </summary>
         private AbstractStrategy? _strategy;
 
+        /// <summary>
+        /// Получение объекта 
+        /// </summary>
+        public DrawningPropelledArtillery SetPropelledArtillery
+        {
+            set
+            {
+                _drawningPropelledArtillery = value;
+                _drawningPropelledArtillery.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
+
         /// <summary>
         /// Конструктор формы
         /// </summary>
@@ -42,45 +57,45 @@ namespace SelfPropelledArtilleryUnit
             _drawningPropelledArtillery.DrawTransport(gr);
             pictureBoxSelfPropelledArtilleryUnit.Image = bmp;
         }
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawningPropelledArtillery):
-                    _drawningPropelledArtillery = new DrawningPropelledArtillery(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(DrawningSelfPropelledArtilleryUnit):
-                    _drawningPropelledArtillery = new DrawningSelfPropelledArtilleryUnit(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)));
-                    break;
-                default:
-                    return;
-            }
+        //private void CreateObject(string type)
+        //{
+        //    Random random = new();
+        //    switch (type)
+        //    {
+        //        case nameof(DrawningPropelledArtillery):
+        //            _drawningPropelledArtillery = new DrawningPropelledArtillery(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(DrawningSelfPropelledArtilleryUnit):
+        //            _drawningPropelledArtillery = new DrawningSelfPropelledArtilleryUnit(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)));
+        //            break;
+        //        default:
+        //            return;
+        //    }
 
-            _drawningPropelledArtillery.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height);
-            _drawningPropelledArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true;
-            Draw();
-        }
+        //    _drawningPropelledArtillery.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height);
+        //    _drawningPropelledArtillery.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 buttonCreateSelfPropelledArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSelfPropelledArtilleryUnit));
+        ///// <summary>
+        ///// Обработка нажатия кнопки "Создать самоходную арт.установку"
+        ///// </summary>
+        ///// <param name="sender"></param>
+        ///// <param name="e"></param>
+        //private void buttonCreateSelfPropelledArtilleryUnit_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSelfPropelledArtilleryUnit));
 
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать бронированную машину"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonCreatePropelledArtillery_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPropelledArtillery));
+        ///// <summary>
+        ///// Обработка нажатия кнопки "Создать бронированную машину"
+        ///// </summary>
+        ///// <param name="sender"></param>
+        ///// <param name="e"></param>
+        //private void buttonCreatePropelledArtillery_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPropelledArtillery));
 
         private void ButtonMove_Click(object sender, EventArgs e)
         {