chnage FileStream to StreamWriter and StreamReader

AirFighter/AirFighter/DrawingAirFighter.cs

@@ -30,6 +30,11 @@ namespace AirFighter
             _airFighterHeight = airFighterHeight;
         }
 
+        public DrawingAirFighter Update(int? speed = null, float? weight = null, Color? bodyColor = null)
+        {
+            return new DrawingAirFighter(speed ?? AirFighter.Speed, weight ?? AirFighter.Weight, bodyColor ?? AirFighter.BodyColor);
+        }
+
         public void SetPosition(int x, int y, int width, int height)
         {
             if (width < _airFighterWidth || height < _airFighterHeight) return;

AirFighter/AirFighter/DrawingModernAirFighter.cs

@@ -13,6 +13,14 @@ namespace AirFighter
         {
            AirFighter = new EntityModernAirFighter(speed, weight, bodyColor, dopColor, dopWings, rockets);
         }
+        public DrawingModernAirFighter Update(int? speed = null, float? weight = null, Color? bodyColor = null,
+            Color? dopColor = null, bool? dopWings = null, bool? rockets = null)
+        {
+            EntityModernAirFighter entity = (EntityModernAirFighter)AirFighter;
+            return new DrawingModernAirFighter(speed ?? entity.Speed, weight ?? entity.Weight, bodyColor ?? entity.BodyColor,
+                                               dopColor ?? entity.DopColor, dopWings ?? entity.DopWings, rockets ?? entity.Rockets);
+        }
+
         public override void DrawTransport(Graphics g)
         {
             if (AirFighter is not EntityModernAirFighter modernAirFighter)

AirFighter/AirFighter/DrawingObjectAirFighter.cs

@@ -32,5 +32,8 @@ namespace AirFighter
             // TODO
             _airFighter.DrawTransport(g);
         }
+        public string GetInfo() => _airFighter?.GetDataForSave();
+        public static IDrawingObject Create(string data) => new DrawingObjectAirFighter(data.CreateDrawingAirFighter());
+
     }
 }

AirFighter/AirFighter/ExtensionAircraft.cs

@@ -0,0 +1,39 @@
+namespace AirFighter
+{
+    internal static class ExtentionAircraft
+    {
+        private static readonly char _separatorForObject = ':';
+        public static DrawingAirFighter CreateDrawingAirFighter(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawingAirFighter(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 6)
+            {
+                return new DrawingModernAirFighter(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
+                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
+               Convert.ToBoolean(strs[5]));
+            }
+            return null;
+        }
+        public static string GetDataForSave(this DrawingAirFighter drawningAircraft)
+        {
+            var aircraft = drawningAircraft.AirFighter;
+            var str = 
+                $"{aircraft.Speed}{_separatorForObject}{aircraft.Weight}{_separatorForObject}" +
+                $"{aircraft.BodyColor.Name}";
+
+            if (aircraft is not EntityModernAirFighter modernAircraft)
+            {
+                return str;
+            }
+            return
+           $"{str}{_separatorForObject}{modernAircraft.DopColor.Name}{_separatorForObject}" +
+           $"{modernAircraft.Rockets}{_separatorForObject}{modernAircraft.DopWings}";
+        }
+    }
+}

AirFighter/AirFighter/FormAircraftConfig.Designer.cs

@@ -0,0 +1,362 @@
+namespace AirFighter
+{
+    partial class FormAircraftConfig
+    {
+        /// <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.groupBoxConfig = new System.Windows.Forms.GroupBox();
+            this.labelModifiedObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxRockets = new System.Windows.Forms.CheckBox();
+            this.checkBoxDopWings = new System.Windows.Forms.CheckBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.panel8 = new System.Windows.Forms.Panel();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBoxConfig.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            this.panel8.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBox1);
+            this.groupBoxConfig.Controls.Add(this.checkBoxRockets);
+            this.groupBoxConfig.Controls.Add(this.checkBoxDopWings);
+            this.groupBoxConfig.Controls.Add(this.label2);
+            this.groupBoxConfig.Controls.Add(this.label1);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+            this.groupBoxConfig.Location = new System.Drawing.Point(12, 23);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Size = new System.Drawing.Size(581, 307);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(410, 240);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(117, 43);
+            this.labelModifiedObject.TabIndex = 9;
+            this.labelModifiedObject.Text = "Продвинутый";
+            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(276, 240);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(117, 43);
+            this.labelSimpleObject.TabIndex = 8;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.panelGray);
+            this.groupBox1.Controls.Add(this.panelBlack);
+            this.groupBox1.Controls.Add(this.panelPurple);
+            this.groupBox1.Controls.Add(this.panelWhite);
+            this.groupBox1.Controls.Add(this.panelBlue);
+            this.groupBox1.Controls.Add(this.panelGreen);
+            this.groupBox1.Controls.Add(this.panelYellow);
+            this.groupBox1.Controls.Add(this.panelRed);
+            this.groupBox1.Location = new System.Drawing.Point(262, 54);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(280, 165);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Цвета";
+            // 
+            // panelGray
+            // 
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(81, 100);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(50, 50);
+            this.panelGray.TabIndex = 2;
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(148, 100);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(50, 50);
+            this.panelBlack.TabIndex = 2;
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(215, 100);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(50, 50);
+            this.panelPurple.TabIndex = 2;
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(14, 100);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(50, 50);
+            this.panelWhite.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(215, 31);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(50, 50);
+            this.panelBlue.TabIndex = 1;
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Lime;
+            this.panelGreen.Location = new System.Drawing.Point(148, 31);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(50, 50);
+            this.panelGreen.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(81, 31);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(50, 50);
+            this.panelYellow.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(14, 31);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(50, 50);
+            this.panelRed.TabIndex = 0;
+            // 
+            // checkBoxRockets
+            // 
+            this.checkBoxRockets.AutoSize = true;
+            this.checkBoxRockets.Location = new System.Drawing.Point(22, 222);
+            this.checkBoxRockets.Name = "checkBoxRockets";
+            this.checkBoxRockets.Size = new System.Drawing.Size(79, 24);
+            this.checkBoxRockets.TabIndex = 5;
+            this.checkBoxRockets.Text = "Ракеты";
+            this.checkBoxRockets.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxDopWings
+            // 
+            this.checkBoxDopWings.AutoSize = true;
+            this.checkBoxDopWings.Location = new System.Drawing.Point(22, 182);
+            this.checkBoxDopWings.Name = "checkBoxDopWings";
+            this.checkBoxDopWings.Size = new System.Drawing.Size(207, 24);
+            this.checkBoxDopWings.TabIndex = 4;
+            this.checkBoxDopWings.Text = "Дополнительные крылья";
+            this.checkBoxDopWings.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(22, 105);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(36, 20);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(22, 56);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(76, 20);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "Скорость:";
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(119, 105);
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27);
+            this.numericUpDownWeight.TabIndex = 1;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(119, 54);
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27);
+            this.numericUpDownSpeed.TabIndex = 0;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // panel8
+            // 
+            this.panel8.AllowDrop = true;
+            this.panel8.Controls.Add(this.label6);
+            this.panel8.Controls.Add(this.label5);
+            this.panel8.Controls.Add(this.pictureBoxObject);
+            this.panel8.Location = new System.Drawing.Point(682, 23);
+            this.panel8.Name = "panel8";
+            this.panel8.Size = new System.Drawing.Size(329, 263);
+            this.panel8.TabIndex = 1;
+            this.panel8.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
+            this.panel8.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
+            // 
+            // label6
+            // 
+            this.label6.AllowDrop = true;
+            this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label6.Location = new System.Drawing.Point(171, 24);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(143, 43);
+            this.label6.TabIndex = 11;
+            this.label6.Text = "Доп. цвет";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label6.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+            this.label6.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
+            // 
+            // label5
+            // 
+            this.label5.AllowDrop = true;
+            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label5.Location = new System.Drawing.Point(13, 24);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(143, 43);
+            this.label5.TabIndex = 10;
+            this.label5.Text = "Цвет";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label5.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+            this.label5.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(13, 70);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(301, 176);
+            this.pictureBoxObject.TabIndex = 0;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(695, 308);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.buttonOk.Size = new System.Drawing.Size(110, 31);
+            this.buttonOk.TabIndex = 2;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(886, 308);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(110, 31);
+            this.buttonCancel.TabIndex = 3;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormAircraftConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1040, 351);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panel8);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Name = "FormAircraftConfig";
+            this.Text = "FormAircraftConfig";
+            this.groupBoxConfig.ResumeLayout(false);
+            this.groupBoxConfig.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            this.panel8.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private GroupBox groupBox1;
+        private CheckBox checkBoxRockets;
+        private CheckBox checkBoxDopWings;
+        private Label label2;
+        private Label label1;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelModifiedObject;
+        private Label labelSimpleObject;
+        private Panel panelGray;
+        private Panel panelBlack;
+        private Panel panelPurple;
+        private Panel panelWhite;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelYellow;
+        private Panel panelRed;
+        private Panel panel8;
+        private Label label6;
+        private Label label5;
+        private PictureBox pictureBoxObject;
+        private Button buttonOk;
+        private Button buttonCancel;
+    }
+}

AirFighter/AirFighter/FormAircraftConfig.cs

@@ -0,0 +1,191 @@
+namespace AirFighter
+{
+    /// <summary>
+    /// Форма создания объекта
+    /// </summary>
+    public partial class FormAircraftConfig : Form
+    {
+        /// <summary>
+        /// Переменная-выбранная машина
+        /// </summary>
+        DrawingAirFighter _car = null;
+
+        private Action<DrawingAirFighter> EventAddCar = null;
+        /// <summary>
+        /// Событие
+        /// </summary>
+        //  private event CarDelegate EventAddCar;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormAircraftConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.MouseDown += PanelColor_MouseDown;
+            panelGray.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
+            // TODO buttonCancel.Click with lambda
+
+            buttonCancel.Click += (s, e) => Close();
+            
+        }
+        /// <summary>
+        /// Отрисовать машину
+        /// </summary>
+        
+        public void AddEvent(Action<DrawingAirFighter> ev)
+        {
+            if(EventAddCar == null)
+            {
+                EventAddCar = ev;
+                return;
+            }
+
+            EventAddCar += ev;
+        }
+
+        private void DrawCar()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _car?.SetPosition(5, 5, pictureBoxObject.Width,
+           pictureBoxObject.Height);
+            _car?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+        /// <summary>
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev"></param>
+/*        public void AddEvent(CarDelegate ev)
+        {
+            if (EventAddCar == null)
+            {
+                EventAddCar = new CarDelegate(ev);
+            }
+            else
+            {
+                EventAddCar += ev;
+            }
+        }*/
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name,
+           DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    _car = new DrawingAirFighter((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _car = new DrawingModernAirFighter((int)numericUpDownSpeed.Value,
+                   (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                    checkBoxDopWings.Checked, checkBoxRockets.Checked);
+                    break;
+            }
+            DrawCar();
+        }
+        /// <summary>
+        /// Отправляем цвет с панели
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor,
+           DragDropEffects.Move | DragDropEffects.Copy);
+        }
+        /// <summary>
+        private void LabelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        /// Принимаем основной цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_car == null) return;
+            Color color = (Color)e.Data.GetData(typeof(Color));
+
+            if(_car is DrawingModernAirFighter)
+            {
+                _car = ((DrawingModernAirFighter)_car).Update(bodyColor: color);
+            }
+            else
+            {
+                _car = _car.Update(bodyColor: color);
+            }
+            DrawCar();
+        }
+        /// <summary>
+        /// Принимаем дополнительный цвет
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            var car = _car as DrawingModernAirFighter;
+            if (car == null) return;
+
+            Color color = (Color)e.Data.GetData(typeof(Color));
+            _car = car.Update(dopColor: color);
+            DrawCar();
+        }
+        /// <summary>
+        /// Добавление машины
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddCar?.Invoke(_car);
+            Close();
+        }
+
+    }
+}

AirFighter/AirFighter/FormAircraftConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

AirFighter/AirFighter/FormMapWithSetCars.Designer.cs

@@ -45,9 +45,16 @@
             this.ButtonShowStorage = new System.Windows.Forms.Button();
             this.buttonAdd = new System.Windows.Forms.Button();
             this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.файлToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
             this.tools.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // tools
@@ -63,9 +70,9 @@
             this.tools.Controls.Add(this.ButtonShowStorage);
             this.tools.Controls.Add(this.buttonAdd);
             this.tools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.tools.Location = new System.Drawing.Point(940, 0);
+            this.tools.Location = new System.Drawing.Point(940, 28);
             this.tools.Name = "tools";
-            this.tools.Size = new System.Drawing.Size(250, 725);
+            this.tools.Size = new System.Drawing.Size(250, 697);
             this.tools.TabIndex = 0;
             this.tools.TabStop = false;
             this.tools.Text = "Инструменты";
@@ -138,7 +145,7 @@
             this.RightButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.RightButton.BackgroundImage = global::AirFighter.Properties.Resources.right;
             this.RightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.RightButton.Location = new System.Drawing.Point(148, 683);
+            this.RightButton.Location = new System.Drawing.Point(148, 655);
             this.RightButton.Name = "RightButton";
             this.RightButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.RightButton.Size = new System.Drawing.Size(30, 30);
@@ -151,7 +158,7 @@
             this.LeftButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.LeftButton.BackgroundImage = global::AirFighter.Properties.Resources.left;
             this.LeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.LeftButton.Location = new System.Drawing.Point(76, 683);
+            this.LeftButton.Location = new System.Drawing.Point(76, 655);
             this.LeftButton.Name = "LeftButton";
             this.LeftButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.LeftButton.Size = new System.Drawing.Size(30, 30);
@@ -164,7 +171,7 @@
             this.UpButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.UpButton.BackgroundImage = global::AirFighter.Properties.Resources.up;
             this.UpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.UpButton.Location = new System.Drawing.Point(112, 648);
+            this.UpButton.Location = new System.Drawing.Point(112, 620);
             this.UpButton.Name = "UpButton";
             this.UpButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.UpButton.Size = new System.Drawing.Size(30, 30);
@@ -177,7 +184,7 @@
             this.DownButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.DownButton.BackgroundImage = global::AirFighter.Properties.Resources.down;
             this.DownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.DownButton.Location = new System.Drawing.Point(112, 683);
+            this.DownButton.Location = new System.Drawing.Point(112, 655);
             this.DownButton.Name = "DownButton";
             this.DownButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.DownButton.Size = new System.Drawing.Size(30, 30);
@@ -236,12 +243,54 @@
             // pictureBox
             // 
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Location = new System.Drawing.Point(0, 28);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(940, 725);
+            this.pictureBox.Size = new System.Drawing.Size(940, 697);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
+            // menuStrip1
+            // 
+            this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.файлToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(1190, 28);
+            this.menuStrip1.TabIndex = 2;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.saveToolStripMenuItem,
+            this.loadToolStripMenuItem});
+            this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            this.файлToolStripMenuItem.Size = new System.Drawing.Size(58, 24);
+            this.файлToolStripMenuItem.Text = "файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            this.saveToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+            this.saveToolStripMenuItem.Text = "Сохранение";
+            this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+            // 
+            // loadToolStripMenuItem
+            // 
+            this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            this.loadToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+            this.loadToolStripMenuItem.Text = "Загрузка";
+            this.loadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
             // FormMapWithSetCars
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -249,6 +298,8 @@
             this.ClientSize = new System.Drawing.Size(1190, 725);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.tools);
+            this.Controls.Add(this.menuStrip1);
+            this.MainMenuStrip = this.menuStrip1;
             this.Name = "FormMapWithSetCars";
             this.Text = "FormMapWithSetCars";
             this.tools.ResumeLayout(false);
@@ -256,7 +307,10 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -279,5 +333,11 @@
         private ListBox listBoxMaps;
         private Button buttonAddMap;
         private TextBox textBoxNewMapName;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
     }
 }

AirFighter/AirFighter/FormMapWithSetCars.cs

@@ -105,28 +105,31 @@ namespace AirFighter
             }
         }
 
-
-        private void ButtonAddCar_Click(object sender, EventArgs e)
+        private void AircraftAddCallback(DrawingAirFighter aircraft)
         {
             if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            FormAirFighter form = new();
-            if (form.ShowDialog() == DialogResult.OK)
+
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectAirFighter(aircraft) != -1)
             {
-                DrawingObjectAirFighter car = new(form.SelectedAirFighter);
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + car != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image =
-                   _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image =
+               _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
+            else
+            {
+                MessageBox.Show("Не удалось добавить объект");
+            }
+        }
+
+
+        private void ButtonAddCar_Click(object sender, EventArgs e)
+        {
+            FormAircraftConfig form = new();
+            form.AddEvent(AircraftAddCallback);
+            form.Show();
         }
         /// <summary>
         /// Удаление объекта
@@ -220,5 +223,43 @@ namespace AirFighter
             pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
 
         }
+
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                if (_mapsCollection.SaveData(saveFileDialog.FileName))
+                {
+                    MessageBox.Show("Сохранение прошло успешно", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("Не сохранилось", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            // TODO продумать логику
+
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                if (_mapsCollection.LoadData(openFileDialog.FileName))
+                {
+                    MessageBox.Show("Загрузка прошла успешно", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    ReloadMaps();
+                }
+                else
+                {
+                    MessageBox.Show("Не загрузилось", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
     }
 }

AirFighter/AirFighter/FormMapWithSetCars.resx

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

AirFighter/AirFighter/IDrawingObject.cs

@@ -12,6 +12,7 @@ namespace AirFighter
         void SetObject(int x, int y, int width, int height);
         void MoveObject(Direction direction);
         void DrawningObject(Graphics g);
+        string GetInfo();
         (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
     }
 

AirFighter/AirFighter/MapWithSetCarsGeneric.cs

@@ -109,9 +109,24 @@ namespace AirFighter
             }
             return new(_pictureWidth, _pictureHeight);
         }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
+
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var car in _setCars.GetCars())
+            {
+                data += $"{car.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setCars.Insert(DrawingObjectAirFighter.Create(rec) as T);
+            }
+        }
+
         private void Shaking()
         {
             int j = _setCars.Count - 1;

AirFighter/AirFighter/MapsCollection.cs

@@ -8,31 +8,19 @@ namespace AirFighter
 {
     internal class MapsCollection
     {
-        /// <summary>
-        /// Словарь (хранилище) с картами
-        /// </summary>
-        readonly Dictionary<string, MapWithSetCarsGeneric<DrawingObjectAirFighter, AbstractMap>> _mapStorages;
-        /// <summary>
-        /// Возвращение списка названий карт
-        /// </summary>
+        readonly Dictionary<string, MapWithSetCarsGeneric<IDrawingObject, AbstractMap>> _mapStorages;
+
         public List<string> Keys => _mapStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
+
         private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
         private readonly int _pictureHeight;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// <param name="pictureHeight"></param>
+
+        private char separatorDict = '|';
+        private char separatorData = ';';
+
         public MapsCollection(int pictureWidth, int pictureHeight)
         {
-            _mapStorages = new Dictionary<string,
-           MapWithSetCarsGeneric<DrawingObjectAirFighter, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetCarsGeneric<IDrawingObject, AbstractMap>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -49,21 +37,71 @@ namespace AirFighter
 
             _mapStorages[name] = new(_pictureWidth, _pictureHeight, map);
         }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
+
         public void DelMap(string name)
         {
             // TODO Прописать логику для удаления
             _mapStorages.Remove(name);
         }
-        /// <summary>
-        /// Доступ к парковке
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public MapWithSetCarsGeneric<DrawingObjectAirFighter, AbstractMap> this[string ind]
+
+        public bool SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            using (StreamWriter fs = new(filename))
+            {
+                fs.Write($"MapsCollection{Environment.NewLine}");
+                foreach (var storage in _mapStorages)
+                {
+
+                    fs.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+                }
+            }
+            return true;
+        }
+
+        public bool LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                return false;
+            }
+            using (StreamReader fs = new(filename))
+            {
+                string current = fs.ReadLine();
+                if (!current.Contains("MapsCollection"))
+                {
+                    //если нет такой записи, то это не те данные
+                    return false;
+                }
+
+                _mapStorages.Clear();
+
+                while ((current = fs.ReadLine()) != null)
+                {
+                    var elem = current.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "MyMap":
+                            map = new MyMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetCarsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+                }
+            }
+
+            return true;
+        }
+
+
+        public MapWithSetCarsGeneric<IDrawingObject, AbstractMap> this[string ind]
         {
             get
             {