SemesterFirstLabFourthBomberBase

ProjectBomber/ProjectBomber/DrawningBomber.cs

@@ -1,4 +1,5 @@
 using ProjectBomber.Entities;
+using ProjectBomber.MovementStrategy;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -207,6 +208,11 @@ namespace ProjectBomber.DrawningObjects
                     break;
             }
         }
+        /// <summary>
+        /// Получение объекта IMoveableObject из объекта DrawningCar
+        /// </summary>
+        public IMoveableObject GetMoveableObject => new
+        DrawningObjectBomber(this);
         public virtual void DrawTransport(Graphics g)
         {
             if (EntityBomber == null)

ProjectBomber/ProjectBomber/Form1.Designer.cs

@@ -38,6 +38,7 @@
             this.comboBox1Strategy = new System.Windows.Forms.ComboBox();
             this.ButtonCreatePlane = new System.Windows.Forms.Button();
             this.ButtonStep = new System.Windows.Forms.Button();
+            this.ButtonSelectPlane = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBomber)).BeginInit();
             this.SuspendLayout();
             // 
@@ -142,10 +143,21 @@
             this.ButtonStep.UseVisualStyleBackColor = true;
             this.ButtonStep.Click += new System.EventHandler(this.ButtonStep_Click);
             // 
+            // ButtonSelectPlane
+            // 
+            this.ButtonSelectPlane.Location = new System.Drawing.Point(295, 421);
+            this.ButtonSelectPlane.Name = "ButtonSelectPlane";
+            this.ButtonSelectPlane.Size = new System.Drawing.Size(101, 28);
+            this.ButtonSelectPlane.TabIndex = 11;
+            this.ButtonSelectPlane.Text = "Выбрать";
+            this.ButtonSelectPlane.UseVisualStyleBackColor = true;
+            this.ButtonSelectPlane.Click += new System.EventHandler(this.ButtonSelectPlane_Click);
+            // 
             // FormBomber
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
             this.ClientSize = new System.Drawing.Size(884, 461);
+            this.Controls.Add(this.ButtonSelectPlane);
             this.Controls.Add(this.ButtonStep);
             this.Controls.Add(this.ButtonCreatePlane);
             this.Controls.Add(this.comboBox1Strategy);
@@ -175,6 +187,7 @@
         private System.Windows.Forms.ComboBox comboBox1Strategy;
         private System.Windows.Forms.Button ButtonCreatePlane;
         private System.Windows.Forms.Button ButtonStep;
+        private System.Windows.Forms.Button ButtonSelectPlane;
     }
 }
 

ProjectBomber/ProjectBomber/Form1.cs

@@ -22,9 +22,15 @@ namespace ProjectBomber
         /// Стратегии перемещения
         /// </summary>
         private AbstractStrategy _abstractStrategy;
+        /// <summary>
+        /// Выбранный автомобиль
+        /// </summary>
+        public DrawningBomber SelectedBomber { get; private set; }
         public FormBomber()
         {
             InitializeComponent();
+            _abstractStrategy = null;
+            SelectedBomber = null;
         }
         private void Draw()
         {
@@ -45,11 +51,22 @@ namespace ProjectBomber
         private void ButtonCreateBomber_Click(object sender, EventArgs e)
         {
             Random random = new Random();
+            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            Color dopColor = Color.FromArgb(random.Next(0, 256),
+            random.Next(0, 256), random.Next(0, 256));
+            //выбор основного цвета и дополнительного
+            ColorDialog colorDialog = new ColorDialog();
+            if (colorDialog.ShowDialog() == DialogResult.OK)
+            {
+                color = colorDialog.Color;
+                if (colorDialog.ShowDialog() == DialogResult.OK)
+                {
+                    dopColor = colorDialog.Color;
+                }
+            }
             _drawningBomber = new DrawningBomberAdvanced(random.Next(100, 300), random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
-            pictureBoxBomber.Width, pictureBoxBomber.Height);
+            color, dopColor, Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)), pictureBoxBomber.Width, pictureBoxBomber.Height);
             _drawningBomber.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
         }
@@ -61,8 +78,13 @@ namespace ProjectBomber
         private void ButtonCreatePlane_Click(object sender, EventArgs e)
         {
             Random random = new Random();
-            _drawningBomber = new DrawningBomber(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
-            random.Next(0, 256)), pictureBoxBomber.Width, pictureBoxBomber.Height);
+            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+            ColorDialog colorDialog = new ColorDialog();
+            if (colorDialog.ShowDialog() == DialogResult.OK)
+            {
+                color = colorDialog.Color;
+            }
+            _drawningBomber = new DrawningBomber(random.Next(100, 300), random.Next(1000, 3000), color, pictureBoxBomber.Width, pictureBoxBomber.Height);
             _drawningBomber.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
         }
@@ -132,5 +154,15 @@ namespace ProjectBomber
                 _abstractStrategy = null;
             }
         }
+        /// <summary>
+        /// Выбор самолета
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSelectPlane_Click(object sender, EventArgs e)
+        {
+            SelectedBomber = _drawningBomber;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

ProjectBomber/ProjectBomber/FormPlaneCollection.Designer.cs

@@ -0,0 +1,187 @@
+namespace ProjectBomber
+{
+    partial class FormPlaneCollection
+    {
+        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.groupBoxSet = new System.Windows.Forms.GroupBox();
+            this.ButtonDelObject = new System.Windows.Forms.Button();
+            this.ListBoxStorages = new System.Windows.Forms.ListBox();
+            this.ButtonAddObject = new System.Windows.Forms.Button();
+            this.textBoxStorageName = new System.Windows.Forms.TextBox();
+            this.ButtonRefreshCollection = new System.Windows.Forms.Button();
+            this.ButtonRemovePlane = new System.Windows.Forms.Button();
+            this.maskedTextBoxNumber = new System.Windows.Forms.TextBox();
+            this.ButtonAddPlane = new System.Windows.Forms.Button();
+            this.pictureBoxCollection = new System.Windows.Forms.PictureBox();
+            this.groupBox1.SuspendLayout();
+            this.groupBoxSet.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.groupBoxSet);
+            this.groupBox1.Controls.Add(this.ButtonRefreshCollection);
+            this.groupBox1.Controls.Add(this.ButtonRemovePlane);
+            this.groupBox1.Controls.Add(this.maskedTextBoxNumber);
+            this.groupBox1.Controls.Add(this.ButtonAddPlane);
+            this.groupBox1.Location = new System.Drawing.Point(586, 2);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(216, 563);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Инструменты";
+            // 
+            // groupBoxSet
+            // 
+            this.groupBoxSet.Controls.Add(this.ButtonDelObject);
+            this.groupBoxSet.Controls.Add(this.ListBoxStorages);
+            this.groupBoxSet.Controls.Add(this.ButtonAddObject);
+            this.groupBoxSet.Controls.Add(this.textBoxStorageName);
+            this.groupBoxSet.Location = new System.Drawing.Point(21, 25);
+            this.groupBoxSet.Name = "groupBoxSet";
+            this.groupBoxSet.Size = new System.Drawing.Size(180, 274);
+            this.groupBoxSet.TabIndex = 4;
+            this.groupBoxSet.TabStop = false;
+            this.groupBoxSet.Text = "Наборы";
+            // 
+            // ButtonDelObject
+            // 
+            this.ButtonDelObject.Location = new System.Drawing.Point(7, 226);
+            this.ButtonDelObject.Name = "ButtonDelObject";
+            this.ButtonDelObject.Size = new System.Drawing.Size(161, 37);
+            this.ButtonDelObject.TabIndex = 3;
+            this.ButtonDelObject.Text = "Удалить набор";
+            this.ButtonDelObject.UseVisualStyleBackColor = true;
+            this.ButtonDelObject.Click += new System.EventHandler(this.ButtonDelObject_Click);
+            // 
+            // ListBoxStorages
+            // 
+            this.ListBoxStorages.FormattingEnabled = true;
+            this.ListBoxStorages.Location = new System.Drawing.Point(9, 112);
+            this.ListBoxStorages.Name = "ListBoxStorages";
+            this.ListBoxStorages.Size = new System.Drawing.Size(162, 95);
+            this.ListBoxStorages.TabIndex = 2;
+            this.ListBoxStorages.SelectedIndexChanged += new System.EventHandler(this.ListBoxStorages_SelectedIndexChanged);
+            // 
+            // ButtonAddObject
+            // 
+            this.ButtonAddObject.Location = new System.Drawing.Point(8, 61);
+            this.ButtonAddObject.Name = "ButtonAddObject";
+            this.ButtonAddObject.Size = new System.Drawing.Size(164, 34);
+            this.ButtonAddObject.TabIndex = 1;
+            this.ButtonAddObject.Text = "Добавить набор";
+            this.ButtonAddObject.UseVisualStyleBackColor = true;
+            this.ButtonAddObject.Click += new System.EventHandler(this.ButtonAddObject_Click);
+            // 
+            // textBoxStorageName
+            // 
+            this.textBoxStorageName.Location = new System.Drawing.Point(7, 21);
+            this.textBoxStorageName.Name = "textBoxStorageName";
+            this.textBoxStorageName.Size = new System.Drawing.Size(166, 20);
+            this.textBoxStorageName.TabIndex = 0;
+            // 
+            // ButtonRefreshCollection
+            // 
+            this.ButtonRefreshCollection.Location = new System.Drawing.Point(18, 509);
+            this.ButtonRefreshCollection.Name = "ButtonRefreshCollection";
+            this.ButtonRefreshCollection.Size = new System.Drawing.Size(178, 41);
+            this.ButtonRefreshCollection.TabIndex = 3;
+            this.ButtonRefreshCollection.Text = "Обновить коллекцию";
+            this.ButtonRefreshCollection.UseVisualStyleBackColor = true;
+            this.ButtonRefreshCollection.Click += new System.EventHandler(this.ButtonRefreshCollection_Click);
+            // 
+            // ButtonRemovePlane
+            // 
+            this.ButtonRemovePlane.Location = new System.Drawing.Point(18, 430);
+            this.ButtonRemovePlane.Name = "ButtonRemovePlane";
+            this.ButtonRemovePlane.Size = new System.Drawing.Size(179, 41);
+            this.ButtonRemovePlane.TabIndex = 2;
+            this.ButtonRemovePlane.Text = "Удалить самолет";
+            this.ButtonRemovePlane.UseVisualStyleBackColor = true;
+            this.ButtonRemovePlane.Click += new System.EventHandler(this.ButtonRemovePlane_Click);
+            // 
+            // maskedTextBoxNumber
+            // 
+            this.maskedTextBoxNumber.Location = new System.Drawing.Point(18, 388);
+            this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            this.maskedTextBoxNumber.Size = new System.Drawing.Size(180, 20);
+            this.maskedTextBoxNumber.TabIndex = 1;
+            // 
+            // ButtonAddPlane
+            // 
+            this.ButtonAddPlane.Location = new System.Drawing.Point(18, 327);
+            this.ButtonAddPlane.Name = "ButtonAddPlane";
+            this.ButtonAddPlane.Size = new System.Drawing.Size(185, 40);
+            this.ButtonAddPlane.TabIndex = 0;
+            this.ButtonAddPlane.Text = "Добавить самолет";
+            this.ButtonAddPlane.UseVisualStyleBackColor = true;
+            this.ButtonAddPlane.Click += new System.EventHandler(this.ButtonAddPlane_Click);
+            // 
+            // pictureBoxCollection
+            // 
+            this.pictureBoxCollection.Location = new System.Drawing.Point(-2, 2);
+            this.pictureBoxCollection.Name = "pictureBoxCollection";
+            this.pictureBoxCollection.Size = new System.Drawing.Size(600, 563);
+            this.pictureBoxCollection.TabIndex = 1;
+            this.pictureBoxCollection.TabStop = false;
+            // 
+            // FormPlaneCollection
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 564);
+            this.Controls.Add(this.pictureBoxCollection);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormPlaneCollection";
+            this.Text = "Набор самолетов";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBoxSet.ResumeLayout(false);
+            this.groupBoxSet.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button ButtonRefreshCollection;
+        private System.Windows.Forms.Button ButtonRemovePlane;
+        private System.Windows.Forms.TextBox maskedTextBoxNumber;
+        private System.Windows.Forms.Button ButtonAddPlane;
+        private System.Windows.Forms.PictureBox pictureBoxCollection;
+        private System.Windows.Forms.GroupBox groupBoxSet;
+        private System.Windows.Forms.Button ButtonDelObject;
+        private System.Windows.Forms.ListBox ListBoxStorages;
+        private System.Windows.Forms.Button ButtonAddObject;
+        private System.Windows.Forms.TextBox textBoxStorageName;
+    }
+}

ProjectBomber/ProjectBomber/FormPlaneCollection.cs

@@ -0,0 +1,182 @@
+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 ProjectBomber.MovementStrategy;
+using ProjectBomber.Generics;
+using ProjectBomber.DrawningObjects;
+
+namespace ProjectBomber
+{
+    /// <summary>
+    /// Форма для работы с набором объектов класса DrawningBomber
+    /// </summary>
+    public partial class FormPlaneCollection : Form
+    {
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly PlanesGenericStorage _storage;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormPlaneCollection()
+        {
+            InitializeComponent();
+            _storage = new PlanesGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+        }
+        /// <summary>
+        /// Заполнение listBoxObjects
+        /// </summary>
+        private void ReloadObjects()
+        {
+            int index = ListBoxStorages.SelectedIndex;
+            ListBoxStorages.Items.Clear();
+            for (int i = 0; i < _storage.Keys.Count; i++)
+            {
+                ListBoxStorages.Items.Add(_storage.Keys[i]);
+            }
+            if (ListBoxStorages.Items.Count > 0 && (index == -1 || index
+            >= ListBoxStorages.Items.Count))
+            {
+                ListBoxStorages.SelectedIndex = 0;
+            }
+            else if (ListBoxStorages.Items.Count > 0 && index > -1 &&
+            index < ListBoxStorages.Items.Count)
+            {
+                ListBoxStorages.SelectedIndex = index;
+            }
+        }
+        /// <summary>
+        /// Добавление набора в коллекцию
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddObject_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxStorageName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _storage.AddSet(textBoxStorageName.Text);
+            ReloadObjects();
+        }
+        /// <summary>
+        /// Выбор набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxStorages_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image =
+_storage[ListBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowPlanes();
+        }
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDelObject_Click(object sender, EventArgs e)
+        {
+            if (ListBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить объект {ListBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
+MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _storage.DelSet(ListBoxStorages.SelectedItem.ToString()?? string.Empty);
+                ReloadObjects();
+            }
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddPlane_Click(object sender, EventArgs e)
+        {
+            if (ListBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[ListBoxStorages.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            FormBomber form = new FormBomber();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                if (obj + form.SelectedBomber)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollection.Image = obj.ShowPlanes();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта из набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemovePlane_Click(object sender, EventArgs e)
+        {
+            if (ListBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[ListBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            if (obj - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = obj.ShowPlanes();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Обновление рисунка по набору
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            if (ListBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[ListBoxStorages.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            pictureBoxCollection.Image = obj.ShowPlanes();
+        }
+    }
+}

ProjectBomber/ProjectBomber/FormPlaneCollection.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ProjectBomber/ProjectBomber/PlanesGenericCollection.cs

@@ -0,0 +1,167 @@
+using ProjectBomber.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectBomber.DrawningObjects;
+
+namespace ProjectBomber.Generics
+{
+    /// <summary>
+    /// Параметризованный класс для набора объектов DrawningBomber
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class PlanesGenericCollection<T, U>
+    where T : DrawningBomber
+    where U : IMoveableObject
+    {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 200;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public PlanesGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static bool operator +(PlanesGenericCollection<T, U> collect, T
+        obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            collect?._collection.Insert(obj);
+            return true;
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static T operator -(PlanesGenericCollection<T, U> collect, int pos)
+        {
+            T obj = collect._collection[pos];
+            if (obj != null)
+            {
+                collect._collection.Remove(pos);
+            }
+            return obj;
+        }
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U GetU(int pos)
+        {
+            return (U)_collection[pos]?.GetMoveableObject;
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowPlanes()
+        {
+            Bitmap bmp = new Bitmap(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new Pen(Color.Black, 3);
+            int numColumns = _pictureWidth / _placeSizeWidth;
+            int numRows = _pictureHeight / _placeSizeHeight;
+
+            for (int i = 0; i <= numColumns; i++)
+            {
+                for (int j = 0; j <= numRows; ++j)
+                {
+                    // Линии разметки места
+                    int x = i * _placeSizeWidth;
+                    int y = j * _placeSizeHeight;
+                    g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y);
+                }
+
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, numRows * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            int numColumns = _pictureWidth / _placeSizeWidth;
+            int column = numColumns - 1;
+            int row = 0;
+            foreach (var plane in _collection.GetPlanes())
+            {
+                // Установка позиции бомбардировщика
+                int xPosition = column * _placeSizeWidth;
+                int yPosition = row * _placeSizeHeight;
+                if (plane != null)
+                {
+                    // Перемещение по ячейкам влево, вниз
+                    column--;
+                    if (column < 0)
+                    {
+                        column = numColumns - 1;
+                        row++;
+                    }
+                    plane.SetPosition(xPosition, yPosition);
+                    plane.DrawTransport(g);
+                }
+                else
+                {
+                    column--;
+                    if (column < 0)
+                    {
+                        column = numColumns - 1;
+                        row++;
+                    }
+                }
+            }
+        }
+    }
+}

ProjectBomber/ProjectBomber/PlanesGenericStorage.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectBomber.DrawningObjects;
+using ProjectBomber.MovementStrategy;
+
+namespace ProjectBomber.Generics
+{
+    /// <summary>
+    /// Класс для хранения коллекции
+    /// </summary>
+    internal class PlanesGenericStorage
+    {
+        /// <summary>
+        /// Словарь (хранилище)
+        /// </summary>
+        readonly Dictionary<string, PlanesGenericCollection<DrawningBomber,
+        DrawningObjectBomber>> _planeStorages;
+        /// <summary>
+        /// Возвращение списка названий наборов
+        /// </summary>
+        public List<string> Keys => _planeStorages.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 PlanesGenericStorage(int pictureWidth, int pictureHeight)
+        {
+            _planeStorages = new Dictionary<string,
+            PlanesGenericCollection<DrawningBomber, DrawningObjectBomber>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void AddSet(string name)
+        {
+            // Создаем новый набор и добавляем его в словарь
+            if (!_planeStorages.ContainsKey(name))
+            {
+                _planeStorages[name] = new PlanesGenericCollection<DrawningBomber, DrawningObjectBomber>(_pictureWidth, _pictureHeight);
+            }
+            else
+            {
+                throw new ArgumentException("Набор с таким именем уже существует");
+            }
+        }
+        /// <summary>
+        /// Удаление набора
+        /// </summary>
+        /// <param name="name">Название набора</param>
+        public void DelSet(string name)
+        {
+            // Удаляем набор из словаря по имени
+            if (_planeStorages.ContainsKey(name))
+            {
+                _planeStorages.Remove(name);
+            }
+            else
+            {
+                throw new ArgumentException("Набор с таким именем не найден.");
+            }
+        }
+        /// <summary>
+        /// Доступ к набору
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public PlanesGenericCollection<DrawningBomber, DrawningObjectBomber> this[string ind]
+        {
+            get
+            {
+                if (_planeStorages.ContainsKey(ind))
+                {
+                    return _planeStorages[ind];
+                }
+                else
+                {
+                    throw new KeyNotFoundException($"Набор с именем '{ind}' не найден.");
+                }
+            }
+        }
+    }
+}

ProjectBomber/ProjectBomber/Program.cs

@@ -16,7 +16,7 @@ namespace ProjectBomber
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new FormBomber());
+            Application.Run(new FormPlaneCollection());
         }
     }
 }

ProjectBomber/ProjectBomber/ProjectBomber.csproj

@@ -12,6 +12,21 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,16 +74,28 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="FormPlaneCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormPlaneCollection.Designer.cs">
+      <DependentUpon>FormPlaneCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="IMoveableObject.cs" />
     <Compile Include="MoveToBottomRight.cs" />
     <Compile Include="MoveToCenter.cs" />
     <Compile Include="ObjectParameters.cs" />
+    <Compile Include="PlanesGenericCollection.cs" />
+    <Compile Include="PlanesGenericStorage.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SetGeneric.cs" />
     <Compile Include="Status.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FormPlaneCollection.resx">
+      <DependentUpon>FormPlaneCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -91,5 +118,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 и x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ProjectBomber/ProjectBomber/SetGeneric.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBomber.Generics
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T> _places;
+        /// <summary>
+        /// Количество объектов в списке
+        /// </summary>
+        public int Count => _places.Count;
+        /// <summary>
+        /// Максимальное количество объектов в списке
+        /// </summary>
+        private readonly int _maxCount;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>(count);
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="plane">Добавляемый самолет</param>
+        /// <returns></returns>
+        public bool Insert(T plane)
+        {
+            if (_places.Count == 0)
+            {
+                _places.Add(plane);
+                return true;
+            }
+            else
+            {
+                if (_places.Count < _maxCount)
+                {
+                    _places.Add(plane);
+                    for (int i = 0; i < _places.Count; i++)
+                    {
+                        T temp = _places[i];
+                        _places[i] = _places[_places.Count - 1];
+                        _places[_places.Count - 1] = temp;
+                    }
+                    return true;
+                }
+            }
+            return true;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="plane">Добавляемый самолет</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public bool Insert(T plane, int position)
+        {
+            if (position < 0 || position >= _maxCount)
+            {
+                return false;
+            }
+            if (position < _places.Count && _places[position] == null)
+            {
+                _places[position] = plane;
+            }
+            else
+            {
+                // Ищем первую пустую позицию и вставляем туда.
+                for (int i = 0; i < _maxCount; i++)
+                {
+                    if (_places[i] == null)
+                    {
+                        _places[i] = plane;
+                        break;
+                    }
+                }
+            }
+            return true;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool Remove(int position)
+        {
+            if (position < 0 || position >= _maxCount)
+                return false;
+            _places[position] = null;
+            return true;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T this[int position]
+        {
+            get
+            {
+                if (position < 0 || position >= _maxCount)
+                    return null;
+                return _places[position];
+            }
+            set
+            {
+                if (position < 0 || position >= _maxCount || _places.Count >= _maxCount)
+                    return; // Неправильная позиция или нет места для вставки
+                _places[position] = value;
+            }
+        }
+        /// <summary>
+        /// Проход по списку
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetPlanes(int? maxPlanes = null)
+        {
+            for (int i = 0; i < _places.Count; ++i)
+            {
+                yield return _places[i];
+                if (maxPlanes.HasValue && i == maxPlanes.Value)
+                {
+                    yield break;
+                }
+            }
+        }
+    }
+}