Merge pull request 'Abazov A. A. LabWork03' (#3) from LabWork03 into LabWork02

Reviewed-on: http://student.git.athene.tech/Andrey_Abazov/PIbd-23_Abazov_A.A._AirBomber_Base/pulls/3

AirBomber/AirBomber/Direction.cs

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

AirBomber/AirBomber/DrawingAirBomber.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    internal class DrawingAirBomber
+    public class DrawingAirBomber
     {
         /// <summary>
         /// Класс-сущность

AirBomber/AirBomber/EntityAirBomber.cs

@@ -9,7 +9,7 @@ namespace AirBomber
     /// <summary>
     /// Класс-сущность "Бомбардировщик"
     /// </summary>
-    internal class EntityAirBomber
+    public class EntityAirBomber
     {
         /// <summary>
         /// Скорость

AirBomber/AirBomber/FormAirBomber.Designer.cs

@@ -39,6 +39,7 @@
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelect = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -154,11 +155,22 @@
             this.buttonCreateModif.UseVisualStyleBackColor = true;
             this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
             // 
+            // buttonSelect
+            // 
+            this.buttonSelect.Location = new System.Drawing.Point(668, 394);
+            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);
+            // 
             // FormAirBomber
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(882, 453);
+            this.Controls.Add(this.buttonSelect);
             this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonCreateAirBomber);
             this.Controls.Add(this.buttonRight);
@@ -190,5 +202,6 @@
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonCreateModif;
+        private Button buttonSelect;
     }
 }

AirBomber/AirBomber/FormAirBomber.cs

@@ -3,6 +3,10 @@ namespace AirBomber
     public partial class FormAirBomber : Form
     {
         private DrawingAirBomber _airBomber;
+        /// <summary>
+        /// Âűáđŕííűé îáúĺęň
+        /// </summary>
+        public DrawingAirBomber SelectedAirBomber { get; private set; }
 
         public FormAirBomber()
         {
@@ -24,11 +28,14 @@ namespace AirBomber
         private void buttonCreateAirBomber_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _airBomber = new DrawingAirBomber(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));
-            _airBomber.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
+            ColorDialog dialog = new();
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_airBomber.AirBomber.Speed}";
+            if (dialog.ShowDialog() == DialogResult.OK)
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_airBomber.AirBomber.Weight}";
+            {
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_airBomber.AirBomber.BodyColor.Name}";
+                color = dialog.Color;
+            }
+            _airBomber = new DrawingAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+            SetData();
             Draw();
         }
         /// <summary>
@@ -88,12 +95,31 @@ namespace AirBomber
         private void buttonCreateModif_Click(object sender, EventArgs e)
         {
             Random rnd = new();
+            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;
+            }
             _airBomber = new DrawingHeavyAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                color,
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                dopColor,
                 Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
             SetData();
             Draw();
         }
+
+        private void buttonSelect_Click(object sender, EventArgs e)
+        {
+            if (_airBomber == null) return;
+            SelectedAirBomber = _airBomber;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

AirBomber/AirBomber/FormMap.Designer.cs

@@ -1,213 +0,0 @@
-namespace AirBomber
-{
-    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.pictureBoxAirBomber = new System.Windows.Forms.PictureBox();
-            this.buttonCreateAirBomber = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.statusStrip1 = 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.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxAirBomber
-            // 
-            this.pictureBoxAirBomber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxAirBomber.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxAirBomber.Name = "pictureBoxAirBomber";
-            this.pictureBoxAirBomber.Size = new System.Drawing.Size(882, 427);
-            this.pictureBoxAirBomber.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxAirBomber.TabIndex = 0;
-            this.pictureBoxAirBomber.TabStop = false;
-            // 
-            // buttonCreateAirBomber
-            // 
-            this.buttonCreateAirBomber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateAirBomber.Location = new System.Drawing.Point(12, 395);
-            this.buttonCreateAirBomber.Name = "buttonCreateAirBomber";
-            this.buttonCreateAirBomber.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreateAirBomber.TabIndex = 2;
-            this.buttonCreateAirBomber.Text = "Создать";
-            this.buttonCreateAirBomber.UseVisualStyleBackColor = true;
-            this.buttonCreateAirBomber.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::AirBomber.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(804, 358);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            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::AirBomber.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(768, 394);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.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::AirBomber.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(804, 394);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 5;
-            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::AirBomber.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(840, 394);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModif.Location = new System.Drawing.Point(112, 395);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(120, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 427);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(882, 26);
-            this.statusStrip1.TabIndex = 8;
-            this.statusStrip1.Text = "statusStripInfo";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет:";
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            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(238, 394);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            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(882, 453);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreateModif);
-            this.Controls.Add(this.buttonCreateAirBomber);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.pictureBoxAirBomber);
-            this.Controls.Add(this.statusStrip1);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            this.Load += new System.EventHandler(this.FormMap_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxAirBomber;
-        private Button buttonCreateAirBomber;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonCreateModif;
-        private StatusStrip statusStrip1;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

AirBomber/AirBomber/FormMap.cs

@@ -1,112 +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 AirBomber
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        /// <summary>
-        /// Заполнение информации по объекту
-        /// </summary>
-        /// <param name="car"></param>
-        private void SetData(DrawingAirBomber airBomber)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {airBomber.AirBomber.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {airBomber.AirBomber.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {airBomber.AirBomber.BodyColor.Name}";
-            pictureBoxAirBomber.Image = _abstractMap.CreateMap(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height,
-                new DrawingObjectAirBomber(airBomber));
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var airBomber = new DrawingAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(airBomber);
-        }
-        /// <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;
-            }
-            pictureBoxAirBomber.Image = _abstractMap?.MoveObject(dir);
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Модификация"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var airBomber = new DrawingHeavyAirBomber(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)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(airBomber);
-        }
-        /// <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 "Городская карта":
-                    _abstractMap = new CityMap();
-                    break;
-                case "Линейная карта":
-                    _abstractMap = new LineMap();
-                    break;
-            }
-        }
-
-        private void FormMap_Load(object sender, EventArgs e)
-        {
-            comboBoxSelectorMap.SelectedIndex = 0;
-        }
-    }
-}

AirBomber/AirBomber/FormMapWithSetAirBombers.Designer.cs

@@ -0,0 +1,219 @@
+namespace AirBomber
+{
+    partial class FormMapWithSetAirBombers
+    {
+        /// <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.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.buttonAddAirBomber = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonRemoveAirBomber = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTools.Controls.Add(this.buttonRight);
+            this.groupBoxTools.Controls.Add(this.buttonDown);
+            this.groupBoxTools.Controls.Add(this.buttonLeft);
+            this.groupBoxTools.Controls.Add(this.buttonUp);
+            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTools.Controls.Add(this.buttonRemoveAirBomber);
+            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTools.Controls.Add(this.buttonAddAirBomber);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTools.Location = new System.Drawing.Point(621, 0);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(261, 453);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "Инструменты";
+            // 
+            // 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(621, 453);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            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, 35);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(218, 28);
+            this.comboBoxSelectorMap.TabIndex = 10;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // buttonAddAirBomber
+            // 
+            this.buttonAddAirBomber.Location = new System.Drawing.Point(19, 109);
+            this.buttonAddAirBomber.Name = "buttonAddAirBomber";
+            this.buttonAddAirBomber.Size = new System.Drawing.Size(218, 41);
+            this.buttonAddAirBomber.TabIndex = 11;
+            this.buttonAddAirBomber.Text = "Добавить бомбардировщик";
+            this.buttonAddAirBomber.UseVisualStyleBackColor = true;
+            this.buttonAddAirBomber.Click += new System.EventHandler(this.buttonAddAirBomber_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 188);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(218, 27);
+            this.maskedTextBoxPosition.TabIndex = 12;
+            this.maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonRemoveAirBomber
+            // 
+            this.buttonRemoveAirBomber.Location = new System.Drawing.Point(19, 221);
+            this.buttonRemoveAirBomber.Name = "buttonRemoveAirBomber";
+            this.buttonRemoveAirBomber.Size = new System.Drawing.Size(218, 41);
+            this.buttonRemoveAirBomber.TabIndex = 13;
+            this.buttonRemoveAirBomber.Text = "Удалить бомбардировщик";
+            this.buttonRemoveAirBomber.UseVisualStyleBackColor = true;
+            this.buttonRemoveAirBomber.Click += new System.EventHandler(this.buttonRemoveAirBomber_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(19, 281);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(218, 41);
+            this.buttonShowStorage.TabIndex = 14;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.buttonShowStorage_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(148, 411);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 18;
+            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::AirBomber.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(112, 411);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 17;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::AirBomber.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(76, 411);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 16;
+            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::AirBomber.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(112, 375);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 15;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(19, 328);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(218, 41);
+            this.buttonShowOnMap.TabIndex = 19;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click);
+            // 
+            // FormMapWithSetAirBombers
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(882, 453);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTools);
+            this.Name = "FormMapWithSetAirBombers";
+            this.Text = "Карта с набором объектов";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private PictureBox pictureBox;
+        private ComboBox comboBoxSelectorMap;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddAirBomber;
+        private Button buttonShowStorage;
+        private Button buttonRemoveAirBomber;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+    }
+}

AirBomber/AirBomber/FormMapWithSetAirBombers.cs

@@ -0,0 +1,142 @@
+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 AirBomber
+{
+    public partial class FormMapWithSetAirBombers : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetAirBombersGeneric<DrawingObjectAirBomber, AbstractMap> _mapAirBombersCollectionGeneric;
+
+        public FormMapWithSetAirBombers()
+        {
+            InitializeComponent();
+        }
+
+        private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Городская карта":
+                    map = new CityMap();
+                    break;
+                case "Линейная карта":
+                    map = new LineMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapAirBombersCollectionGeneric = new MapWithSetAirBombersGeneric<DrawingObjectAirBomber, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapAirBombersCollectionGeneric = null;
+            }
+        }
+
+        private void buttonAddAirBomber_Click(object sender, EventArgs e)
+        {
+            if (_mapAirBombersCollectionGeneric == null)
+            {
+                return;
+            }
+            FormAirBomber form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawingObjectAirBomber airBomber = new(form.SelectedAirBomber);
+                if (_mapAirBombersCollectionGeneric + airBomber != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapAirBombersCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+
+        private void buttonRemoveAirBomber_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapAirBombersCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapAirBombersCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+
+        private void buttonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapAirBombersCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapAirBombersCollectionGeneric.ShowSet();
+        }
+
+        private void buttonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapAirBombersCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapAirBombersCollectionGeneric.ShowOnMap();
+        }
+
+        /// <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;
+            }
+            pictureBox.Image = _mapAirBombersCollectionGeneric?.MoveObject(dir);
+        }
+    }
+}

AirBomber/AirBomber/FormMapWithSetAirBombers.resx

@@ -57,10 +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="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>46</value>
-  </metadata>
 </root>

AirBomber/AirBomber/MapWithSetAirBombersGeneric.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    internal class MapWithSetAirBombersGeneric <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 = 110;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 100;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetAirBombersGeneric<T> _setAirBombers;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetAirBombersGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setAirBombers = new SetAirBombersGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="car"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetAirBombersGeneric<T, U> map, T car)
+        {
+            return map._setAirBombers.Insert(car);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static T operator -(MapWithSetAirBombersGeneric<T, U> map, int position)
+        {
+            return map._setAirBombers.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawAirBombers(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setAirBombers.Count; i++)
+            {
+                var airBomber = _setAirBombers.Get(i);
+                if (airBomber != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, airBomber);
+                }
+            }
+            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 = _setAirBombers.Count - 1;
+            for (int i = 0; i < _setAirBombers.Count; i++)
+            {
+                if (_setAirBombers.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var car = _setAirBombers.Get(j);
+                        if (car != null)
+                        {
+                            _setAirBombers.Insert(car, i);
+                            _setAirBombers.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.White, 3);
+            g.FillRectangle(Brushes.Gray, 0, 0, _pictureWidth, _pictureHeight);
+            g.FillRectangle(Brushes.Black, _pictureWidth - 40, 0, _pictureWidth, _pictureHeight);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {//линия рамзетки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawAirBombers(Graphics g)
+        {
+            int numOfObjectsInRow = _pictureWidth / _placeSizeWidth;
+            for (int i = 0; i < _setAirBombers.Count; i++)
+            {
+                _setAirBombers.Get(i)?.SetObject((numOfObjectsInRow - (i % numOfObjectsInRow) - 1) * _placeSizeWidth, (i / numOfObjectsInRow) * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                _setAirBombers.Get(i)?.DrawingObject(g);
+            }
+        }
+    }
+}

AirBomber/AirBomber/Program.cs

@@ -11,7 +11,7 @@ namespace AirBomber
             // 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 FormMapWithSetAirBombers());
         }
     }
 }

AirBomber/AirBomber/SetAirBombersGeneric.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    internal class SetAirBombersGeneric<T>
+        where T : class
+    {
+        /// <summary>
+		/// Массив объектов, которые храним
+		/// </summary>
+		private readonly T[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetAirBombersGeneric(int count)
+        {
+            _places = new T[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="airBomber">Добавляемый автомобиль</param>
+        /// <returns></returns>
+        public int Insert(T airBomber)
+        {
+            return Insert(airBomber, 0);
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="airBomber">Добавляемый автомобиль</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T airBomber, int position)
+        {
+            if (position >= _places.Length)
+            {
+                return -1;
+            }
+            if (_places[position] != null)
+            {
+                int indexNull = -1;
+                for (int i = position; i < _places.Length; i++)
+                {
+                    if (_places[i] == null)
+                    {
+                        indexNull = i;
+                        break;
+                    }
+                }
+                if (indexNull == -1) return -1;
+                for (int i = indexNull; i > position; i--)
+                {
+                    T tmp = _places[i];
+                    _places[i] = _places[i - 1];
+                    _places[i - 1] = tmp;
+                }
+            }
+            _places[position] = airBomber;
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Remove(int position)
+        {
+            if (position >= _places.Length)
+            {
+                return null;
+            }
+            T removedObject = _places[position];
+            _places[position] = null;
+            return removedObject;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Get(int position)
+        {
+            if (position >= _places.Length)
+            {
+                return null;
+            }
+            return _places[position];
+        }
+    }
+}