Fix

revert revert d9bd7fc54d

revert Добавления, изменения

Ship/Ship/FormMapWithSetShips.Designer.cs

@@ -29,12 +29,6 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
-            this.buttonDeleteMap = new System.Windows.Forms.Button();
-            this.listBoxMaps = new System.Windows.Forms.ListBox();
-            this.buttonAddMap = new System.Windows.Forms.Button();
-            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
@@ -44,15 +38,14 @@
             this.buttonRemoveShip = new System.Windows.Forms.Button();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonAddShip = 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.buttonRight);
             this.groupBoxTools.Controls.Add(this.buttonDown);
             this.groupBoxTools.Controls.Add(this.buttonLeft);
@@ -62,83 +55,21 @@
             this.groupBoxTools.Controls.Add(this.buttonRemoveShip);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonAddShip);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(767, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(600, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(200, 619);
+            this.groupBoxTools.Size = new System.Drawing.Size(200, 450);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
-            // groupBoxMaps
-            // 
-            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
-            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
-            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(6, 22);
-            this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Size = new System.Drawing.Size(182, 289);
-            this.groupBoxMaps.TabIndex = 11;
-            this.groupBoxMaps.TabStop = false;
-            this.groupBoxMaps.Text = "Карты";
-            // 
-            // buttonDeleteMap
-            // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(13, 235);
-            this.buttonDeleteMap.Name = "buttonDeleteMap";
-            this.buttonDeleteMap.Size = new System.Drawing.Size(162, 34);
-            this.buttonDeleteMap.TabIndex = 4;
-            this.buttonDeleteMap.Text = "Удалить карту";
-            this.buttonDeleteMap.UseVisualStyleBackColor = true;
-            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
-            // 
-            // listBoxMaps
-            // 
-            this.listBoxMaps.FormattingEnabled = true;
-            this.listBoxMaps.ItemHeight = 15;
-            this.listBoxMaps.Location = new System.Drawing.Point(13, 120);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(163, 109);
-            this.listBoxMaps.TabIndex = 3;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(14, 80);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(162, 34);
-            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(13, 22);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(163, 23);
-            this.textBoxNewMapName.TabIndex = 1;
-            // 
-            // 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(13, 51);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(169, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            // 
             // buttonRight
             // 
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::Ship.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(124, 577);
+            this.buttonRight.Location = new System.Drawing.Point(124, 408);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 10;
@@ -150,7 +81,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::Ship.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(88, 577);
+            this.buttonDown.Location = new System.Drawing.Point(88, 408);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 9;
@@ -162,7 +93,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::Ship.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(52, 577);
+            this.buttonLeft.Location = new System.Drawing.Point(52, 408);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 8;
@@ -174,7 +105,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::Ship.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(88, 541);
+            this.buttonUp.Location = new System.Drawing.Point(88, 372);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 7;
@@ -183,7 +114,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 498);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 315);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(169, 37);
             this.buttonShowOnMap.TabIndex = 5;
@@ -193,7 +124,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(19, 455);
+            this.buttonShowStorage.Location = new System.Drawing.Point(19, 240);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(169, 37);
             this.buttonShowStorage.TabIndex = 4;
@@ -203,7 +134,7 @@
             // 
             // buttonRemoveShip
             // 
-            this.buttonRemoveShip.Location = new System.Drawing.Point(19, 412);
+            this.buttonRemoveShip.Location = new System.Drawing.Point(19, 166);
             this.buttonRemoveShip.Name = "buttonRemoveShip";
             this.buttonRemoveShip.Size = new System.Drawing.Size(169, 37);
             this.buttonRemoveShip.TabIndex = 3;
@@ -213,7 +144,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 383);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 137);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(169, 23);
@@ -221,7 +152,7 @@
             // 
             // buttonAddShip
             // 
-            this.buttonAddShip.Location = new System.Drawing.Point(19, 340);
+            this.buttonAddShip.Location = new System.Drawing.Point(19, 94);
             this.buttonAddShip.Name = "buttonAddShip";
             this.buttonAddShip.Size = new System.Drawing.Size(169, 37);
             this.buttonAddShip.TabIndex = 1;
@@ -229,12 +160,25 @@
             this.buttonAddShip.UseVisualStyleBackColor = true;
             this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_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, 22);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(169, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 0);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(767, 619);
+            this.pictureBox.Size = new System.Drawing.Size(600, 450);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -242,7 +186,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(967, 619);
+            this.ClientSize = new System.Drawing.Size(800, 450);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Name = "FormMapWithSetShips";
@@ -250,8 +194,6 @@
             this.Load += new System.EventHandler(this.FormMapWithSetShips_Load);
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
-            this.groupBoxMaps.ResumeLayout(false);
-            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -271,10 +213,5 @@
         private Button buttonDown;
         private Button buttonLeft;
         private Button buttonUp;
-        private GroupBox groupBoxMaps;
-        private Button buttonDeleteMap;
-        private ListBox listBoxMaps;
-        private Button buttonAddMap;
-        private TextBox textBoxNewMapName;
     }
 }

Ship/Ship/FormMapWithSetShips.cs

@@ -13,19 +13,6 @@ namespace Ship
 {
     public partial class FormMapWithSetShips : Form
     {
-
-        /// <summary>
-        /// Словарь для выпадающего списка
-        /// </summary>
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-        {
-            { "Простая карта", new SimpleMap() },
-            { "Водная карта", new WaterMap() }
-        };
-        /// <summary>
-        /// Объект от коллекции карт
-        /// </summary>
-        private readonly MapsCollection _mapsCollection;
         /// <summary>
         /// Объект от класса карты с набором объектов
         /// </summary>
@@ -36,55 +23,6 @@ namespace Ship
         public FormMapWithSetShips()
         {
             InitializeComponent();
-            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
-            comboBoxSelectorMap.Items.Clear();
-            foreach (var elem in _mapsDict)
-            {
-                comboBoxSelectorMap.Items.Add(elem.Key);
-            }
-        }
-
-        /// <summary>
-        /// Заполнение listBoxMaps
-        /// </summary>
-        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;
-            }
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        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();
         }
         /// <summary>
         /// Выбор карты
@@ -93,28 +31,24 @@ namespace Ship
         /// <param name="e"></param>
         private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
         {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
-        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonDeleteMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
             {
-                return;
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Водная карта":
+                    map = new WaterMap();
+                    break;
             }
-            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            if (map != null)
             {
-                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ??
-                string.Empty);
-                ReloadMaps();
+                _mapShipsCollectionGeneric = new
+               MapWithSetShipsGeneric<DrawingObject, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapShipsCollectionGeneric = null;
             }
         }
         /// <summary>
@@ -124,7 +58,7 @@ namespace Ship
         /// <param name="e"></param>
         private void ButtonAddShip_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapShipsCollectionGeneric == null)
             {
                 return;
             }
@@ -132,10 +66,10 @@ namespace Ship
             if (form.ShowDialog() == DialogResult.OK)
             {
                 DrawingObject car = new(form.SelectedShip);
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + car != -1)
+                if (_mapShipsCollectionGeneric + car != -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
                 }
                 else
                 {
@@ -150,10 +84,6 @@ namespace Ship
         /// <param name="e"></param>
         private void ButtonRemoveShip_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
@@ -164,10 +94,10 @@ namespace Ship
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            if (_mapShipsCollectionGeneric - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
             }
             else
             {
@@ -181,11 +111,11 @@ namespace Ship
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapShipsCollectionGeneric == null)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            pictureBox.Image = _mapShipsCollectionGeneric.ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -194,11 +124,11 @@ namespace Ship
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapShipsCollectionGeneric == null)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+            pictureBox.Image = _mapShipsCollectionGeneric.ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -207,7 +137,7 @@ namespace Ship
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapShipsCollectionGeneric == null)
             {
                 return;
             }
@@ -229,7 +159,7 @@ namespace Ship
                     dir = Direction.Right;
                     break;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+            pictureBox.Image = _mapShipsCollectionGeneric.MoveObject(dir);
         }
         private void FormMapWithSetShips_Load(object sender, EventArgs e)
         {

Ship/Ship/MapWithSetShipsGeneric.cs

@@ -92,7 +92,7 @@ namespace Ship
             Shaking();
             for (int i = 0; i < _setShips.Count; i++)
             {
-                var car = _setShips[i];
+                var car = _setShips.Get(i);
                 if (car != null)
                 {
                     return _map.CreateMap(_pictureWidth, _pictureHeight, car);
@@ -121,11 +121,11 @@ namespace Ship
             int j = _setShips.Count - 1;
             for (int i = 0; i < _setShips.Count; i++)
             {
-                if (_setShips[i] == null)
+                if (_setShips.Get(i) == null)
                 {
                     for (; j > i; j--)
                     {
-                        var car = _setShips[j];
+                        var car = _setShips.Get(j);
                         if (car != null)
                         {
                             _setShips.Insert(car, i);
@@ -174,12 +174,14 @@ namespace Ship
             int width = _pictureWidth / _placeSizeWidth;
             int height = _pictureHeight / _placeSizeHeight;
 
-            int i = 0;
-            foreach (var ship in _setShips.GetShips())
+            for (int i = 0; i < _setShips.Count; i++)
             {
-                ship.SetObject((width - i % width - 1) * _placeSizeWidth + 10, (i / width) * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
-                ship.DrawningObject(g);
-                i++;
+                var ship = _setShips.Get(i);
+                if (ship != null)
+                {
+                    ship.SetObject((width - i % width - 1) * _placeSizeWidth + 10, (i / width) * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
+                    ship.DrawningObject(g);
+                }
             }
         }
     }

Ship/Ship/MapsCollection.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ship
-{
-    /// <summary>
-    /// Класс для хранения коллекции карт
-    /// </summary>
-    internal class MapsCollection
-    {
-        /// <summary>
-        /// Словарь (хранилище) с картами
-        /// </summary>
-        readonly Dictionary<string, MapWithSetShipsGeneric<DrawingObject, 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, MapWithSetShipsGeneric<DrawingObject, AbstractMap>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        /// <param name="map">Карта</param>
-        public void AddMap(string name, AbstractMap map)
-        {
-            _mapStorages.Add(name, new MapWithSetShipsGeneric<DrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        public void DelMap(string name)
-        {
-            _mapStorages.Remove(name);
-        }
-        /// <summary>
-        /// Доступ к парковке
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public MapWithSetShipsGeneric<DrawingObject, AbstractMap> this[string ind]
-        {
-            get
-            {
-                if (_mapStorages.ContainsKey(ind)) return _mapStorages[ind];
-                else return null;
-            }
-        }
-    }
-}

Ship/Ship/SetShipsGeneric.cs

@@ -12,21 +12,18 @@ namespace Ship
         /// <summary>
         /// Массив объектов, которые храним
         /// </summary>
-        private readonly List<T> _places;
+        private readonly T[] _places;
         /// <summary>
         /// Количество объектов в массиве
         /// </summary>
-        public int Count => _places.Count;
-
-        private readonly int _maxCount;
+        public int Count => _places.Length;
         /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
         public SetShipsGeneric(int count)
         {
-            _maxCount = count;
-            _places = new List<T>();
+            _places = new T[count];
         }
         /// <summary>
         /// Добавление объекта в набор
@@ -45,9 +42,38 @@ namespace Ship
         /// <returns></returns>
         public int Insert(T ship, int position)
         {
-            if (position > _maxCount || Count == _maxCount || position < 0) return -1;
+            if (position < 0 || position >= Count)
+            {
+                return -1;
+            }
 
-            _places.Insert(position, ship);
+            if (_places[position] == null)
+            {
+                _places[position] = ship;
+                return position;
+            }
+
+            int firstNull = -1;
+
+            for (int i = position + 1; i < Count; i++)
+            {
+                if (_places[i] == null)
+                {
+                    firstNull = i;
+                    break;
+                }
+            }
+
+            if (firstNull == -1)
+            {
+                return -1;
+            }
+
+            for (int i = firstNull; i > position; i--)
+            {
+                (_places[i], _places[i - 1]) = (_places[i - 1], _places[i]);
+            }
+            _places[position] = ship;
             return position;
         }
         /// <summary>
@@ -57,14 +83,14 @@ namespace Ship
         /// <returns></returns>
         public T Remove(int position)
         {
-            if (position < 0 || position >= Count)
+            if (position < 0 || position >= Count || _places[position] == null)
             {
                 return null;
             }
 
             var result = _places[position];
 
-            _places.RemoveAt(position);
+            _places[position] = null;
             return result;
         }
         /// <summary>
@@ -72,41 +98,14 @@ namespace Ship
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public T this[int position]
+        public T Get(int position)
         {
-            get
+            if (position < 0 || position >= Count)
             {
-                if (position >= Count || position < 0)
-                {
-                    return null;
-                }
-                return _places[position];
-            }
-            set
-            {
-                if (position < Count && position >= 0)
-                {
-                    Insert(value, position);
-                }
-            }
-        }
-        /// <summary>
-        /// Проход по набору до первого пустого
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<T> GetShips()
-        {
-            foreach (var ship in _places)
-            {
-                if (ship != null)
-                {
-                    yield return ship;
-                }
-                else
-                {
-                    yield break;
-                }
+                return null;
             }
+            return _places[position];
         }
+
     }
 }