Merge pull request 'Turner I.A. Lab work 1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/TurnerIlya/PIbd-22_Turner_I.A._AntiAircraftGun._Base/pulls/1

AntiAircraftGun/AntiAircraftGun/AbstractMap.cs

@@ -1,157 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawingObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-        public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawingObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (CheckCollision(direction))
-            {
-                _drawingObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-        private bool CheckCollision(Direction direction)
-        {
-            (float left, float right, float top, float bottom) = _drawingObject.GetCurrentPosition();
-            float step = _drawingObject?.Step ?? 0;
-            int startX = 0, startY = 0, finishX = 0, finishY = 0;
-
-            switch (direction)
-            {
-                case Direction.Up:
-                    startX = (int)left;
-                    startY = (int)(top - step);
-                    finishX = (int)right;
-                    finishY = (int)top;
-                    break;
-                case Direction.Down:
-                    startX = (int)left;
-                    startY = (int)bottom;
-                    finishX = (int)right;
-                    finishY = (int)(bottom + step);
-                    break;
-                case Direction.Left:
-                    startX = (int)(left - step);
-                    startY = (int)top;
-                    finishX = (int)left;
-                    finishY = (int)bottom;
-                    break;
-                case Direction.Right:
-                    startX = (int)right;
-                    startY = (int)top;
-                    finishX = (int)(right + step);
-                    finishY = (int)bottom;
-                    break;
-            }
-
-            if (startX < 0 || finishX > _width || startY < 0 || finishY > _height) return false;
-
-            startX = (int)(startX / _size_x);
-            startY = (int)(startY / _size_y);
-            finishX = (int)(finishX / _size_x) + 1;
-            finishY = (int)(finishY / _size_y) + 1;
-
-            for (int i = startX; i < (finishX > _map.GetLength(0) ? _map.GetLength(0) : finishX); i++)
-                for (int j = startY; j < (finishY > _map.GetLength(1) ? _map.GetLength(1) : finishY); j++)
-                    if (_map[i, j] == _barrier) return false;
-            return true;
-        }
-        private bool CheckCollisionOnSpawn()
-        {
-            (float left, float right, float top, float bottom) = _drawingObject.GetCurrentPosition();
-            int spawnX = (int)(left / _size_x) - 1 < 0 ? 0 : (int)(left / _size_x);
-            int spawnY = (int)(top / _size_y) - 1 < 0 ? 0 : (int)(bottom / _size_y);
-
-            for (int i = spawnX; i <= (int)(right / _size_x) + 1; i++)
-                for (int j = spawnY; j <= (int)(bottom / _size_y) + 1; j++)
-                    if (_map[i, j] == _barrier)
-                    {
-                        return false;
-                    }
-            return true;
-        }
-        private bool SetObjectOnMap()
-        {
-            if (_drawingObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawingObject.SetObject(x, y, _width, _height);
-            while (!CheckCollisionOnSpawn())
-            {
-                x += 10;
-                if (x > _width)
-                {
-                    if (y < _height)
-                    {
-                        y += 10;
-                        x = 0;
-                    }
-                    else
-                    {
-                        return false;
-                    }                        
-                }
-                _drawingObject.SetObject(x, y, _width, _height);
-            }
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawingObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawingObject.DrawingObjectAntiAircraftGun(gr);
-            return bmp;
-        }
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

AntiAircraftGun/AntiAircraftGun/Direction.cs

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

AntiAircraftGun/AntiAircraftGun/DrawingAntiAircraftGun.cs

@@ -9,20 +9,20 @@ namespace AntiAircraftGun
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    public class DrawingAntiAircraftGun
+    internal class DrawingAntiAircraftGun
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityAntiAircraftGun AntiAircraftGun { protected set; get; }
+        public EntityAntiAircraftGun AntiAircraftGun { private set; get; }
         /// <summary>
         /// Левая координата отрисовки зенитного орудия
         /// </summary>
-        protected float _startPosX;
+        private float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки зенитного орудия
         /// </summary>
-        protected float _startPosY;
+        private float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -45,23 +45,10 @@ namespace AntiAircraftGun
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес зенитного орудия</param>
         /// <param name="bodyColor">Цвет корпуса</param>
-        public DrawingAntiAircraftGun(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            AntiAircraftGun = new EntityAntiAircraftGun(speed, weight, bodyColor);
+            AntiAircraftGun = new EntityAntiAircraftGun();
-        }
+            AntiAircraftGun.Init(speed, weight, bodyColor);
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес зенитного орудия</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="_antiAircraftGunWidth">Ширина отрисовки зенитного орудия</param>
-        /// <param name="_antiAircraftGunHeight">Высота отрисовки зенитного орудия</param>
-        protected DrawingAntiAircraftGun(int speed, float weight, Color bodyColor, int antiAircrafGunWidth, int antiAircrafGunHeight) :
-        this(speed, weight, bodyColor)
-        {
-            _antiAircrafGunWidth = antiAircrafGunWidth;
-            _antiAircrafGunHeight = antiAircrafGunHeight;
         }
         /// <summary>
         /// Установка позиции зенитного орудия
@@ -126,7 +113,7 @@ namespace AntiAircraftGun
         /// Отрисовка зенитного орудия
         /// </summary>
         /// <param name="g"></param>
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
             || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -185,12 +172,5 @@ namespace AntiAircraftGun
                 _startPosY = _pictureHeight.Value - _antiAircrafGunHeight;
             }
         }
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosX + _antiAircrafGunWidth, _startPosY, _startPosY + _antiAircrafGunHeight);
-        }
     }
 }

AntiAircraftGun/AntiAircraftGun/DrawingObjectAntiAircraftGun.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class DrawingObjectAntiAircraftGun : IDrawingObject
-    {
-        private DrawingAntiAircraftGun _antiAircraftGun = null;
-        public DrawingObjectAntiAircraftGun(DrawingAntiAircraftGun antiAircraftGun)
-        {
-            _antiAircraftGun = antiAircraftGun;
-        }
-        public float Step => _antiAircraftGun?.AntiAircraftGun?.Step ?? 0;
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _antiAircraftGun?.GetCurrentPosition() ?? default;
-        }
-        public void MoveObject(Direction direction)
-        {
-            _antiAircraftGun?.MoveTransport(direction);
-        }
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _antiAircraftGun.SetPosition(x, y, width, height);
-        }
-
-        void IDrawingObject.DrawingObjectAntiAircraftGun(Graphics g)
-        {
-            _antiAircraftGun?.DrawTransport(g);
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/DrawingUpdateAntiAircraftGun.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class DrawingUpdateAntiAircraftGun : DrawingAntiAircraftGun
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес зенитного орудия</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="gun">Признак наличия башни с орудием</param>
-        /// <param name="radar">Признак наличия радара</param>
-        public DrawingUpdateAntiAircraftGun(int speed, float weight, Color bodyColor, Color dopColor, bool gun, bool radar) :
-        base(speed, weight, bodyColor, 110, 75)
-        {
-            AntiAircraftGun = new EntityUpdateAntiAircraftGun(speed, weight, bodyColor, dopColor, gun, radar);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (AntiAircraftGun is not EntityUpdateAntiAircraftGun updateAntiAircraftGun)
-            {
-                return;
-            }
-            Pen dopPen = new(updateAntiAircraftGun.DopColor, 4);
-            Brush dopBrush = new SolidBrush(updateAntiAircraftGun.DopColor);
-            _startPosY += 35;
-            base.DrawTransport(g);
-            _startPosY -= 35;
-            if (updateAntiAircraftGun.Gun)
-            {
-                g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 20, 25, 15);
-                g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 25, 50, 5);
-                g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 30, 20, 5);
-            }
-            if (updateAntiAircraftGun.Radar)
-            {
-                g.DrawLine(dopPen, _startPosX + 27, _startPosY + 35, _startPosX + 27, _startPosY + 20);
-                g.FillPie(dopBrush, _startPosX + 3, _startPosY, 30, 30, -45, 180);
-                g.DrawLine(dopPen, _startPosX + 20, _startPosY + 15, _startPosX + 15, _startPosY + 10);
-                g.FillEllipse(dopBrush, _startPosX + 10, _startPosY + 5, 10, 10);
-            }
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AntiAircraftGun
 {
-    public class EntityAntiAircraftGun
+    internal class EntityAntiAircraftGun
     {
         /// <summary>
         /// Скорость
@@ -31,7 +31,7 @@ namespace AntiAircraftGun
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public EntityAntiAircraftGun(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

AntiAircraftGun/AntiAircraftGun/EntityUpdateAntiAircraftGun.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class EntityUpdateAntiAircraftGun : EntityAntiAircraftGun
-    {
-        /// <summary>
-        /// Дополнительный цвет
-        /// </summary>
-        public Color DopColor { get; private set; }
-        /// <summary>
-        /// Признак наличия башни с орудием
-        /// </summary>
-        public bool Gun { get; private set; }
-        /// <summary>
-        /// Признак наличия радара
-        /// </summary>
-        public bool Radar { get; private set; }
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес зенитного орудия</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="gun">Признак наличия башни с орудием</param>
-        /// <param name="radar">Признак наличия радара</param>
-        public EntityUpdateAntiAircraftGun(int speed, float weight, Color bodyColor, Color dopColor, bool gun, bool radar) :
-        base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            Gun = gun;
-            Radar = radar;
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs

@@ -38,8 +38,6 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonCreareModif = new System.Windows.Forms.Button();
-            this.buttonSelect = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -144,35 +142,11 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreareModif
-            // 
-            this.buttonCreareModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreareModif.Location = new System.Drawing.Point(111, 381);
-            this.buttonCreareModif.Name = "buttonCreareModif";
-            this.buttonCreareModif.Size = new System.Drawing.Size(125, 29);
-            this.buttonCreareModif.TabIndex = 7;
-            this.buttonCreareModif.Text = "Модификация";
-            this.buttonCreareModif.UseVisualStyleBackColor = true;
-            this.buttonCreareModif.Click += new System.EventHandler(this.ButtonCreareModif_Click);
-            // 
-            // buttonSelect
-            // 
-            this.buttonSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonSelect.Location = new System.Drawing.Point(578, 379);
-            this.buttonSelect.Name = "buttonSelect";
-            this.buttonSelect.Size = new System.Drawing.Size(94, 29);
-            this.buttonSelect.TabIndex = 8;
-            this.buttonSelect.Text = "Выбрать";
-            this.buttonSelect.UseVisualStyleBackColor = true;
-            this.buttonSelect.Click += new System.EventHandler(this.ButtonSelect_Click);
-            // 
             // FormAntiAircraftGun
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 451);
-            this.Controls.Add(this.buttonSelect);
-            this.Controls.Add(this.buttonCreareModif);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonLeft);
@@ -204,7 +178,5 @@
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonDown;
-        private Button buttonCreareModif;
-        private Button buttonSelect;
     }
 }

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs

@@ -5,10 +5,6 @@ namespace AntiAircraftGun
     public partial class FormAntiAircraftGun : Form
     {
         private DrawingAntiAircraftGun _antiAircrafGun;
-        /// <summary>
-        /// Âûáðàííîå îáúåêò
-        /// </summary>
-        public DrawingAntiAircraftGun SelectedAntiAircraftGun { get; private set; }
 
         public FormAntiAircraftGun()
         {
@@ -27,17 +23,6 @@ namespace AntiAircraftGun
                 pictureBoxAntiAircraftGun.Image = bmp;
             }
         }
-        /// <summary>
-        /// Ìåòîä óñòàíîâêè äàííûõ
-        /// </summary>
-        private void SetData()
-        {
-            Random rnd = new();
-            _antiAircrafGun.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_antiAircrafGun.AntiAircraftGun.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_antiAircrafGun.AntiAircraftGun.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}";
-        }
 
         /// <summary>
         /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
@@ -46,19 +31,19 @@ namespace AntiAircraftGun
         /// <param name="e"></param>
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
-            Random rnd = new();
+                Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+                _antiAircrafGun = new DrawingAntiAircraftGun();
-            ColorDialog dialog = new();
+                _antiAircrafGun.Init(rnd.Next(100, 300), rnd.Next(1000, 2000),
-            if (dialog.ShowDialog() == DialogResult.OK)
+               Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            {
+                _antiAircrafGun.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
-                color = dialog.Color;
+               pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
-            }
+                toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_antiAircrafGun.AntiAircraftGun.Speed}";
-            _antiAircrafGun = new DrawingAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+                toolStripStatusLabelWeight.Text = $"Âåñ: {_antiAircrafGun.AntiAircraftGun.Weight}";
-            SetData();
+                toolStripStatusLabelBodyColor.Text = $"Öâåò: {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}";
-            Draw();
+                Draw();
         }
         /// <summary>
-        /// Îïðåäåëåíèå íàïðàâëåíèÿ
+        /// Èçìåíåíèå ðàçìåðîâ ôîðìû
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -93,36 +78,5 @@ namespace AntiAircraftGun
             _antiAircrafGun?.ChangeBorders(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
             Draw();
         }
-        /// <summary>
-        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreareModif_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;
-            }
-            _antiAircrafGun = new DrawingUpdateAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
-            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
-
-        private void ButtonSelect_Click(object sender, EventArgs e)
-        {
-            SelectedAntiAircraftGun = _antiAircrafGun;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.resx

@@ -60,7 +60,4 @@
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>79</value>
-  </metadata>
 </root>

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.Designer.cs

@@ -1,279 +0,0 @@
-namespace AntiAircraftGun
-{
-    partial class FormMapWithSetAntiAircraftGuns
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox = new System.Windows.Forms.GroupBox();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveAntiAircraftGun = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddAntiAircraftGun = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
-            this.listBoxMaps = new System.Windows.Forms.ListBox();
-            this.buttonDeleteMap = new System.Windows.Forms.Button();
-            this.buttonAddMap = new System.Windows.Forms.Button();
-            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
-            this.groupBox.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.groupBoxMaps.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox
-            // 
-            this.groupBox.Controls.Add(this.buttonShowOnMap);
-            this.groupBox.Controls.Add(this.buttonShowStorage);
-            this.groupBox.Controls.Add(this.buttonRemoveAntiAircraftGun);
-            this.groupBox.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBox.Controls.Add(this.buttonAddAntiAircraftGun);
-            this.groupBox.Controls.Add(this.buttonDown);
-            this.groupBox.Controls.Add(this.buttonRight);
-            this.groupBox.Controls.Add(this.buttonLeft);
-            this.groupBox.Controls.Add(this.buttonUp);
-            this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox.Location = new System.Drawing.Point(574, 0);
-            this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(238, 589);
-            this.groupBox.TabIndex = 0;
-            this.groupBox.TabStop = false;
-            this.groupBox.Text = "Инструменты";
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(20, 465);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(194, 29);
-            this.buttonShowOnMap.TabIndex = 16;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(20, 430);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(194, 29);
-            this.buttonShowStorage.TabIndex = 15;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonRemoveAntiAircraftGun
-            // 
-            this.buttonRemoveAntiAircraftGun.Location = new System.Drawing.Point(20, 395);
-            this.buttonRemoveAntiAircraftGun.Name = "buttonRemoveAntiAircraftGun";
-            this.buttonRemoveAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
-            this.buttonRemoveAntiAircraftGun.TabIndex = 14;
-            this.buttonRemoveAntiAircraftGun.Text = "Удалить орудие";
-            this.buttonRemoveAntiAircraftGun.UseVisualStyleBackColor = true;
-            this.buttonRemoveAntiAircraftGun.Click += new System.EventHandler(this.ButtonRemoveAntiAircraftGun_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 362);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(194, 27);
-            this.maskedTextBoxPosition.TabIndex = 13;
-            // 
-            // buttonAddAntiAircraftGun
-            // 
-            this.buttonAddAntiAircraftGun.Location = new System.Drawing.Point(20, 327);
-            this.buttonAddAntiAircraftGun.Name = "buttonAddAntiAircraftGun";
-            this.buttonAddAntiAircraftGun.Size = new System.Drawing.Size(194, 29);
-            this.buttonAddAntiAircraftGun.TabIndex = 12;
-            this.buttonAddAntiAircraftGun.Text = "Добавить орудие";
-            this.buttonAddAntiAircraftGun.UseVisualStyleBackColor = true;
-            this.buttonAddAntiAircraftGun.Click += new System.EventHandler(this.ButtonAddAntiAircraftGun_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(108, 547);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 29);
-            this.buttonDown.TabIndex = 10;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(143, 547);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 29);
-            this.buttonRight.TabIndex = 9;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(71, 547);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
-            this.buttonLeft.TabIndex = 8;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(108, 509);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 29);
-            this.buttonUp.TabIndex = 7;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Простая карта 2"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(14, 59);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(194, 28);
-            this.comboBoxSelectorMap.TabIndex = 11;
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(574, 589);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // groupBoxMaps
-            // 
-            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
-            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
-            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
-            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
-            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxMaps.Location = new System.Drawing.Point(580, 26);
-            this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Size = new System.Drawing.Size(226, 277);
-            this.groupBoxMaps.TabIndex = 17;
-            this.groupBoxMaps.TabStop = false;
-            this.groupBoxMaps.Text = "Карты";
-            // 
-            // listBoxMaps
-            // 
-            this.listBoxMaps.FormattingEnabled = true;
-            this.listBoxMaps.ItemHeight = 20;
-            this.listBoxMaps.Location = new System.Drawing.Point(14, 126);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(194, 104);
-            this.listBoxMaps.TabIndex = 14;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
-            // 
-            // buttonDeleteMap
-            // 
-            this.buttonDeleteMap.Location = new System.Drawing.Point(14, 236);
-            this.buttonDeleteMap.Name = "buttonDeleteMap";
-            this.buttonDeleteMap.Size = new System.Drawing.Size(194, 29);
-            this.buttonDeleteMap.TabIndex = 13;
-            this.buttonDeleteMap.Text = "Удалить карту";
-            this.buttonDeleteMap.UseVisualStyleBackColor = true;
-            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(14, 93);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(194, 29);
-            this.buttonAddMap.TabIndex = 12;
-            this.buttonAddMap.Text = "Добавить карту";
-            this.buttonAddMap.UseVisualStyleBackColor = true;
-            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
-            // 
-            // textBoxNewMapName
-            // 
-            this.textBoxNewMapName.Location = new System.Drawing.Point(14, 26);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(194, 27);
-            this.textBoxNewMapName.TabIndex = 0;
-            // 
-            // FormMapWithSetAntiAircraftGuns
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(812, 589);
-            this.Controls.Add(this.groupBoxMaps);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBox);
-            this.Name = "FormMapWithSetAntiAircraftGuns";
-            this.Text = "FormMapWithSetAntiAircraftGuns";
-            this.groupBox.ResumeLayout(false);
-            this.groupBox.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.groupBoxMaps.ResumeLayout(false);
-            this.groupBoxMaps.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBox;
-        private PictureBox pictureBox;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonLeft;
-        private Button buttonUp;
-        private Button buttonShowOnMap;
-        private Button buttonShowStorage;
-        private Button buttonRemoveAntiAircraftGun;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonAddAntiAircraftGun;
-        private ComboBox comboBoxSelectorMap;
-        private GroupBox groupBoxMaps;
-        private ListBox listBoxMaps;
-        private Button buttonDeleteMap;
-        private Button buttonAddMap;
-        private TextBox textBoxNewMapName;
-    }
-}

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.cs

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

AntiAircraftGun/AntiAircraftGun/FormMapWithSetAntiAircraftGuns.resx

@@ -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>

AntiAircraftGun/AntiAircraftGun/IDrawingObject.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{    
-    /// <summary>
-    /// Интерфейс для работы с объектом, прорисовываемом на форме
-    /// </summary>
-    internal interface IDrawingObject
-    {
-        /// <summary>
-        /// Шаг перемещения объекта
-        /// </summary>
-        public float Step { get; }
-        /// <summary>
-        /// Установка позиции объекта
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина полотна</param>
-        /// <param name="height">Высота полотна</param>
-        void SetObject(int x, int y, int width, int height);
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        void MoveObject(Direction direction);
-        /// <summary>
-        /// Отрисовка объекта
-        /// </summary>
-        /// <param name="g"></param>
-        void DrawingObjectAntiAircraftGun(Graphics g);
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-    }
-}

AntiAircraftGun/AntiAircraftGun/MapWithSetAntiAircraftGunsGeneric.cs

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

AntiAircraftGun/AntiAircraftGun/MapsCollection.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class MapsCollection
-    {
-        /// <summary>
-        /// Словарь (хранилище) с картами
-        /// </summary>
-        readonly Dictionary<string, MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, AbstractMap>> _mapStorages;
-        /// <summary>
-        /// Возвращение списка названий карт
-        /// </summary>
-        public List<string> Keys => _mapStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// <param name="pictureHeight"></param>
-        public MapsCollection(int pictureWidth, int pictureHeight)
-        {
-            _mapStorages = new Dictionary<string, MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, AbstractMap>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        /// <param name="map">Карта</param>
-        public void AddMap(string name, AbstractMap map)
-        {
-            if(!_mapStorages.ContainsKey(name)) _mapStorages.Add(name, new MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, AbstractMap>(_pictureWidth, _pictureHeight, map));
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        public void DelMap(string name)
-        {
-            _mapStorages.Remove(name);
-        }
-        /// <summary>
-        /// Доступ к парковке
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public MapWithSetAntiAircraftGunsGeneric<DrawingObjectAntiAircraftGun, AbstractMap> this[string ind]
-        {
-            get
-            {
-                if (_mapStorages.TryGetValue(ind, out var map)) return map;
-                return null;
-            }
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/Program.cs

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

AntiAircraftGun/AntiAircraftGun/SetAntiAircraftGunsGeneric.cs

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

AntiAircraftGun/AntiAircraftGun/SimpleMap.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    /// <summary>
-    /// Простая реализация абсрактного класса AbstractMap
-    /// </summary>
-    internal class SimpleMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.LightGray);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}

AntiAircraftGun/AntiAircraftGun/SimpleMap2.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AntiAircraftGun
-{
-    internal class SimpleMap2 : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.LightGreen);
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 25)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}