conflicts solution

AirFighter/AirFighter/AbstractMap.cs

@@ -32,29 +32,17 @@ namespace AirFighter
 
         private (int mapI, int mapJ) checkBarrier((float Left, float Right, float Top, float Bottom) rect)
         {
-            return checkBarrier(rect, false, false, true, false);
-        }
-        private (int mapI, int mapJ) checkBarrier((float Left, float Right, float Top, float Bottom) rect, bool minLeft, bool maxLeft, bool isTop, bool isBottom) 
-        {
-            (int mapI, int mapJ) res = (-1, -1);
-
             for (int i = (int)(rect.Top / _size_y); i <= (int)(rect.Bottom / _size_y) && i < _map.GetLength(0); ++i)
             {
                 for (int j = (int)(rect.Left / _size_x); j <= (int)(rect.Right / _size_x) && j < _map.GetLength(1); ++j)
                 {
                     if (j < 0) j = 0;
                     if (i < 0) i = 0;
-                    if (_map[i, j] != _barrier) continue;
+                    if (_map[i, j] == _barrier) return (i, j);
-
-                    if (res.mapI == -1) res = (i, j);
-                    if (minLeft && res.mapJ > j) res = (i, j);
-                    if (maxLeft && res.mapJ < j) res = (i, j);
-                    if(isBottom) res = (i, j);
-                    if (isTop) return (i, j);
                 }
             }
 
-            return res;
+            return (-1, -1);
         }
         public Bitmap MoveObject(Direction direction)
         {
@@ -65,37 +53,17 @@ namespace AirFighter
             float drawningWidth = position.Right - position.Left;
             float drawningHeight = position.Bottom - position.Top;
 
-            bool minLeft = false;
+            if (direction == Direction.Left)  position.Left -= _drawningObject.Step;
-            bool maxLeft = false;
+            if (direction == Direction.Right) position.Left += _drawningObject.Step;
-            bool isTop = false;
+            if (direction == Direction.Up)    position.Top -= _drawningObject.Step;
-            bool isBottom = false;
+            if (direction == Direction.Down)  position.Top += _drawningObject.Step;
-
-            if (direction == Direction.Left)
-            {
-                position.Left -= _drawningObject.Step;
-                maxLeft = true;
-            }
-            if (direction == Direction.Right)
-            {
-                position.Left += _drawningObject.Step;
-                minLeft = true;
-            }
-            if (direction == Direction.Up) { 
-                position.Top -= _drawningObject.Step;
-                isTop = true;
-            }    
-            if (direction == Direction.Down)
-            {
-                position.Top += _drawningObject.Step;
-                isBottom = true;
-            }
 
 
 
             position.Right = position.Left + drawningWidth;
             position.Bottom = position.Top + drawningHeight;
 
-            var currentBarrier = checkBarrier(position, minLeft, maxLeft, isTop, isBottom);
+            var currentBarrier = checkBarrier(position);
 
             if (currentBarrier.mapI == -1)
             {
@@ -146,7 +114,7 @@ namespace AirFighter
 
                 if(position.Right > _width)
                 {
-                    position.Top = (minRowIndex + 1) * _size_y + 1;
+                    position.Top = (minRowIndex + 1) * _size_y;
                     position.Bottom = position.Top + drawningHeight;
                      
                     position.Left = 0;

AirFighter/AirFighter/Direction.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirFighter
 {
-    public enum Direction
+    internal enum Direction
     {
         None,
         Up,

AirFighter/AirFighter/DrawingAirFighter.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirFighter
 {
-    public class DrawingAirFighter
+    internal class DrawingAirFighter
     {
         public EntityAirFighter AirFighter { get; protected set; }
 
@@ -91,7 +91,6 @@ namespace AirFighter
         {
             if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
             {
-                MessageBox.Show("test");
                 return;
             }
 

AirFighter/AirFighter/EntityAirFighter.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AirFighter
 {
-    public class EntityAirFighter
+    internal class EntityAirFighter
     {
         public int Speed { get; private set; }
         public float Weight { get; private set; }

AirFighter/AirFighter/FormAirFighter.Designer.cs

@@ -39,7 +39,6 @@
             this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
             this.button1 = new System.Windows.Forms.Button();
-            this.buttonSelect = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -160,23 +159,11 @@
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.CreateModernButton_Click);
             // 
-            // buttonSelect
-            // 
-            this.buttonSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonSelect.Location = new System.Drawing.Point(558, 389);
-            this.buttonSelect.Name = "buttonSelect";
-            this.buttonSelect.Size = new System.Drawing.Size(115, 29);
-            this.buttonSelect.TabIndex = 8;
-            this.buttonSelect.Text = "выбрать";
-            this.buttonSelect.UseVisualStyleBackColor = true;
-            this.buttonSelect.Click += new System.EventHandler(this.ButtonSelect_Click);
-            // 
             // FormAirFighter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonSelect);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.RightButton);
@@ -208,6 +195,5 @@
         private ToolStripStatusLabel toolStripStatusLabelWeight;
         private ToolStripStatusLabel toolStripStatusLabelBodyColor;
         private Button button1;
-        private Button buttonSelect;
     }
 }

AirFighter/AirFighter/FormAirFighter.cs

@@ -4,8 +4,6 @@ namespace AirFighter
     {
         private DrawingAirFighter _airFighter;
 
-        public DrawingAirFighter SelectedAirFighter { get; private set; }
-
         public FormAirFighter()
         {
             InitializeComponent();
@@ -21,14 +19,9 @@ namespace AirFighter
         private void CreateButton_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+
-           rnd.Next(0, 256));
+            _airFighter = new DrawingAirFighter(rnd.Next(100, 300), rnd.Next(1000, 2000), 
-            ColorDialog dialog = new();
+                             Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _airFighter = new DrawingAirFighter(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
 
             _airFighter.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBox.Width, pictureBox.Height);
 
@@ -39,22 +32,13 @@ namespace AirFighter
         private void CreateModernButton_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
             _airFighter = new DrawingModernAirFighter(rnd.Next(100, 300), rnd.Next(1000,2000), 
-            color, dopColor,
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)), 
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)),
                 Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2)));
 
+
             _airFighter.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBox.Width, pictureBox.Height);
 
             SetData(_airFighter);
@@ -93,11 +77,6 @@ namespace AirFighter
             Draw();
         }
 
-        private void ButtonSelect_Click(object sender, EventArgs e)
-        {
-            SelectedAirFighter = _airFighter;
-            DialogResult = DialogResult.OK;
-        }
 
         public void Draw()
         {

AirFighter/AirFighter/FormMapWithSetCars.Designer.cs

@@ -1,283 +0,0 @@
-namespace AirFighter
-{
-    partial class FormMapWithSetCars
-    {
-        /// <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.tools = new System.Windows.Forms.GroupBox();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.buttonDeleteMap = new System.Windows.Forms.Button();
-            this.listBoxMaps = new System.Windows.Forms.ListBox();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.buttonAddMap = new System.Windows.Forms.Button();
-            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
-            this.RightButton = new System.Windows.Forms.Button();
-            this.LeftButton = new System.Windows.Forms.Button();
-            this.UpButton = new System.Windows.Forms.Button();
-            this.DownButton = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRemove = new System.Windows.Forms.Button();
-            this.ButtonShowOnMap = new System.Windows.Forms.Button();
-            this.ButtonShowStorage = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.tools.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // tools
-            // 
-            this.tools.Controls.Add(this.groupBox1);
-            this.tools.Controls.Add(this.RightButton);
-            this.tools.Controls.Add(this.LeftButton);
-            this.tools.Controls.Add(this.UpButton);
-            this.tools.Controls.Add(this.DownButton);
-            this.tools.Controls.Add(this.maskedTextBoxPosition);
-            this.tools.Controls.Add(this.buttonRemove);
-            this.tools.Controls.Add(this.ButtonShowOnMap);
-            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.Name = "tools";
-            this.tools.Size = new System.Drawing.Size(250, 725);
-            this.tools.TabIndex = 0;
-            this.tools.TabStop = false;
-            this.tools.Text = "Инструменты";
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.buttonDeleteMap);
-            this.groupBox1.Controls.Add(this.listBoxMaps);
-            this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBox1.Controls.Add(this.buttonAddMap);
-            this.groupBox1.Controls.Add(this.textBoxNewMapName);
-            this.groupBox1.Location = new System.Drawing.Point(12, 33);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(226, 286);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "карты";
-            // 
-            // buttonDeleteMap
-            // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(12, 243);
-            this.buttonDeleteMap.Name = "buttonDeleteMap";
-            this.buttonDeleteMap.Size = new System.Drawing.Size(196, 29);
-            this.buttonDeleteMap.TabIndex = 13;
-            this.buttonDeleteMap.Text = "Удалить карту";
-            this.buttonDeleteMap.UseVisualStyleBackColor = true;
-            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
-            // 
-            // listBoxMaps
-            // 
-            this.listBoxMaps.FormattingEnabled = true;
-            this.listBoxMaps.ItemHeight = 20;
-            this.listBoxMaps.Location = new System.Drawing.Point(12, 133);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(196, 104);
-            this.listBoxMaps.TabIndex = 12;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Моя карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 59);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(196, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(12, 93);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(196, 29);
-            this.buttonAddMap.TabIndex = 11;
-            this.buttonAddMap.Text = "Добавить карту";
-            this.buttonAddMap.UseVisualStyleBackColor = true;
-            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
-            // 
-            // textBoxNewMapName
-            // 
-            this.textBoxNewMapName.Location = new System.Drawing.Point(12, 26);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(196, 27);
-            this.textBoxNewMapName.TabIndex = 0;
-            // 
-            // RightButton
-            // 
-            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.Name = "RightButton";
-            this.RightButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.RightButton.Size = new System.Drawing.Size(30, 30);
-            this.RightButton.TabIndex = 9;
-            this.RightButton.UseVisualStyleBackColor = true;
-            this.RightButton.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // LeftButton
-            // 
-            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.Name = "LeftButton";
-            this.LeftButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.LeftButton.Size = new System.Drawing.Size(30, 30);
-            this.LeftButton.TabIndex = 8;
-            this.LeftButton.UseVisualStyleBackColor = true;
-            this.LeftButton.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // UpButton
-            // 
-            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.Name = "UpButton";
-            this.UpButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.UpButton.Size = new System.Drawing.Size(30, 30);
-            this.UpButton.TabIndex = 7;
-            this.UpButton.UseVisualStyleBackColor = true;
-            this.UpButton.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // DownButton
-            // 
-            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.Name = "DownButton";
-            this.DownButton.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.DownButton.Size = new System.Drawing.Size(30, 30);
-            this.DownButton.TabIndex = 6;
-            this.DownButton.UseVisualStyleBackColor = true;
-            this.DownButton.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(24, 392);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(196, 27);
-            this.maskedTextBoxPosition.TabIndex = 5;
-            // 
-            // buttonRemove
-            // 
-            this.buttonRemove.Location = new System.Drawing.Point(24, 425);
-            this.buttonRemove.Name = "buttonRemove";
-            this.buttonRemove.Size = new System.Drawing.Size(196, 29);
-            this.buttonRemove.TabIndex = 4;
-            this.buttonRemove.Text = "Удалить";
-            this.buttonRemove.UseVisualStyleBackColor = true;
-            this.buttonRemove.Click += new System.EventHandler(this.ButtonRemoveCar_Click);
-            // 
-            // ButtonShowOnMap
-            // 
-            this.ButtonShowOnMap.Location = new System.Drawing.Point(24, 520);
-            this.ButtonShowOnMap.Name = "ButtonShowOnMap";
-            this.ButtonShowOnMap.Size = new System.Drawing.Size(196, 29);
-            this.ButtonShowOnMap.TabIndex = 3;
-            this.ButtonShowOnMap.Text = "Посмотреть карту";
-            this.ButtonShowOnMap.UseVisualStyleBackColor = true;
-            this.ButtonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // ButtonShowStorage
-            // 
-            this.ButtonShowStorage.Location = new System.Drawing.Point(24, 472);
-            this.ButtonShowStorage.Name = "ButtonShowStorage";
-            this.ButtonShowStorage.Size = new System.Drawing.Size(196, 29);
-            this.ButtonShowStorage.TabIndex = 2;
-            this.ButtonShowStorage.Text = "Посмотреть хранилище";
-            this.ButtonShowStorage.UseVisualStyleBackColor = true;
-            this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(24, 357);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(196, 29);
-            this.buttonAdd.TabIndex = 1;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAddCar_Click);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(940, 725);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetCars
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1190, 725);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.tools);
-            this.Name = "FormMapWithSetCars";
-            this.Text = "FormMapWithSetCars";
-            this.tools.ResumeLayout(false);
-            this.tools.PerformLayout();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox tools;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonRemove;
-        private Button ButtonShowOnMap;
-        private Button ButtonShowStorage;
-        private Button buttonAdd;
-        private ComboBox comboBoxSelectorMap;
-        private PictureBox pictureBox;
-        private Button RightButton;
-        private Button LeftButton;
-        private Button UpButton;
-        private Button DownButton;
-        private GroupBox groupBox1;
-        private Button buttonDeleteMap;
-        private ListBox listBoxMaps;
-        private Button buttonAddMap;
-        private TextBox textBoxNewMapName;
-    }
-}

AirFighter/AirFighter/FormMapWithSetCars.cs

@@ -1,224 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AirFighter
-{
-    public partial class FormMapWithSetCars : Form
-    {
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-        {
-            { "Простая карта", new SimpleMap() },
-            { "Моя карта", new MyMap() }
-        };
-        /// <summary>
-        /// Объект от коллекции карт
-        /// </summary>
-        private readonly MapsCollection _mapsCollection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormMapWithSetCars()
-        {
-            InitializeComponent();
-            _mapsCollection = new MapsCollection(pictureBox.Width,
-            pictureBox.Height);
-            comboBoxSelectorMap.Items.Clear();
-            foreach (var elem in _mapsDict)
-            {
-                comboBoxSelectorMap.Items.Add(elem.Key);
-            }
-        }
-
-        /// <summary>
-        /// Выбор карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <summary>
-        /// Добавление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// 
-
-        private void ReloadMaps()
-        {
-            int index = listBoxMaps.SelectedIndex;
-            listBoxMaps.Items.Clear();
-            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
-            {
-                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
-            }
-            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
-            {
-                listBoxMaps.SelectedIndex = 0;
-            }
-            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
-            {
-                listBoxMaps.SelectedIndex = index;
-            }
-        }
-
-        private void ButtonAddMap_Click(object sender, EventArgs e)
-        {
-            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
-            {
-                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _mapsCollection.AddMap(textBoxNewMapName.Text,
-            _mapsDict[comboBoxSelectorMap.Text]);
-            ReloadMaps();
-        }
-
-        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
-
-        private void ButtonDeleteMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-
-            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление",
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ??
-               string.Empty);
-                ReloadMaps();
-            }
-        }
-
-
-        private void ButtonAddCar_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            FormAirFighter form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                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("Не удалось добавить объект");
-                }
-            }
-        }
-        /// <summary>
-        /// Удаление объекта
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonRemoveCar_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-           MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image =
-               _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-
-        }
-        /// <summary>
-        /// Вывод набора
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-
-        }
-        /// <summary>
-        /// Вывод карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            pictureBox.Image =_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
-        }
-        /// <summary>
-        /// Перемещение
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "UpButton":
-                    dir = Direction.Up;
-                    break;
-                case "DownButton":
-                    dir = Direction.Down;
-                    break;
-                case "LeftButton":
-                    dir = Direction.Left;
-                    break;
-                case "RightButton":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
-
-        }
-    }
-}

AirFighter/AirFighter/FormMapWithSetCars.resx

@@ -1,60 +0,0 @@
-<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/MapWithSetCarsGeneric.cs

@@ -1,195 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirFighter
-{
-    internal class MapWithSetCarsGeneric<T, U>
- where T : class, IDrawingObject
- where U : AbstractMap
-    {
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 170;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetCarsGeneric<T> _setCars;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetCarsGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setCars = new SetCarsGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="car"></param>
-        /// <returns></returns>
-        public static int operator +(MapWithSetCarsGeneric<T, U> map, T car)
-        {
-            return map._setCars.Insert(car);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetCarsGeneric<T, U> map, int
-       position)
-        {
-            return map._setCars.Remove(position);
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawCars(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-
-            foreach(var car in _setCars.GetCars())
-            {
-                return _map.CreateMap(_pictureWidth, _pictureHeight, car);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// Перемещение объекта по крате
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
-        private void Shaking()
-        {
-            int j = _setCars.Count - 1;
-            for (int i = 0; i < _setCars.Count; i++)
-            {
-                if (_setCars[i] == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var car = _setCars[j];
-                        if (car != null)
-                        {
-                            _setCars.Insert(car, i);
-                            _setCars.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            Brush brownBrush = new SolidBrush(Color.FromArgb(255, 211, 136, 84));
-            Brush greyBrush = new SolidBrush(Color.FromArgb(255, 160, 160, 160));
-
-            Point[] angar =
-            {
-                new(0, _pictureHeight ),
-                new(0, _pictureHeight / 4 ),
-                new(_pictureWidth / 2 , 9),
-                new(_pictureWidth, _pictureHeight / 4 ),
-                new(_pictureWidth, _pictureHeight ),
-            };
-
-            g.FillPolygon(brownBrush, angar);
-            g.FillRectangle(greyBrush, _pictureWidth / 6, (_pictureHeight * 5) / 12, (_pictureWidth * 2) / 3, (_pictureHeight * 7) / 12);
-
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {//линия рамзетки места
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i *
-                   _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth,
-               (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawCars(Graphics g)
-        {
-            int width = _pictureWidth / _placeSizeWidth;
-            int height = _pictureHeight / _placeSizeHeight;
-
-            int i = 0;
-
-            foreach(var car in _setCars.GetCars())
-            {
-                int x = i % width;
-                int y = i / width;
-
-                car.SetObject((width - x - 1) * _placeSizeWidth, (height - y - 1) * _placeSizeHeight, _pictureWidth, _pictureHeight);
-                car.DrawningObject(g);
-
-                i++;
-            }
-        }
-    }
-}

AirFighter/AirFighter/MapsCollection.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirFighter
-{
-    internal class MapsCollection
-    {
-        /// <summary>
-        /// Словарь (хранилище) с картами
-        /// </summary>
-        readonly Dictionary<string, MapWithSetCarsGeneric<DrawingObjectAirFighter, AbstractMap>> _mapStorages;
-        /// <summary>
-        /// Возвращение списка названий карт
-        /// </summary>
-        public List<string> Keys => _mapStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// <param name="pictureHeight"></param>
-        public MapsCollection(int pictureWidth, int pictureHeight)
-        {
-            _mapStorages = new Dictionary<string,
-           MapWithSetCarsGeneric<DrawingObjectAirFighter, AbstractMap>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        /// <param name="map">Карта</param>
-        public void AddMap(string name, AbstractMap map)
-        {
-            // TODO Прописать логику для добавления
-            bool check = _mapStorages.TryGetValue(name, out var value);
-            if (check) return;
-
-            _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]
-        {
-            get
-            {
-                // TODO Продумать логику получения объекта
-                bool check = _mapStorages.TryGetValue(ind, out var mapWithSet);
-                return mapWithSet;
-            }
-        }
-    }
-
-}

AirFighter/AirFighter/Program.cs

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

AirFighter/AirFighter/SetCarsGeneric.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirFighter
-{
-    internal class SetCarsGeneric<T>
-    where T : class
-    {
-        /// <summary>
-        /// Список объектов, которые храним
-        /// </summary>
-        private readonly List<T> _places;
-        /// <summary>
-        /// Количество объектов в списке
-        /// </summary>
-        public int Count => _places.Count;
-        private readonly int _maxCount;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
-        public SetCarsGeneric(int count)
-        {
-            _maxCount = count;
-            _places = new List<T>();
-        }
-        public int Insert(T car)
-        {
-            // TODO вставка в начало набора
-            if (_places.Count == _maxCount) return -1;
-            _places.Insert(0, car);
-            return 0;
-        }
-        public int Insert(T car, int position)
-        {
-            // TODO проверка позиции
-            // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-            // проверка, что после вставляемого элемента в массиве есть пустой элемент
-            // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
-            // TODO вставка по позиции
-            if (_places.Count == _maxCount) return -1;
-            _places.Insert(position, car);
-            return position;
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T Remove(int position)
-        {
-            // TODO проверка позиции
-            // TODO удаление объекта из массива, присовив элементу массива значение null
-            T res = _places[position];
-            _places.Remove(res);
-            return res;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T this[int position]
-        {
-            get
-            {
-                // TODO проверка позиции
-                if(position < 0) return null;
-                if(position >= _places.Count) return null;
-                return _places[position];
-            }
-            set
-            {
-                // TODO проверка позиции
-                if (position < 0) return;
-                if (position >= _places.Count) return;
-                // TODO вставка в список по позиции
-                Insert(value, position);
-            }
-        }
-
-        public IEnumerable<T> GetCars()
-        {
-            foreach (var car in _places)
-            {
-                if (car != null)
-                {
-                    yield return car;
-                }
-                else
-                {
-                    yield break;
-                }
-            }
-        }
-    }
-}