Merge pull request 'LabWork01' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/aleyckin/PIbd-22_Aleikin_A.M._AirBomber._Base/pulls/1

AirBomber/AirBomber/AbstractMap.cs

@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawningObject _drawningObject = 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 heigth, IDrawningObject drawningObject)
-        {
-            _width = width;
-            _height = heigth;
-            _drawningObject = drawningObject;
-            GenerateMap();           
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();              
-            }
-            return DrawMapWithObject();
-        }
-
-        private bool CanMove(Direction direction, (float Left, float Right, float Top, float Bottom) position)
-        {        
-            for (int i = (int)(position.Top / _size_y); i <= (int)(position.Bottom / _size_y); ++i)
-            {
-                for (int j = (int)(position.Left / _size_x); j <= (int)(position.Right / _size_x); ++j)
-                {
-                    if (i >= 0 && j >= 0 && i < _map.GetLength(0) && j < _map.GetLength(1) && _map[i, j] == _barrier) return false;
-                }
-            }
-            return true;
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            (float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition();
-            if (direction == Direction.Left)
-            {
-                position.Left -= _drawningObject.Step;
-            }
-            else if (direction == Direction.Right)
-            {
-                position.Right += _drawningObject.Step;
-            }
-            else if (direction == Direction.Up)
-            {
-                position.Top -= _drawningObject.Step;
-            }
-            else if (direction == Direction.Down)
-            {
-                position.Bottom += _drawningObject.Step;
-            }
-
-            if (CanMove(direction, position))
-            {
-                _drawningObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-
-        private bool SetObjectOnMap()
-        {            
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            
-            _drawningObject.SetObject(x, y, _width, _height);
-            (float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition();
-            for (int i = (int)(position.Top / _size_y); i <= (int)(position.Bottom / _size_y); ++i)
-            {
-                for (int j = (int)(position.Left / _size_x); j <= (int)(position.Right / _size_x); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-
-            return true;
-        }
-
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == 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);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(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);
-    }
-}

AirBomber/AirBomber/Direction.cs

@@ -6,9 +6,8 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    public enum Direction
+    internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

AirBomber/AirBomber/DrawningBomber.cs

@@ -6,26 +6,20 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    public class DrawningBomber
+    internal class DrawningBomber
     {
-        public EntityAirBomber AirBomber { protected set; get; }
-        protected float _startPosX;
-        protected float _startPosY;
+        public EntityAirBomber AirBomber { private set; get; }
+        private float _startPosX;
+        private float _startPosY;
         private int? _pictureWidth = null;
         private int? _pictureHeight = null;
         private readonly int _airBomberWidth = 100;
         private readonly int _airBomberHeight = 100;
 
-        public DrawningBomber(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            AirBomber = new EntityAirBomber(speed, weight, bodyColor);
-        }
-
-        protected DrawningBomber(int speed, float weight, Color bodyColor, int airBomberWidth, int airBomberHeight) : 
-            this (speed, weight, bodyColor)
-        {
-            _airBomberWidth = airBomberWidth;
-            _airBomberHeight = airBomberHeight;
+            AirBomber = new EntityAirBomber();
+            AirBomber.Init(speed, weight, bodyColor);
         }
 
         public void SetPosition(int x, int y, int width, int height)
@@ -73,15 +67,13 @@ namespace AirBomber
             }
         }
 
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
             {
                 return;
             }
 
-            Pen pen = new Pen(Color.Black);
-
             SolidBrush brush = new SolidBrush(AirBomber?.BodyColor ?? Color.Cyan);
 
             g.FillPolygon(brush, new[] {
@@ -111,6 +103,7 @@ namespace AirBomber
                 new Point((int)(_startPosX + 20), (int)(_startPosY + _airBomberHeight / 2 - 5)),
                 new Point((int)(_startPosX + 20), (int)(_startPosY + _airBomberHeight / 2 + 5)),
             });
+
         }
 
         public void ChangeBorders(int width, int height)
@@ -132,10 +125,5 @@ namespace AirBomber
                 _startPosY = _pictureHeight.Value - _airBomberHeight;
             }
         }
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosX + _airBomberWidth, _startPosY, _startPosY + _airBomberHeight);
-        }
     }
 }

AirBomber/AirBomber/DrawningObjectBomber.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class DrawningObjectBomber : IDrawningObject
-    {
-        private DrawningBomber _airBomber = null;
-
-        public DrawningObjectBomber(DrawningBomber airBomber)
-        {
-            _airBomber = airBomber;
-        }
-
-        public float Step => _airBomber?.AirBomber?.Step ?? 0;
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _airBomber?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _airBomber?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _airBomber.SetPosition(x, y, width, height);    
-        }
-
-        public void DrawningObject(Graphics g)
-        {
-            _airBomber.DrawTransport(g);
-        }
-    }
-}

AirBomber/AirBomber/DrawningWarplane.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class DrawningWarplane : DrawningBomber
-    {
-        public DrawningWarplane(int speed, float weight, Color bodyColor, Color dopColor, bool engines, bool weapons) :
-            base(speed, weight, bodyColor, 120, 120)
-        {
-            AirBomber = new EntityWarplane(speed, weight, bodyColor, dopColor, engines, weapons);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if (AirBomber is not EntityWarplane warplane)
-            {
-                return;
-            }
-
-            Pen pen = new Pen(Color.Black);
-            Brush dopBrush = new SolidBrush(warplane.DopColor);
-
-            if (warplane.Engines)
-            {
-
-                g.FillEllipse(dopBrush, _startPosX + 50, _startPosY + 15, 30, 15);
-                g.FillEllipse(dopBrush, _startPosX + 45, _startPosY + 35, 35, 15);
-                g.FillEllipse(dopBrush, _startPosX + 45, _startPosY + 70, 35, 15);
-                g.FillEllipse(dopBrush, _startPosX + 50, _startPosY + 90, 30, 15);
-
-                g.DrawEllipse(pen, _startPosX + 50, _startPosY + 15, 30, 15);
-                g.DrawEllipse(pen, _startPosX + 45, _startPosY + 35, 35, 15);
-                g.DrawEllipse(pen, _startPosX + 45, _startPosY + 70, 35, 15);
-                g.DrawEllipse(pen, _startPosX + 50, _startPosY + 90, 30, 15);
-            }
-            if (warplane.Weapons)
-            {
-                g.FillRectangle(dopBrush, _startPosX + 40, _startPosY, 30, 5);
-                g.FillRectangle(dopBrush, _startPosX + 40, _startPosY + 115, 30, 5);
-
-                g.DrawRectangle(pen, _startPosX + 40, _startPosY, 30, 5);
-                g.DrawRectangle(pen, _startPosX + 40, _startPosY + 115, 30, 5);
-            }
-
-            base.DrawTransport(g);
-        }
-    }
-}

AirBomber/AirBomber/EntityAirBomber.cs

@@ -6,16 +6,16 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    public class EntityAirBomber
+    internal class EntityAirBomber
     {
         public int Speed { get; private set; }
         public float Weight { get; private set; }
         public Color BodyColor { get; private set; }
         public float Step => Speed * 100 / Weight;
 
-        public EntityAirBomber(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            Random rnd = new Random();
+            Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
             Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
             BodyColor = bodyColor;

AirBomber/AirBomber/EntityWarplane.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class EntityWarplane : EntityAirBomber
-    {
-        public Color DopColor { get; private set; }
-
-        public bool Engines { get; private set; }
-
-        public bool Weapons { get; private set; }
-
-        public EntityWarplane(int speed, float weight, Color bodyColor, Color dopColor, bool engines, bool weapons) : 
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            Engines = engines;
-            Weapons = weapons;
-        }
-    }
-} 

AirBomber/AirBomber/FormAirBomber.Designer.cs

@@ -38,8 +38,6 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModif = new System.Windows.Forms.Button();
-            this.buttonSelectAirBomber = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -143,34 +141,11 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonCreate_Move);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateModif.Location = new System.Drawing.Point(109, 455);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(110, 35);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // buttonSelectAirBomber
-            // 
-            this.buttonSelectAirBomber.Location = new System.Drawing.Point(663, 472);
-            this.buttonSelectAirBomber.Name = "buttonSelectAirBomber";
-            this.buttonSelectAirBomber.Size = new System.Drawing.Size(75, 23);
-            this.buttonSelectAirBomber.TabIndex = 8;
-            this.buttonSelectAirBomber.Text = "Выбрать";
-            this.buttonSelectAirBomber.UseVisualStyleBackColor = true;
-            this.buttonSelectAirBomber.Click += new System.EventHandler(this.buttonSelectAirBomber_Click);
-            // 
             // FormAirBomber
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(874, 515);
-            this.Controls.Add(this.buttonSelectAirBomber);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -200,7 +175,5 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreateModif;
-        private Button buttonSelectAirBomber;
     }
 }

AirBomber/AirBomber/FormAirBomber.cs

@@ -1,13 +1,8 @@
-using System;
-
 namespace AirBomber
 {
     public partial class FormAirBomber : Form
     {
         private DrawningBomber _airBomber;
-
-        public DrawningBomber SelectedAirBomber { get; private set; }
-
         public FormAirBomber()
         {
             InitializeComponent();
@@ -21,26 +16,15 @@ namespace AirBomber
             pictureBoxAirBomber.Image = bmp;
         }
 
-        private void SetData()
+        private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
+            _airBomber = new DrawningBomber();
+            _airBomber.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             _airBomber.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
             toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_airBomber.AirBomber.Speed}";
             toolStripStatusLabelWeight.Text = $"Âåñ: {_airBomber.AirBomber.Weight}";
             toolStripStatusLabelBodyColor.Text = $"Öâåò: {_airBomber.AirBomber.BodyColor}";
-        }
-
-        private void ButtonCreate_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;
-            }
-            _airBomber = new DrawningBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
             Draw();
         }
 
@@ -70,31 +54,5 @@ namespace AirBomber
             _airBomber?.ChangeBorders(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
             Draw();
         }
-
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-            _airBomber = new DrawningWarplane(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 buttonSelectAirBomber_Click(object sender, EventArgs e)
-        {
-            SelectedAirBomber = _airBomber;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

AirBomber/AirBomber/FormMapWithSetAirBomber.Designer.cs

@@ -1,216 +0,0 @@
-namespace AirBomber
-{
-    partial class FormMapWithSetAirBomber
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveAirBomber = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddAirBomber = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.buttonRight);
-            this.groupBox1.Controls.Add(this.buttonDown);
-            this.groupBox1.Controls.Add(this.buttonLeft);
-            this.groupBox1.Controls.Add(this.buttonUp);
-            this.groupBox1.Controls.Add(this.buttonShowOnMap);
-            this.groupBox1.Controls.Add(this.buttonShowStorage);
-            this.groupBox1.Controls.Add(this.buttonRemoveAirBomber);
-            this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBox1.Controls.Add(this.buttonAddAirBomber);
-            this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox1.Location = new System.Drawing.Point(600, 0);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(200, 450);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Инструменты";
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.ArrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(116, 404);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 10;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::AirBomber.Properties.Resources.ArrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(80, 404);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 9;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonLeft.BackgroundImage = global::AirBomber.Properties.Resources.ArrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(44, 404);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            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::AirBomber.Properties.Resources.ArrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(80, 368);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 7;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(22, 319);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(150, 33);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "Посмотреть карту";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(22, 258);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(150, 36);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "Посмотреть хранилище";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
-            // 
-            // buttonRemoveAirBomber
-            // 
-            this.buttonRemoveAirBomber.Location = new System.Drawing.Point(22, 195);
-            this.buttonRemoveAirBomber.Name = "buttonRemoveAirBomber";
-            this.buttonRemoveAirBomber.Size = new System.Drawing.Size(150, 36);
-            this.buttonRemoveAirBomber.TabIndex = 3;
-            this.buttonRemoveAirBomber.Text = "Удалить самолет";
-            this.buttonRemoveAirBomber.UseVisualStyleBackColor = true;
-            this.buttonRemoveAirBomber.Click += new System.EventHandler(this.ButtonRemoveAirBomber_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 166);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(150, 23);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            // 
-            // buttonAddAirBomber
-            // 
-            this.buttonAddAirBomber.Location = new System.Drawing.Point(22, 94);
-            this.buttonAddAirBomber.Name = "buttonAddAirBomber";
-            this.buttonAddAirBomber.Size = new System.Drawing.Size(150, 35);
-            this.buttonAddAirBomber.TabIndex = 1;
-            this.buttonAddAirBomber.Text = "Добавить самолет";
-            this.buttonAddAirBomber.UseVisualStyleBackColor = true;
-            this.buttonAddAirBomber.Click += new System.EventHandler(this.ButtonAddAirBomber_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Вторая карта",
-            "Третья карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(22, 44);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(150, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // 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(600, 450);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetAirBomber
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBox1);
-            this.Name = "FormMapWithSetAirBomber";
-            this.Text = "FormMapWithSetAirBomber";
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBox1;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonAddAirBomber;
-        private ComboBox comboBoxSelectorMap;
-        private PictureBox pictureBox;
-        private Button buttonShowOnMap;
-        private Button buttonShowStorage;
-        private Button buttonRemoveAirBomber;
-        private Button buttonRight;
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Button buttonUp;
-    }
-}

AirBomber/AirBomber/FormMapWithSetAirBomber.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AirBomber
-{
-    public partial class FormMapWithSetAirBomber : Form
-    {
-        private MapWithSetAirBomberGeneric<DrawningObjectBomber, AbstractMap> _mapAirBomberCollectionGeneric;
-
-        public FormMapWithSetAirBomber()
-        {
-            InitializeComponent();
-        }       
-
-        private void ButtonAddAirBomber_Click(object sender, EventArgs e)
-        {
-            if (_mapAirBomberCollectionGeneric == null)
-            {
-                return;
-            }
-            FormAirBomber form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawningObjectBomber airBomber = new(form.SelectedAirBomber);
-                if (_mapAirBomberCollectionGeneric + airBomber > -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-        private void ButtonRemoveAirBomber_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapAirBomberCollectionGeneric - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-
-        private void ButtonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapAirBomberCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapAirBomberCollectionGeneric.ShowSet();
-        }
-
-        private void ButtonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapAirBomberCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapAirBomberCollectionGeneric.ShowOnMap();
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Вторая карта":
-                    map = new SecondMap();
-                    break;
-                case "Третья карта":
-                    map = new ThirdMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapAirBomberCollectionGeneric = new MapWithSetAirBomberGeneric<DrawningObjectBomber, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapAirBomberCollectionGeneric = null;
-            }
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapAirBomberCollectionGeneric == null)
-            {
-                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 = _mapAirBomberCollectionGeneric.MoveObject(dir);
-        }
-    }
-}

AirBomber/AirBomber/FormMapWithSetAirBomber.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>

AirBomber/AirBomber/IDrawningObject.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal interface IDrawningObject
-    {
-        public float Step { get; }
-
-        void SetObject(int x, int y, int width, int height);
-
-        void MoveObject(Direction direction);
-
-        void DrawningObject(Graphics g);      
-
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-    }
-}

AirBomber/AirBomber/MapWithSetAirBomberGeneric.cs

@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class MapWithSetAirBomberGeneric<T, U>
-        where T : class, IDrawningObject
-        where U : AbstractMap
-    {
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-        private readonly int _placeSizeWidth = 210;
-        private readonly int _placeSizeHeight = 120;
-        private readonly SetAirBomberGeneric<T> _setAirBomber;
-        private readonly U _map;
-
-        public MapWithSetAirBomberGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setAirBomber = new SetAirBomberGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-
-        public static int operator +(MapWithSetAirBomberGeneric<T, U> map, T airBomber)
-        {
-            return map._setAirBomber.Insert(airBomber);
-        }
-
-        public static T operator -(MapWithSetAirBomberGeneric<T, U> map, int position)
-        {
-            return map._setAirBomber.Remove(position);
-        }
-
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawAirBomber(gr);
-            return bmp;
-        }
-
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setAirBomber.Count; i++)
-            {
-                var airBomber = _setAirBomber.Get(i);
-                if (airBomber != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, airBomber);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            if ( _map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-
-        private void Shaking()
-        {
-            int j = _setAirBomber.Count - 1;
-            for (int i = 0; i < _setAirBomber.Count; i++)
-            {
-                if (_setAirBomber.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var airBomber = _setAirBomber.Get(j);
-                        if (airBomber != null)
-                        {
-                            _setAirBomber.Insert(airBomber, i);
-                            _setAirBomber.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-
-        }
-
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.DarkGreen, 3);
-            SolidBrush brush = new(Color.DarkGreen);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; ++i)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight; ++j)
-                {
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                    g.DrawPie(pen, new Rectangle(i * _placeSizeWidth - 25, j * _placeSizeHeight, 50, 120), -90, 180);
-                    g.FillPie(brush, new Rectangle((i + 1) * _placeSizeWidth - _placeSizeHeight - 10, j * _placeSizeHeight, 50, 120), -90, 180);
-                }
-            }
-        }
-
-        private void DrawAirBomber(Graphics g)
-        {
-            for (int i = 0; i < _setAirBomber.Count; ++i)
-            {
-                if (_setAirBomber.Get(i) != null)
-                {
-                    _setAirBomber.Get(i).SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight, _pictureWidth, _pictureHeight);
-                    _setAirBomber.Get(i).DrawningObject(g);
-                }
-            }
-        }
-    }
-}

AirBomber/AirBomber/Program.cs

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

AirBomber/AirBomber/SecondMap.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class SecondMap : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.Yellow);
-        Brush roadColor = new SolidBrush(Color.Blue);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
-        }
-
-        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 < 35)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}

AirBomber/AirBomber/SetAirBomberGeneric.cs

@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class SetAirBomberGeneric<T>
-        where T : class
-    {
-        private readonly T[] _places;
-
-        public int Count => _places.Length;
-
-        public SetAirBomberGeneric(int count)
-        {
-            _places = new T[count];
-        }
-
-        public int Insert(T airBomber)
-        {
-            return Insert(airBomber, 0);
-        }
-
-        public int Insert(T airBomber, int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return -1;
-            }
-            int emptyPos = -1;
-            if (_places[position] == null)
-            {
-                _places[position] = airBomber;
-                return position;
-            }
-            else
-            {
-                for (int i = position + 1; i < Count; ++i)
-                {
-                    if (_places[i] == null)
-                    {
-                        emptyPos = i;
-                        break;
-                    }
-                }
-                if (emptyPos != -1)
-                {
-                    for (int i = emptyPos; i > position; --i)
-                    {
-                        _places[i] = _places[i - 1];
-                    }
-                }
-            }
-            if (emptyPos != -1)
-            {
-                _places[position] = airBomber;
-                return position;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        public T Remove(int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return null;
-            }
-            T elem = _places[position];
-            _places[position] = null;
-            return elem;
-        }
-
-        public T Get(int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return null;
-            }
-            return _places[position];
-        }
-    }
-}

AirBomber/AirBomber/SimpleMap.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class SimpleMap : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.Black);
-        Brush roadColor = new SolidBrush(Color.Gray);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
-        }
-
-        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++;
-                }
-            }
-        }
-    }
-}

AirBomber/AirBomber/ThirdMap.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class ThirdMap : AbstractMap
-    {
-        Brush barrierColor = new SolidBrush(Color.Red);
-        Brush roadColor = new SolidBrush(Color.DarkGreen);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
-        }
-
-        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 < 40)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-    }
-}