Merge pull request 'Abazov A. A. Lab Work 1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/Andrey_Abazov/PIbd-23_Abazov_A.A._AirBomber_Base/pulls/1

AirBomber/AirBomber/AbstractMap.cs

@@ -1,117 +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 IDrawingObject _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 height, IDrawingObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_drawningObject == null) return DrawMapWithObject();
-            bool canMove = true;
-            switch (direction)
-            {
-                case Direction.Left:
-                    if (!checkForBarriers(0, -1 * _drawningObject.Step, -1 * _drawningObject.Step, 0)) canMove = false;
-                    break;
-                case Direction.Right:
-                    if (!checkForBarriers(0, _drawningObject.Step, _drawningObject.Step, 0)) canMove = false;
-                    break;
-                case Direction.Up:
-                    if (!checkForBarriers(-1 * _drawningObject.Step, 0, 0, -1 * _drawningObject.Step)) canMove = false;
-                    break;
-                case Direction.Down:
-                    if (!checkForBarriers(_drawningObject.Step, 0, 0, _drawningObject.Step)) canMove = false;
-                    break;
-            }
-            if (canMove)
-            {
-                _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);
-            if (!checkForBarriers(0,0,0,0)) return false;
-            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.DrawingObject(gr);
-            return bmp;
-        }
-
-        private bool checkForBarriers(float topOffset, float rightOffset, float leftOffset, float bottomOffset)
-        {
-            int top = Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + topOffset) / _size_y);
-            int right = Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + rightOffset) / _size_x);
-            int left = Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + leftOffset) / _size_x);
-            int bottom = Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + bottomOffset) / _size_y);
-            if (top < 0 || left < 0 || right >= _map.GetLength(1) || bottom >= _map.GetLength(0)) return false;
-            for (int i = top; i <= bottom; i++)
-            {
-                for (int j = left; j <= right; j++)
-                {
-                    if (_map[j, i] == 1) return false;
-                }
-            }
-            return true;
-        }
-
-        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/CityMap.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class CityMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Gray);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.LightBlue);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _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 buildingCounter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (buildingCounter < 10)
-            {
-                int x = _random.Next(0, 89);
-                int y = _random.Next(0, 89);
-                int buildingWidth = _random.Next(2, 10);
-                int buildingHeight = _random.Next(2, 10);
-                if (x + buildingWidth >= _map.GetLength(0)) x = _random.Next(_map.GetLength(0) - buildingWidth - 1, _map.GetLength(0));
-                if (y + buildingHeight >= _map.GetLength(1)) y = _random.Next(_map.GetLength(1) - buildingHeight - 1, _map.GetLength(1));
-
-                bool isFreeSpace = true;
-                for (int i = x; i < x + buildingWidth; i++)
-                {
-                    for (int j = y; j < y + buildingHeight; j++)
-                    {
-                        if (_map[i, j] != _freeRoad)
-                        {
-                            isFreeSpace = false;
-                            break;
-                        }
-                    }
-                }
-                if (isFreeSpace)
-                {
-                    for (int i = x; i < x + buildingWidth; i++)
-                    {
-                        for (int j = y; j < y + buildingHeight; j++)
-                        {
-                            _map[i, j] = _barrier;
-                        }
-                    }
-                    buildingCounter++;
-                }
-            }
-        }
-    }
-}

AirBomber/AirBomber/Direction.cs

@@ -11,7 +11,6 @@ namespace AirBomber
     /// </summary>
     internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

AirBomber/AirBomber/DrawingAirBomber.cs

@@ -11,15 +11,15 @@ namespace AirBomber
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityAirBomber AirBomber { protected set; get; }
+        public EntityAirBomber AirBomber { private set; get; }
         /// <summary>
         /// Левая координата отрисовки бомбардировщика
         /// </summary>
-        protected float _startPosX;
+        private float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки бомбардировщика
         /// </summary>
-        protected float _startPosY;
+        private float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -42,24 +42,10 @@ namespace AirBomber
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес бомбардировщика</param>
         /// <param name="bodyColor">Цвет корпуса</param>
-        public DrawingAirBomber(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
-            AirBomber = new EntityAirBomber(speed, weight, bodyColor);
-        }
-
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес бомбардировщика</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="carWidth">Ширина отрисовки бомбардировщика</param>
-        /// <param name="carHeight">Высота отрисовки бомбардировщика</param>
-        protected DrawingAirBomber(int speed, float weight, Color bodyColor, int carWidth, int carHeight) :
-            this(speed, weight, bodyColor)
-        {
-            _airBomberWidth = carWidth;
-            _airBomberHeight = carHeight;
+            AirBomber = new EntityAirBomber();
+            AirBomber.Init(speed, weight, bodyColor);
         }
 
         /// <summary>
@@ -127,7 +113,7 @@ namespace AirBomber
         /// Отрисовка бомбардировщика
         /// </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)
@@ -222,14 +208,5 @@ namespace AirBomber
                 _startPosY = _pictureHeight.Value - _airBomberHeight;
             }
         }
-
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        public (float Left, float Top, float Right, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _airBomberWidth, _startPosY + _airBomberHeight);
-        }
     }
 }

AirBomber/AirBomber/DrawingHeavyAirBomber.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class DrawingHeavyAirBomber : DrawingAirBomber
-    {
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="bodyKit">Признак наличия обвеса</param>
-        /// <param name="wing">Признак наличия антикрыла</param>
-        /// <param name="sportLine">Признак наличия гоночной полосы</param>
-        public DrawingHeavyAirBomber(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
-            base(speed, weight, bodyColor, 110, 100)
-        {
-            AirBomber = new EntityHeavyAirBomber(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            if (AirBomber is not EntityHeavyAirBomber heavyAirBomber)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(heavyAirBomber.DopColor);
-
-            if (heavyAirBomber.Bombs) 
-            {
-                g.FillEllipse(dopBrush, _startPosX + 45, _startPosY, 20, 10);
-                g.FillEllipse(dopBrush, _startPosX + 45, _startPosY + 90, 20, 10);
-                g.DrawEllipse(pen, _startPosX + 45, _startPosY, 20, 10);
-                g.DrawEllipse(pen, _startPosX + 45, _startPosY + 90, 20, 10);
-            }
-
-            base.DrawTransport(g);
-
-            if (heavyAirBomber.TailLine) //TODO отрисовка полоски на хвосте
-            {
-                g.FillRectangle(dopBrush, _startPosX + 95, _startPosY + 30, 15, 5);
-                g.FillRectangle(dopBrush, _startPosX + 95, _startPosY + 65, 15, 5);
-            }
-
-            if (heavyAirBomber.FuelTank) //TODO отрисовка топливных баков
-            {
-                g.FillEllipse(dopBrush, _startPosX + 23, _startPosY + 42, 25, 15);
-                g.FillEllipse(dopBrush, _startPosX + 53, _startPosY + 42, 25, 15);
-                g.FillEllipse(dopBrush, _startPosX + 83, _startPosY + 42, 25, 15);
-                g.DrawEllipse(pen, _startPosX + 23, _startPosY + 42, 25, 15);
-                g.DrawEllipse(pen, _startPosX + 53, _startPosY + 42, 25, 15);
-                g.DrawEllipse(pen, _startPosX + 83, _startPosY + 42, 25, 15);
-            }
-        }
-    }
-}

AirBomber/AirBomber/DrawingObjectAirBomber.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class DrawingObjectAirBomber : IDrawingObject
-    {
-        private DrawingAirBomber _airBomber = null;
-
-        public DrawingObjectAirBomber(DrawingAirBomber airBomber)
-        {
-            _airBomber = airBomber;
-        }
-
-        public float Step => _airBomber?.AirBomber?.Step ?? 0;
-
-        public (float Left, float Top, float Right, 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);
-        }
-
-        void IDrawingObject.DrawingObject(Graphics g)
-        {
-            if (_airBomber == null) return;
-            if (_airBomber is DrawingHeavyAirBomber heavyAirBomber)
-            {
-                heavyAirBomber.DrawTransport(g);
-            }
-            else
-            {
-                _airBomber.DrawTransport(g);
-            }
-        }
-    }
-}

AirBomber/AirBomber/EntityAirBomber.cs

@@ -34,7 +34,7 @@ namespace AirBomber
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public EntityAirBomber (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;

AirBomber/AirBomber/EntityHeavyAirBomber.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    /// <summary>
-    /// Класс-сущность "Тяжелый бомбардировщик"
-    /// </summary>
-    internal class EntityHeavyAirBomber : EntityAirBomber
-    {
-        /// <summary>
-        /// Дополнительный цвет
-        /// </summary>
-        public Color DopColor { get; private set; }
-        /// <summary>
-        /// Признак наличия бомб
-        /// </summary>
-        public bool Bombs { get; private set; }
-        /// <summary>
-        /// Признак наличия топливных баков
-        /// </summary>
-        public bool FuelTank { get; private set; }
-        /// <summary>
-        /// Признак наличия полосы на хвосте
-        /// </summary>
-        public bool TailLine { get; private set; }
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес бомбардировщика</param>
-        /// <param name="bodyColor">Цвет корпуса</param>
-        /// <param name="dopColor">Дополнительный цвет</param>
-        /// <param name="bombs">Признак наличия обвеса</param>
-        /// <param name="fuelTank">Признак наличия антикрыла</param>
-        /// <param name="tailLine">Признак наличия гоночной полосы</param>
-        public EntityHeavyAirBomber(int speed, float weight, Color bodyColor, Color dopColor, bool bombs, bool fuelTank, bool tailLine) :
-            base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            Bombs = bombs;
-            FuelTank = fuelTank;
-            TailLine = tailLine;
-        }
-    }
-}

AirBomber/AirBomber/FormAirBomber.Designer.cs

@@ -38,7 +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();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -144,22 +143,11 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
             // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(112, 395);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(120, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
-            // 
             // FormAirBomber
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(882, 453);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonCreateAirBomber);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -189,6 +177,5 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreateModif;
     }
 }

AirBomber/AirBomber/FormAirBomber.cs

@@ -24,7 +24,8 @@ namespace AirBomber
         private void buttonCreateAirBomber_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _airBomber = new DrawingAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _airBomber = new DrawingAirBomber();
+            _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}";
@@ -67,33 +68,5 @@ namespace AirBomber
             _airBomber?.ChangeBorders(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
             Draw();
         }
-
-        /// <summary>
-		/// Ìåòîä óñòàíîâêè äàííûõ
-		/// </summary>
-		private void SetData()
-        {
-            Random rnd = new();
-            _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.Name}";
-        }
-
-        /// <summary>
-        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _airBomber = new DrawingHeavyAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData();
-            Draw();
-        }
     }
 }

AirBomber/AirBomber/FormMap.Designer.cs

@@ -1,213 +0,0 @@
-namespace AirBomber
-{
-    partial class FormMap
-    {
-        /// <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.pictureBoxAirBomber = new System.Windows.Forms.PictureBox();
-            this.buttonCreateAirBomber = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            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.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxAirBomber
-            // 
-            this.pictureBoxAirBomber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxAirBomber.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxAirBomber.Name = "pictureBoxAirBomber";
-            this.pictureBoxAirBomber.Size = new System.Drawing.Size(882, 427);
-            this.pictureBoxAirBomber.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxAirBomber.TabIndex = 0;
-            this.pictureBoxAirBomber.TabStop = false;
-            // 
-            // buttonCreateAirBomber
-            // 
-            this.buttonCreateAirBomber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateAirBomber.Location = new System.Drawing.Point(12, 395);
-            this.buttonCreateAirBomber.Name = "buttonCreateAirBomber";
-            this.buttonCreateAirBomber.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreateAirBomber.TabIndex = 2;
-            this.buttonCreateAirBomber.Text = "Создать";
-            this.buttonCreateAirBomber.UseVisualStyleBackColor = true;
-            this.buttonCreateAirBomber.Click += new System.EventHandler(this.ButtonCreate_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(804, 358);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 30);
-            this.buttonUp.TabIndex = 3;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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(768, 394);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.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(804, 394);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 30);
-            this.buttonDown.TabIndex = 5;
-            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::AirBomber.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(840, 394);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 30);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // 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(112, 395);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(120, 29);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 427);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(882, 26);
-            this.statusStrip1.TabIndex = 8;
-            this.statusStrip1.Text = "statusStripInfo";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет:";
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Городская карта",
-            "Линейная карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(238, 394);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(882, 453);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonCreateModif);
-            this.Controls.Add(this.buttonCreateAirBomber);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.pictureBoxAirBomber);
-            this.Controls.Add(this.statusStrip1);
-            this.Name = "FormMap";
-            this.Text = "Карта";
-            this.Load += new System.EventHandler(this.FormMap_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxAirBomber;
-        private Button buttonCreateAirBomber;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonCreateModif;
-        private StatusStrip statusStrip1;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

AirBomber/AirBomber/FormMap.cs

@@ -1,112 +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 FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-        /// <summary>
-        /// Заполнение информации по объекту
-        /// </summary>
-        /// <param name="car"></param>
-        private void SetData(DrawingAirBomber airBomber)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {airBomber.AirBomber.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {airBomber.AirBomber.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {airBomber.AirBomber.BodyColor.Name}";
-            pictureBoxAirBomber.Image = _abstractMap.CreateMap(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height,
-                new DrawingObjectAirBomber(airBomber));
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var airBomber = new DrawingAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(airBomber);
-        }
-        /// <summary>
-        /// Изменение размеров формы
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //получаем имя кнопки
-            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;
-            }
-            pictureBoxAirBomber.Image = _abstractMap?.MoveObject(dir);
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Модификация"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var airBomber = new DrawingHeavyAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(airBomber);
-        }
-        /// <summary>
-        /// Смена карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Городская карта":
-                    _abstractMap = new CityMap();
-                    break;
-                case "Линейная карта":
-                    _abstractMap = new LineMap();
-                    break;
-            }
-        }
-
-        private void FormMap_Load(object sender, EventArgs e)
-        {
-            comboBoxSelectorMap.SelectedIndex = 0;
-        }
-    }
-}

AirBomber/AirBomber/FormMap.resx

@@ -1,66 +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>
-  <metadata name="statusStrip1.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>46</value>
-  </metadata>
-</root>

AirBomber/AirBomber/IDrawingObject.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    /// <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>
-        /// <returns></returns>
-        void MoveObject(Direction direction);
-        /// <summary>
-        /// Отрисовка объекта
-        /// </summary>
-        /// <param name="g"></param>
-        void DrawingObject(Graphics g);
-        /// <summary>
-        /// Получение текущей позиции объекта
-        /// </summary>
-        /// <returns></returns>
-        (float Left, float Top, float Right, float Bottom) GetCurrentPosition();
-    }
-}

AirBomber/AirBomber/LineMap.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class LineMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.Aquamarine);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _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 lineCounter = 0;
-            int numOfLines = _random.Next(1, 4);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (lineCounter < numOfLines)
-            {
-                int randomInt = _random.Next(0, 1000);
-                bool vertical = false;
-                if (randomInt % 2 == 0) vertical = true;
-                if (vertical)
-                {
-                    int x = _random.Next(0, 89);
-                    int lineWidth = _random.Next(2, 5);
-                    if (x + lineWidth >= _map.GetLength(0)) x = _random.Next(_map.GetLength(0) - lineWidth - 1, _map.GetLength(0));
-
-                    bool isFreeSpace = true;
-                    for (int i = x; i < x + lineWidth; i++)
-                    {
-                        if (_map[i, 0] != _freeRoad) isFreeSpace = false;
-                    }
-                    if (isFreeSpace)
-                    {
-                        for (int i = x; i < x + lineWidth; i++)
-                        {
-                            for (int j = 0; j < _map.GetLength(0); j++)
-                            {
-                                _map[i, j] = _barrier;
-                            }
-                        }
-                        lineCounter++;
-                    }
-                }
-                else
-                {
-                    int y = _random.Next(0, 89);
-                    int lineHeigth = _random.Next(2, 5);
-                    if (y + lineHeigth >= _map.GetLength(1)) y = _random.Next(_map.GetLength(1) - lineHeigth - 1, _map.GetLength(1));
-
-                    bool isFreeSpace = true;
-                    for (int j = y; j < y + lineHeigth; j++)
-                    {
-                        if (_map[0, j] != _freeRoad) isFreeSpace = false;
-                    }
-                    if (isFreeSpace)
-                    {
-                        for (int j = y; j < y + lineHeigth; j++)
-                        {
-                            for (int i = 0; i < _map.GetLength(1); i++)
-                            {
-                                _map[i, j] = _barrier;
-                            }
-                        }
-                        lineCounter++;
-                    }
-                }
-            }
-        }
-    }
-}

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 FormMap());
+            Application.Run(new FormAirBomber());
         }
     }
 }

AirBomber/AirBomber/SimpleMap.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AirBomber
-{
-    internal class SimpleMap : AbstractMap
-    {
-        /// <summary>
-        /// Цвет участка закрытого
-        /// </summary>
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// <summary>
-        /// Цвет участка открытого
-        /// </summary>
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
-        }
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _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++;
-                }
-            }
-        }
-    }
-}