Добавление ColorDialog

Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.Designer.cs

@@ -29,119 +29,46 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
-            this.listBoxMaps = new System.Windows.Forms.ListBox();
-            this.buttonDeleteMap = new System.Windows.Forms.Button();
-            this.buttonAddMap = new System.Windows.Forms.Button();
-            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRemoveCar = new System.Windows.Forms.Button();
+            this.buttonRemoveStorm = new System.Windows.Forms.Button();
             this.buttonShowStorage = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonAddCar = new System.Windows.Forms.Button();
+            this.buttonAddStorm = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
             this.groupBoxTools.SuspendLayout();
-            this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBoxTools
             // 
-            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonRemoveCar);
+            this.groupBoxTools.Controls.Add(this.buttonRemoveStorm);
             this.groupBoxTools.Controls.Add(this.buttonShowStorage);
             this.groupBoxTools.Controls.Add(this.buttonDown);
             this.groupBoxTools.Controls.Add(this.buttonRight);
             this.groupBoxTools.Controls.Add(this.buttonLeft);
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonAddCar);
+            this.groupBoxTools.Controls.Add(this.buttonAddStorm);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
             this.groupBoxTools.Location = new System.Drawing.Point(927, 0);
             this.groupBoxTools.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.groupBoxTools.Name = "groupBoxTools";
             this.groupBoxTools.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxTools.Size = new System.Drawing.Size(233, 884);
+            this.groupBoxTools.Size = new System.Drawing.Size(233, 739);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
-            // groupBoxMaps
-            // 
-            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
-            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
-            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
-            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
-            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxMaps.Location = new System.Drawing.Point(14, 28);
-            this.groupBoxMaps.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxMaps.Size = new System.Drawing.Size(213, 360);
-            this.groupBoxMaps.TabIndex = 11;
-            this.groupBoxMaps.TabStop = false;
-            this.groupBoxMaps.Text = "Карты";
-            // 
-            // listBoxMaps
-            // 
-            this.listBoxMaps.FormattingEnabled = true;
-            this.listBoxMaps.ItemHeight = 20;
-            this.listBoxMaps.Location = new System.Drawing.Point(7, 160);
-            this.listBoxMaps.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(198, 144);
-            this.listBoxMaps.TabIndex = 4;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.listBoxMaps_SelectedIndexChanged);
-            // 
-            // buttonDeleteMap
-            // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(7, 313);
-            this.buttonDeleteMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonDeleteMap.Name = "buttonDeleteMap";
-            this.buttonDeleteMap.Size = new System.Drawing.Size(199, 39);
-            this.buttonDeleteMap.TabIndex = 3;
-            this.buttonDeleteMap.Text = "Удалить карту";
-            this.buttonDeleteMap.UseVisualStyleBackColor = true;
-            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(6, 115);
-            this.buttonAddMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(200, 37);
-            this.buttonAddMap.TabIndex = 2;
-            this.buttonAddMap.Text = "Добавить карту";
-            this.buttonAddMap.UseVisualStyleBackColor = true;
-            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
-            // 
-            // textBoxNewMapName
-            // 
-            this.textBoxNewMapName.Location = new System.Drawing.Point(7, 37);
-            this.textBoxNewMapName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(198, 27);
-            this.textBoxNewMapName.TabIndex = 1;
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(7, 76);
-            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(198, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(21, 511);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 221);
             this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
@@ -149,20 +76,20 @@
             this.maskedTextBoxPosition.TabIndex = 2;
             this.maskedTextBoxPosition.ValidatingType = typeof(int);
             // 
-            // buttonRemoveCar
+            // buttonRemoveStorm
             // 
-            this.buttonRemoveCar.Location = new System.Drawing.Point(21, 565);
-            this.buttonRemoveCar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonRemoveCar.Name = "buttonRemoveCar";
-            this.buttonRemoveCar.Size = new System.Drawing.Size(200, 47);
-            this.buttonRemoveCar.TabIndex = 3;
-            this.buttonRemoveCar.Text = "Удалить самолёт";
-            this.buttonRemoveCar.UseVisualStyleBackColor = true;
-            this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveStorm_Click);
+            this.buttonRemoveStorm.Location = new System.Drawing.Point(19, 260);
+            this.buttonRemoveStorm.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonRemoveStorm.Name = "buttonRemoveStorm";
+            this.buttonRemoveStorm.Size = new System.Drawing.Size(200, 47);
+            this.buttonRemoveStorm.TabIndex = 3;
+            this.buttonRemoveStorm.Text = "Удалить самолёт";
+            this.buttonRemoveStorm.UseVisualStyleBackColor = true;
+            this.buttonRemoveStorm.Click += new System.EventHandler(this.ButtonRemoveStorm_Click);
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(21, 633);
+            this.buttonShowStorage.Location = new System.Drawing.Point(19, 383);
             this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(200, 47);
@@ -176,7 +103,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::Stormtrooper.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(104, 817);
+            this.buttonDown.Location = new System.Drawing.Point(104, 672);
             this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(34, 40);
@@ -189,7 +116,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::Stormtrooper.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(145, 817);
+            this.buttonRight.Location = new System.Drawing.Point(145, 672);
             this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(34, 40);
@@ -202,7 +129,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::Stormtrooper.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(63, 817);
+            this.buttonLeft.Location = new System.Drawing.Point(63, 672);
             this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(34, 40);
@@ -215,7 +142,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::Stormtrooper.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(104, 769);
+            this.buttonUp.Location = new System.Drawing.Point(104, 624);
             this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(34, 40);
@@ -225,7 +152,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(21, 700);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 521);
             this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(200, 47);
@@ -234,16 +161,31 @@
             this.buttonShowOnMap.UseVisualStyleBackColor = true;
             this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
             // 
-            // buttonAddCar
+            // buttonAddStorm
             // 
-            this.buttonAddCar.Location = new System.Drawing.Point(21, 443);
-            this.buttonAddCar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonAddCar.Name = "buttonAddCar";
-            this.buttonAddCar.Size = new System.Drawing.Size(200, 47);
-            this.buttonAddCar.TabIndex = 1;
-            this.buttonAddCar.Text = "Добавить самолёт";
-            this.buttonAddCar.UseVisualStyleBackColor = true;
-            this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddStorm_Click);
+            this.buttonAddStorm.Location = new System.Drawing.Point(19, 141);
+            this.buttonAddStorm.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonAddStorm.Name = "buttonAddStorm";
+            this.buttonAddStorm.Size = new System.Drawing.Size(200, 47);
+            this.buttonAddStorm.TabIndex = 1;
+            this.buttonAddStorm.Text = "Добавить самолёт";
+            this.buttonAddStorm.UseVisualStyleBackColor = true;
+            this.buttonAddStorm.Click += new System.EventHandler(this.ButtonAddStorm_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Ясное небо",
+            "Пасмурное небо"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(19, 43);
+            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(199, 28);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
             // 
             // pictureBox
             // 
@@ -251,7 +193,7 @@
             this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(927, 884);
+            this.pictureBox.Size = new System.Drawing.Size(927, 739);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -259,7 +201,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1160, 884);
+            this.ClientSize = new System.Drawing.Size(1160, 739);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
@@ -267,11 +209,8 @@
             this.Text = "Карта с набором объектов";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
-            this.groupBoxMaps.ResumeLayout(false);
-            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
-
         }
 
         #endregion
@@ -279,18 +218,13 @@
         private PictureBox pictureBox;
         private ComboBox comboBoxSelectorMap;
         private Button buttonShowOnMap;
-        private Button buttonAddCar;
+        private Button buttonAddStorm;
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonShowStorage;
-        private Button buttonRemoveCar;
+        private Button buttonRemoveStorm;
         private MaskedTextBox maskedTextBoxPosition;
-        private GroupBox groupBoxMaps;
-        private ListBox listBoxMaps;
-        private Button buttonDeleteMap;
-        private Button buttonAddMap;
-        private TextBox textBoxNewMapName;
     }
 }

Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.cs

@@ -13,30 +13,44 @@ namespace Stormtrooper
     public partial class FormMapWithSetStormtroopers : Form
     {
         /// <summary>
-        /// Словарь для выпадающего списка
+        /// Объект от класса карты с набором объектов
         /// </summary>
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-        {
-            { "Простая карта", new SimpleMap() },
-            {"Ясное небо", new SecondMap() },
-            {"Пасмурное небо", new ThirdMap() }
-        };
-        /// <summary>
-        /// Объект от коллекции карт
-        /// </summary>
-        private readonly MapsCollection _mapsCollection;
-
+        private MapWithSetStormtroopersGeneric<DrawningObjectStorm, AbstractMap> _mapStormtroopersCollectionGeneric;
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormMapWithSetStormtroopers()
         {
-            InitializeComponent();
-            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
-            comboBoxSelectorMap.Items.Clear();
-            foreach (var elem in _mapsDict)
+            InitializeComponent(); ;
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
         {
-                comboBoxSelectorMap.Items.Add(elem.Key);
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Ясное небо":
+                    map = new SecondMap();
+                    break;
+                case "Пасмурное небо":
+                    map = new ThirdMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapStormtroopersCollectionGeneric = new MapWithSetStormtroopersGeneric<DrawningObjectStorm, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapStormtroopersCollectionGeneric = null;
             }
         }
         /// <summary>
@@ -46,18 +60,18 @@ namespace Stormtrooper
         /// <param name="e"></param>
         private void ButtonAddStorm_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapStormtroopersCollectionGeneric == null)
             {
                 return;
             }
             FormStormtrooper form = new();
             if (form.ShowDialog() == DialogResult.OK)
             {
-                DrawningObjectStorm airBomber = new(form.SelectedStormtrooper);
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airBomber != -1)
+                DrawningObjectStorm car = new(form.SelectedStormtrooper);
+                if ((_mapStormtroopersCollectionGeneric + car) != -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    pictureBox.Image = _mapStormtroopersCollectionGeneric.ShowSet();
                 }
                 else
                 {
@@ -72,10 +86,6 @@ namespace Stormtrooper
         /// <param name="e"></param>
         private void ButtonRemoveStorm_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
@@ -85,10 +95,10 @@ namespace Stormtrooper
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            if ((_mapStormtroopersCollectionGeneric - pos) != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                pictureBox.Image = _mapStormtroopersCollectionGeneric.ShowSet();
             }
             else
             {
@@ -102,11 +112,11 @@ namespace Stormtrooper
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapStormtroopersCollectionGeneric == null)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            pictureBox.Image = _mapStormtroopersCollectionGeneric.ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -115,11 +125,11 @@ namespace Stormtrooper
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapStormtroopersCollectionGeneric == null)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+            pictureBox.Image = _mapStormtroopersCollectionGeneric.ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -128,6 +138,10 @@ namespace Stormtrooper
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
+            if (_mapStormtroopersCollectionGeneric == null)
+            {
+                return;
+            }
             //получаем имя кнопки
             string name = ((Button)sender)?.Name ?? string.Empty;
             Direction dir = Direction.None;
@@ -146,61 +160,7 @@ namespace Stormtrooper
                     dir = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
-        }
-
-        private void ReloadMaps()
-        {
-            int index = listBoxMaps.SelectedIndex;
-
-            listBoxMaps.Items.Clear();
-            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
-            {
-                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
-            }
-
-            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
-            {
-                listBoxMaps.SelectedIndex = 0;
-            }
-            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
-            {
-                listBoxMaps.SelectedIndex = index;
-            }
-        }
-
-        private void ButtonAddMap_Click(object sender, EventArgs e)
-        {
-            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
-            {
-                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
-            ReloadMaps();
-        }
-
-        private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
-
-        private void ButtonDeleteMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
-                ReloadMaps();
-            }
+            pictureBox.Image = _mapStormtroopersCollectionGeneric.MoveObject(dir);
         }
     }
 }

Stormtrooper/Stormtrooper/FormMapWithSetStormtroopers.resx

@@ -1,4 +1,64 @@
-<root>
+<?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">

Stormtrooper/Stormtrooper/MapWithSetStormtroopersGeneric.cs

@@ -71,7 +71,8 @@ namespace Stormtrooper
         /// <param name="map"></param>
         /// <param name="position"></param>
         /// <returns></returns>
-        public static T operator -(MapWithSetStormtroopersGeneric<T, U> map, int position)
+        public static T operator -(MapWithSetStormtroopersGeneric<T, U> map, int
+       position)
         {
             return map._setStormtroopers.Remove(position);
         }
@@ -94,9 +95,13 @@ namespace Stormtrooper
         public Bitmap ShowOnMap()
         {
             Shaking();
-            foreach (var storm in _setStormtroopers.GetStormtroopers())
+            for (int i = 0; i < _setStormtroopers.Count; i++)
             {
-                return _map.CreateMap(_pictureWidth, _pictureHeight, storm);
+                var car = _setStormtroopers.Get(i);
+                if (car != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, car);
+                }
             }
             return new(_pictureWidth, _pictureHeight);
         }
@@ -121,11 +126,11 @@ namespace Stormtrooper
             int j = _setStormtroopers.Count - 1;
             for (int i = 0; i < _setStormtroopers.Count; i++)
             {
-                if (_setStormtroopers[i] == null)
+                if (_setStormtroopers.Get(i) == null)
                 {
                     for (; j > i; j--)
                     {
-                        var car = _setStormtroopers[i];
+                        var car = _setStormtroopers.Get(j);
                         if (car != null)
                         {
                             _setStormtroopers.Insert(car, i);
@@ -169,10 +174,10 @@ namespace Stormtrooper
         {
             int numOfObjectsInRow = _pictureWidth / _placeSizeWidth;
             int i = 0;
-            foreach (var storm in _setStormtroopers.GetStormtroopers())
+            for (int j = 0; j < _setStormtroopers.Count; j++)
             {
-                storm.SetObject((numOfObjectsInRow - (i % numOfObjectsInRow) - 1) * _placeSizeWidth, (i / numOfObjectsInRow) * _placeSizeHeight + _placeSizeHeight, _pictureWidth, _pictureHeight);
-                storm.DrawningObject(g);
+                _setStormtroopers.Get(i)?.SetObject((numOfObjectsInRow - (i % numOfObjectsInRow) - 1) * _placeSizeWidth, (i / numOfObjectsInRow) * _placeSizeHeight + _placeSizeHeight, _pictureWidth, _pictureHeight);
+                _setStormtroopers.Get(i)?.DrawningObject(g);
                 i++;
             }
 

Stormtrooper/Stormtrooper/MapsCollection.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Stormtrooper
-{
-    internal class MapsCollection
-    {
-        /// <summary>
-        /// Словарь (хранилище) с картами
-        /// </summary>
-        readonly Dictionary<string, MapWithSetStormtroopersGeneric<DrawningObjectStorm, AbstractMap>> _mapStorages;
-        /// <summary>
-        /// Возвращение списка названий карт
-        /// </summary>
-        public List<string> Keys => _mapStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// <param name="pictureHeight"></param>
-        public MapsCollection(int pictureWidth, int pictureHeight)
-        {
-            _mapStorages = new Dictionary<string, MapWithSetStormtroopersGeneric<DrawningObjectStorm, AbstractMap>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        /// <param name="map">Карта</param>
-        public void AddMap(string name, AbstractMap map)
-        {
-            if (_mapStorages.ContainsKey(name))
-            {
-                MessageBox.Show("Карта с таким названием уже существует!");
-                return;
-            }
-            _mapStorages.Add(name, new MapWithSetStormtroopersGeneric<DrawningObjectStorm, AbstractMap>(_pictureWidth, _pictureHeight, map));
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        public void DelMap(string name)
-        {
-            if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
-        }
-        /// <summary>
-        /// Доступ к парковке
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public MapWithSetStormtroopersGeneric<DrawningObjectStorm, AbstractMap> this[string ind]
-        {
-            get
-            {
-                if (_mapStorages.ContainsKey(ind)) return _mapStorages[ind];
-
-                return null;
-            }
-        }
-
-    }
-}

Stormtrooper/Stormtrooper/SetStormtroopersGeneric.cs

@@ -14,45 +14,56 @@ namespace Stormtrooper
         where T : class
     {
         /// <summary>
-        ///  Список объектов, которые храним
+        /// Массив объектов, которые храним
         /// </summary>
-        private readonly List<T> _places;
+        private readonly T[] _places;
         /// <summary>
-        /// Количество объектов в списке
+        /// Количество объектов в массиве
         /// </summary>
-        public int Count => _places.Count;
+        public int Count => _places.Length;
 
-        private readonly int _maxCount;
+        public int TecCount = 0; // текущее количество объектов в массиве
         /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
         public SetStormtroopersGeneric(int count)
         {
-            _maxCount = count;
-            _places = new List<T>();
+            _places = new T[count];
         }
         /// <summary>
         /// Добавление объекта в набор
         /// </summary>
-        /// <param name="stormtrooper">Добавляемый штурмовик</param>
+        /// <param name="car">Добавляемый автомобиль</param>
         /// <returns></returns>
         public int Insert(T stormtrooper)
         {
-            if (_places.Count + 1 >= _maxCount) return -1;
             return Insert(stormtrooper, 0);
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
         /// </summary>
-        /// <param name="stormtrooper">Добавляемый штурмовик</param>
+        /// <param name="car">Добавляемый автомобиль</param>
         /// <param name="position">Позиция</param>
         /// <returns></returns>
         public int Insert(T stormtrooper, int position)
         {
-            if (position < 0 || position >= _maxCount) return -1;
-            if (_places.Count + 1 >= _maxCount) return -1;
-            _places.Insert(position, stormtrooper);
+
+            if (position < 0 || position >= Count || TecCount == Count) return -1;
+
+            TecCount++;
+            while (_places[position] != null)
+            {
+                for (int i = _places.Length - 1; i > 0; --i)
+                {
+                    if (_places[i] == null && _places[i - 1] != null)
+                    {
+                        _places[i] = _places[i - 1];
+                        _places[i - 1] = null;
+                    }
+                }
+            }
+            _places[position] = stormtrooper;
             return position;
         }
         /// <summary>
@@ -62,9 +73,9 @@ namespace Stormtrooper
         /// <returns></returns>
         public T Remove(int position)
         {
-            if (position < 0 || position >= _maxCount) return null;
+            if (position < 0 || position >= _places.Length) return null;
             T saveStorm = _places[position];
-            _places.RemoveAt(position);
+            _places[position] = null;
             return saveStorm;
         }
         /// <summary>
@@ -72,36 +83,10 @@ namespace Stormtrooper
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public T this[int position]
+        public T Get(int position)
         {
-            get
-            {
-                if (position < 0 || position >= _maxCount) return null;
+            if (position < 0 || position >= Count || _places[position] == null) return null;
             return _places[position];
         }
-            set
-            {
-                if (position < 0 || position >= _maxCount) Insert(value, position);
-
-            }
-        }
-        /// <summary>
-        /// Проход по набору до первого пустого
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<T> GetStormtroopers()
-        {
-            foreach (var storm in _places)
-            {
-                if (storm != null)
-                {
-                    yield return storm;
-                }
-                else
-                {
-                    yield break;
-                }
-            }
-        }
     }
 }