Доработка Лабораторной №4

AntiAircraftGun/AntiAircraftGun/Direction.cs

@@ -9,7 +9,7 @@ namespace AntiAircraftGun
     /// <summary>
     /// Направление перемещения
     /// </summary>
-    internal enum Direction
+    public enum Direction
     {
         None = 0,
         Up = 1,

AntiAircraftGun/AntiAircraftGun/DrawingAntiAircraftGun.cs

@@ -9,7 +9,7 @@ namespace AntiAircraftGun
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawingAntiAircraftGun
+    public class DrawingAntiAircraftGun
     {
         /// <summary>
         /// Класс-сущность

AntiAircraftGun/AntiAircraftGun/DrawingUpdateAntiAircraftGun.cs

@@ -30,7 +30,6 @@ namespace AntiAircraftGun
             }
             Pen dopPen = new(updateAntiAircraftGun.DopColor, 4);
             Brush dopBrush = new SolidBrush(updateAntiAircraftGun.DopColor);
-           
             if (updateAntiAircraftGun.Gun)
             {
                 g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 30, 25, 15);

AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AntiAircraftGun
 {
-    internal class EntityAntiAircraftGun
+    public class EntityAntiAircraftGun
     {
         /// <summary>
         /// Скорость

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs

@@ -39,6 +39,7 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonCreareModif = new System.Windows.Forms.Button();
+            this.buttonSelect = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -47,9 +48,8 @@
             // 
             this.pictureBoxAntiAircraftGun.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxAntiAircraftGun.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxAntiAircraftGun.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pictureBoxAntiAircraftGun.Name = "pictureBoxAntiAircraftGun";
-            this.pictureBoxAntiAircraftGun.Size = new System.Drawing.Size(700, 316);
+            this.pictureBoxAntiAircraftGun.Size = new System.Drawing.Size(800, 425);
             this.pictureBoxAntiAircraftGun.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxAntiAircraftGun.TabIndex = 0;
             this.pictureBoxAntiAircraftGun.TabStop = false;
@@ -62,37 +62,35 @@
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 316);
+            this.statusStrip.Location = new System.Drawing.Point(0, 425);
             this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
-            this.statusStrip.Size = new System.Drawing.Size(700, 22);
+            this.statusStrip.Size = new System.Drawing.Size(800, 26);
             this.statusStrip.TabIndex = 1;
             // 
             // toolStripStatusLabelSpeed
             // 
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(73, 20);
             this.toolStripStatusLabelSpeed.Text = "Скорость";
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17);
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(33, 20);
             this.toolStripStatusLabelWeight.Text = "Вес";
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17);
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(42, 20);
             this.toolStripStatusLabelBodyColor.Text = "Цвет";
             // 
             // buttonCreate
             // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(10, 286);
-            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCreate.Location = new System.Drawing.Point(11, 381);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(82, 22);
+            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -103,10 +101,9 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(634, 256);
-            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUp.Location = new System.Drawing.Point(725, 341);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(26, 22);
+            this.buttonUp.Size = new System.Drawing.Size(30, 29);
             this.buttonUp.TabIndex = 3;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -116,10 +113,9 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(602, 284);
-            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonLeft.Location = new System.Drawing.Point(688, 379);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(26, 22);
+            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
             this.buttonLeft.TabIndex = 4;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -129,10 +125,9 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(665, 284);
-            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRight.Location = new System.Drawing.Point(760, 379);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(26, 22);
+            this.buttonRight.Size = new System.Drawing.Size(30, 29);
             this.buttonRight.TabIndex = 5;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -142,10 +137,9 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(634, 284);
-            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDown.Location = new System.Drawing.Point(725, 379);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(26, 22);
+            this.buttonDown.Size = new System.Drawing.Size(30, 29);
             this.buttonDown.TabIndex = 6;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -153,20 +147,31 @@
             // buttonCreareModif
             // 
             this.buttonCreareModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreareModif.Location = new System.Drawing.Point(97, 286);
-            this.buttonCreareModif.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCreareModif.Location = new System.Drawing.Point(111, 381);
             this.buttonCreareModif.Name = "buttonCreareModif";
-            this.buttonCreareModif.Size = new System.Drawing.Size(109, 22);
+            this.buttonCreareModif.Size = new System.Drawing.Size(125, 29);
             this.buttonCreareModif.TabIndex = 7;
             this.buttonCreareModif.Text = "Модификация";
             this.buttonCreareModif.UseVisualStyleBackColor = true;
             this.buttonCreareModif.Click += new System.EventHandler(this.ButtonCreareModif_Click);
             // 
+            // buttonSelect
+            // 
+            this.buttonSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSelect.Location = new System.Drawing.Point(578, 379);
+            this.buttonSelect.Name = "buttonSelect";
+            this.buttonSelect.Size = new System.Drawing.Size(94, 29);
+            this.buttonSelect.TabIndex = 8;
+            this.buttonSelect.Text = "Выбрать";
+            this.buttonSelect.UseVisualStyleBackColor = true;
+            this.buttonSelect.Click += new System.EventHandler(this.ButtonSelect_Click);
+            // 
             // FormAntiAircraftGun
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(700, 338);
+            this.ClientSize = new System.Drawing.Size(800, 451);
+            this.Controls.Add(this.buttonSelect);
             this.Controls.Add(this.buttonCreareModif);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonRight);
@@ -175,10 +180,9 @@
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxAntiAircraftGun);
             this.Controls.Add(this.statusStrip);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.MinimumSize = new System.Drawing.Size(46, 70);
+            this.MinimumSize = new System.Drawing.Size(50, 80);
             this.Name = "FormAntiAircraftGun";
-            this.Text = "Бронированная машина";
+            this.Text = "Зенитное орудие";
             this.Click += new System.EventHandler(this.ButtonMove_Click);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).EndInit();
             this.statusStrip.ResumeLayout(false);
@@ -201,5 +205,6 @@
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonCreareModif;
+        private Button buttonSelect;
     }
 }

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs

@@ -5,6 +5,10 @@ namespace AntiAircraftGun
     public partial class FormAntiAircraftGun : Form
     {
         private DrawingAntiAircraftGun _antiAircrafGun;
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        /// </summary>
+        public DrawingAntiAircraftGun SelectedAntiAircraftGun { get; private set; }
 
         public FormAntiAircraftGun()
         {
@@ -43,8 +47,13 @@ namespace AntiAircraftGun
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _antiAircrafGun = new DrawingAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            _antiAircrafGun = new DrawingAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
             SetData();
             Draw();
         }
@@ -92,12 +101,28 @@ namespace AntiAircraftGun
         private void ButtonCreareModif_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _antiAircrafGun = new DrawingUpdateAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000),
-           Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+            _antiAircrafGun = new DrawingUpdateAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
             Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
             SetData();
             Draw();
         }
+
+        private void ButtonSelect_Click(object sender, EventArgs e)
+        {
+            SelectedAntiAircraftGun = _antiAircrafGun;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

AntiAircraftGun/AntiAircraftGun/FormMap.Designer.cs

@@ -1,210 +0,0 @@
-namespace AntiAircraftGun
-{
-    partial class FormMap
-    {
-        /// <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()
-        {
-            this.pictureBoxAntiAircraftGun = new System.Windows.Forms.PictureBox();
-            this.statusStrip = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonCreareModif = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).BeginInit();
-            this.statusStrip.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxAntiAircraftGun
-            // 
-            this.pictureBoxAntiAircraftGun.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxAntiAircraftGun.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxAntiAircraftGun.Name = "pictureBoxAntiAircraftGun";
-            this.pictureBoxAntiAircraftGun.Size = new System.Drawing.Size(800, 425);
-            this.pictureBoxAntiAircraftGun.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxAntiAircraftGun.TabIndex = 0;
-            this.pictureBoxAntiAircraftGun.TabStop = false;
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 425);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 26);
-            this.statusStrip.TabIndex = 1;
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(73, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(33, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(42, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет";
-            // 
-            // buttonCreate
-            // 
-            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(11, 381);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(725, 341);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 29);
-            this.buttonUp.TabIndex = 3;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(688, 379);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(760, 379);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 29);
-            this.buttonRight.TabIndex = 5;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(725, 379);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 29);
-            this.buttonDown.TabIndex = 6;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreareModif
-            // 
-            this.buttonCreareModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreareModif.Location = new System.Drawing.Point(111, 381);
-            this.buttonCreareModif.Name = "buttonCreareModif";
-            this.buttonCreareModif.Size = new System.Drawing.Size(125, 29);
-            this.buttonCreareModif.TabIndex = 7;
-            this.buttonCreareModif.Text = "Модификация";
-            this.buttonCreareModif.UseVisualStyleBackColor = true;
-            this.buttonCreareModif.Click += new System.EventHandler(this.ButtonCreareModif_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Простая карта 2"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(11, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 451);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreareModif);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxAntiAircraftGun);
-            this.Controls.Add(this.statusStrip);
-            this.MinimumSize = new System.Drawing.Size(50, 80);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).EndInit();
-            this.statusStrip.ResumeLayout(false);
-            this.statusStrip.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxAntiAircraftGun;
-        private StatusStrip statusStrip;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonCreareModif;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

AntiAircraftGun/AntiAircraftGun/FormMap.cs

@@ -1,103 +0,0 @@
-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 AntiAircraftGun
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        /// <summary>
-        /// Заполнение информации по объекту
-        /// </summary>
-        /// <param name="car"></param>
-        private void SetData(DrawingAntiAircraftGun antiAircraftGun)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {antiAircraftGun.AntiAircraftGun.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {antiAircraftGun.AntiAircraftGun.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {antiAircraftGun.AntiAircraftGun.BodyColor.Name}";
-            pictureBoxAntiAircraftGun.Image = _abstractMap.CreateMap(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height,
-            new DrawingObjectAntiAircraftGun(antiAircraftGun));
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var antiAircraftGun = new DrawingAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(antiAircraftGun);
-        }
-        /// <summary>
-        /// Определение направления
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "buttonUp":
-                    dir = Direction.Up;
-                    break;
-                case "buttonDown":
-                    dir = Direction.Down;
-                    break;
-                case "buttonLeft":
-                    dir = Direction.Left;
-                    break;
-                case "buttonRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBoxAntiAircraftGun.Image = _abstractMap?.MoveObject(dir);
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Модификация"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreareModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var antiAircraftGun = new DrawingUpdateAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-            Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(antiAircraftGun);
-        }
-        /// <summary>
-        /// Смена карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Простая карта 2":
-                    _abstractMap = new SimpleMap2();
-                    break;
-            }
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.Designer.cs

@@ -0,0 +1,279 @@
+namespace AntiAircraftGun
+{
+    partial class FormMapWithSetAntiAircraftGuns
+    {
+        /// <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()
+        {
+            this.groupBox = new System.Windows.Forms.GroupBox();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveAntiAircraftGun = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddAntiAircraftGun = 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.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            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.groupBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.groupBoxMaps.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox
+            // 
+            this.groupBox.Controls.Add(this.buttonShowOnMap);
+            this.groupBox.Controls.Add(this.buttonShowStorage);
+            this.groupBox.Controls.Add(this.buttonRemoveAntiAircraftGun);
+            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox.Controls.Add(this.buttonAddAntiAircraftGun);
+            this.groupBox.Controls.Add(this.buttonDown);
+            this.groupBox.Controls.Add(this.buttonRight);
+            this.groupBox.Controls.Add(this.buttonLeft);
+            this.groupBox.Controls.Add(this.buttonUp);
+            this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox.Location = new System.Drawing.Point(574, 0);
+            this.groupBox.Name = "groupBox";
+            this.groupBox.Size = new System.Drawing.Size(238, 589);
+            this.groupBox.TabIndex = 0;
+            this.groupBox.TabStop = false;
+            this.groupBox.Text = "Инструменты";
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 465);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(194, 29);
+            this.buttonShowOnMap.TabIndex = 16;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(20, 430);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(194, 29);
+            this.buttonShowStorage.TabIndex = 15;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveAntiAircraftGun
+            // 
+            this.buttonRemoveAntiAircraftGun.Location = new System.Drawing.Point(20, 395);
+            this.buttonRemoveAntiAircraftGun.Name = "buttonRemoveAntiAircraftGun";
+            this.buttonRemoveAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
+            this.buttonRemoveAntiAircraftGun.TabIndex = 14;
+            this.buttonRemoveAntiAircraftGun.Text = "Удалить орудие";
+            this.buttonRemoveAntiAircraftGun.UseVisualStyleBackColor = true;
+            this.buttonRemoveAntiAircraftGun.Click += new System.EventHandler(this.ButtonRemoveAntiAircraftGun_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 362);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(194, 27);
+            this.maskedTextBoxPosition.TabIndex = 13;
+            // 
+            // buttonAddAntiAircraftGun
+            // 
+            this.buttonAddAntiAircraftGun.Location = new System.Drawing.Point(20, 327);
+            this.buttonAddAntiAircraftGun.Name = "buttonAddAntiAircraftGun";
+            this.buttonAddAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
+            this.buttonAddAntiAircraftGun.TabIndex = 12;
+            this.buttonAddAntiAircraftGun.Text = "Добавить орудие";
+            this.buttonAddAntiAircraftGun.UseVisualStyleBackColor = true;
+            this.buttonAddAntiAircraftGun.Click += new System.EventHandler(this.ButtonAddAntiAircraftGun_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(108, 547);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 29);
+            this.buttonDown.TabIndex = 10;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(143, 547);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 29);
+            this.buttonRight.TabIndex = 9;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(71, 547);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(108, 509);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 29);
+            this.buttonUp.TabIndex = 7;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Простая карта 2"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(14, 59);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(194, 28);
+            this.comboBoxSelectorMap.TabIndex = 11;
+            // 
+            // 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(574, 589);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // 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(580, 26);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(226, 277);
+            this.groupBoxMaps.TabIndex = 17;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 20;
+            this.listBoxMaps.Location = new System.Drawing.Point(14, 126);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(194, 104);
+            this.listBoxMaps.TabIndex = 14;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(14, 236);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(194, 29);
+            this.buttonDeleteMap.TabIndex = 13;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(14, 93);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(194, 29);
+            this.buttonAddMap.TabIndex = 12;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(14, 26);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(194, 27);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // FormMapWithSetAntiAircraftGuns
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(812, 589);
+            this.Controls.Add(this.groupBoxMaps);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox);
+            this.Name = "FormMapWithSetAntiAircraftGuns";
+            this.Text = "FormMapWithSetAntiAircraftGuns";
+            this.groupBox.ResumeLayout(false);
+            this.groupBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox;
+        private PictureBox pictureBox;
+        private Button buttonDown;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemoveAntiAircraftGun;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddAntiAircraftGun;
+        private ComboBox comboBoxSelectorMap;
+        private GroupBox groupBoxMaps;
+        private ListBox listBoxMaps;
+        private Button buttonDeleteMap;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.cs

@@ -0,0 +1,219 @@
+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;
+using static System.Windows.Forms.DataFormats;
+
+namespace AntiAircraftGun
+{
+    public partial class FormMapWithSetAntiAircraftGuns : Form
+    {
+        /// <summary>
+        /// Словарь для выпадающего списка
+        /// </summary>
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            { "Простая карта", new SimpleMap()},  { "Простая карта2", new SimpleMap2()}
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetAntiAircraftGuns()
+        {
+            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>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddAntiAircraftGun_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            FormAntiAircraftGun form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawingObjectAntiAircraftGun antiAircraftGun = new(form.SelectedAntiAircraftGun);
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + antiAircraftGun >= 0)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveAntiAircraftGun_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.resx

@@ -57,7 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

AntiAircraftGun/AntiAircraftGun/MapWithSetAntiAircraftGunsGeneric.cs

@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    /// <summary>
+    /// Карта с набром объектов под нее
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class MapWithSetAntiAircraftGunsGeneric<T, U>
+        where T : class, IDrawingObject
+        where U : AbstractMap
+    {
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 150;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetAntiAircraftGunsGeneric<T> _setAntiAircraftGuns;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetAntiAircraftGunsGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setAntiAircraftGuns = new SetAntiAircraftGunsGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="antiAircraftGuns"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetAntiAircraftGunsGeneric<T, U> map, T antiAircraftGuns)
+        {
+            return map._setAntiAircraftGuns.Insert(antiAircraftGuns);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static T operator -(MapWithSetAntiAircraftGunsGeneric<T, U> map, int position)
+        {
+            return map._setAntiAircraftGuns.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawAntiAircraftGuns(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var antiAircraftGun in _setAntiAircraftGuns.GetAntiAircraftGuns())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, antiAircraftGun);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// Перемещение объекта по крате
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setAntiAircraftGuns.Count - 1;
+            for (int i = 0; i < _setAntiAircraftGuns.Count; i++)
+            {
+                if (_setAntiAircraftGuns[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var antiAircraftGun = _setAntiAircraftGuns[j];
+                        if (antiAircraftGun != null)
+                        {
+                            _setAntiAircraftGuns.Insert(antiAircraftGun, i);
+                            _setAntiAircraftGuns.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Brush brushSandyBrown = new SolidBrush(Color.SandyBrown);
+            Brush brushLightGray = new SolidBrush(Color.LightGray);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight; ++j)
+                {
+                    g.FillRectangle(brushSandyBrown, i * _placeSizeWidth, j * _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+                    g.FillRectangle(brushLightGray, i * _placeSizeWidth + _placeSizeWidth / 16, j * _placeSizeHeight + _placeSizeHeight / 14, _placeSizeWidth * 14 / 16, _placeSizeHeight * 12 / 14);
+                }
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawAntiAircraftGuns(Graphics g)
+        {
+            int xPositionInStorage = _placeSizeWidth / 10;
+            int yPositionInStorage = _placeSizeHeight / 10;
+            foreach (var antiAircraftGun in _setAntiAircraftGuns.GetAntiAircraftGuns())
+            {
+                antiAircraftGun.SetObject(xPositionInStorage, yPositionInStorage, _pictureWidth, _pictureHeight);
+                antiAircraftGun.DrawingObjectAntiAircraftGun(g);
+                xPositionInStorage += _placeSizeWidth;
+                if (xPositionInStorage > _pictureWidth - _placeSizeWidth)
+                {
+                    xPositionInStorage = _placeSizeWidth / 10;
+                    yPositionInStorage += _placeSizeHeight;
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/MapsCollection.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, 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, MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, 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)) _mapStorages.Add(name, new MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, 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 MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (_mapStorages.TryGetValue(ind, out var map)) return map;
+                return null;
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/Program.cs

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

AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AntiAircraftGun
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetAntiAircraftGunsGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T> _places;
+        /// <summary>
+        /// Количество объектов в списке
+        /// </summary>
+        public int Count => _places.Count;
+        private readonly int _maxCount;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetAntiAircraftGunsGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="antiAircraftGun">Добавляемое орудие</param>
+        /// <returns></returns>
+        public int Insert(T antiAircraftGun)
+        {
+            if (_places.Count < _maxCount)
+            {
+                _places.Add(antiAircraftGun);
+                for (int i = 0; i < _places.Count; i++)
+                {
+                    if (_places[i] == antiAircraftGun) return i;
+                }
+            }
+            return -1;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="antiAircraftGun">Добавляемое орудие</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T antiAircraftGun, int position)
+        {
+            if (position < 0 || position >= _places.Count) return -1;
+            _places.Insert(position, antiAircraftGun);
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Remove(int position)
+        {
+            if (position < 0 || position >= _places.Count) return null;
+            if (_places[position] == null) return null;
+            T removed = _places[position];
+            _places.RemoveAt(position);
+            return removed;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= _places.Count) return null;
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position >= _places.Count) return;
+                _places.Insert(position, value);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetAntiAircraftGuns()
+        {
+            foreach (var antiAircraftGun in _places)
+            {
+                if (antiAircraftGun != null)
+                {
+                    yield return antiAircraftGun;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}

AntiAircraftGun/AntiAircraftGun/SimpleMap.cs

@@ -40,7 +40,7 @@ namespace AntiAircraftGun
                     _map[i, j] = _freeRoad;
                 }
             }
-            while (counter < 25)
+            while (counter < 50)
             {
                 int x = _random.Next(0, 100);
                 int y = _random.Next(0, 100);

AntiAircraftGun/AntiAircraftGun/SimpleMap2.cs

@@ -37,7 +37,7 @@ namespace AntiAircraftGun
                     _map[i, j] = _freeRoad;
                 }
             }
-            while (counter < 15)
+            while (counter < 25)
             {
                 int x = _random.Next(0, 99);
                 int y = _random.Next(0, 100);