Исправления в DrawningAirBomber

AirBomber/AirBomber/DrawningAirBomber.cs

@@ -7,87 +7,41 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    public class DrawningAirBomber
+    public class DrawningAirBomber : DrawningAirPlane
     {
-        public EntityAirBomber? EntityAirBomber { get; private set; }
+        /// <summary>
-        private int _pictureWidth;
+        /// Конструктор
-        private int _pictureHeight;
+        /// </summary>
-        private int _startPosX;
+        /// <param name="speed">Скорость</param>
-        private int _startPosY;
+        /// <param name="weight">Вес</param>
-        private readonly int _bomberWidth = 160;
+        /// <param name="bodyColor">Основной цвет</param>
-        private readonly int _bomberHeight = 118;     
+        /// <param name="additionalColor">Дополнительный цвет</param>
-        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, Color bombsColor, bool fuelTanks, int width, int height)
+        /// <param name="bodyKit">Признак наличия обвеса</param>
-        {
+        /// <param name="wing">Признак наличия антикрыла</param>
-            _pictureWidth = width;
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
-            _pictureHeight = height;
+        /// <param name="width">Ширина картинки</param>
-            if (width < _bomberWidth || height < _bomberHeight)
+        /// <param name="height">Высота картинки</param>
-            {
+        public DrawningAirBomber(int speed, double weight, Color bodyColor, Color
-                return false;
+       additionalColor, bool bombs, Color bombsColor, bool fuelTanks, int width, int height) :
-            }     
-            EntityAirBomber = new EntityAirBomber();
-            EntityAirBomber.Init(speed, weight, bodyColor, additionalColor, bombs, bombsColor, fuelTanks);
-            return true;
-        }
-        public void SetPosition(int x, int y)
-        {
-            if (x < 0 || x + _bomberWidth > _pictureWidth) 
-            {
-                x = _pictureWidth - _bomberWidth;
-            }
 
-            if (y < 0 || y + _bomberWidth > _pictureHeight) 
+        base(speed, weight, bodyColor, width, height, 110, 60)
-            {
-                y = _pictureHeight - _bomberHeight;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        public void MoveTransport(DirectionType direction)
         {
-            if (EntityAirBomber == null)
+            if (EntityAirPlane != null)
             {
-                return;
+                EntityAirPlane = new EntityAirBomber(speed, weight, bodyColor, additionalColor, bombs, fuelTanks);
-            }
-            switch (direction)
-            {
-                case DirectionType.Left:
-                    if (_startPosX - EntityAirBomber.Step > 0)
-                    {
-                        _startPosX -= (int)EntityAirBomber.Step;
-                    }
-                    break;
-                case DirectionType.Up:
-                    if (_startPosY - EntityAirBomber.Step > 0)
-                    {
-                        _startPosY -= (int)EntityAirBomber.Step;
-                    }
-                    break;
-                case DirectionType.Right:
-                    if (_startPosX + EntityAirBomber.Step + _bomberWidth < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityAirBomber.Step;
-                    }
-                    break;
-                case DirectionType.Down:
-                    if (_startPosY + EntityAirBomber.Step + _bomberHeight < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityAirBomber.Step;
-                    }
-                    break;
             }
         }
-        public void DrawBomber(Graphics g)
+        public override void DrawPlane(Graphics g)
         {
-            if (EntityAirBomber == null)
+            if (EntityAirPlane is not EntityAirPlane airBomber)
             {
                 return;
             }
             Pen pen = new(Color.Black);
-            Brush additionalBrush = new SolidBrush(EntityAirBomber.AdditionalColor);
+            Brush additionalBrush = new SolidBrush(airBomber.AdditionalColor);
-            Brush bodyColor = new SolidBrush(EntityAirBomber.BodyColor);
+            base.DrawPlane(g);
-            Brush bombsColor = new SolidBrush(EntityAirBomber.BombsColor);
+            // обвесы
-            Brush wingsColor = new SolidBrush(Color.DeepPink);
+            if (airBomber.Bombs)
-            if (EntityAirBomber.Bombs)
             {
                 g.FillEllipse(bombsColor, _startPosX + 90, _startPosY + 20, 15, 29);
                 g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 15, 29);
@@ -95,90 +49,9 @@ namespace AirBomber
                 g.DrawEllipse(pen, _startPosX + 90, _startPosY + 70, 15, 29);
                 g.FillEllipse(bombsColor, _startPosX + 140, _startPosY + 50, 15, 15);
                 g.DrawEllipse(pen, _startPosX + 140, _startPosY + 50, 15, 15);
-
             }
-            g.FillPolygon(additionalBrush, new Point[] //nose
+            // fueltanks
-                {
+            if (airBomber.FuelTanks)
-                    new Point(_startPosX + 19, _startPosY + 50),
-                    new Point(_startPosX + 19, _startPosY + 69),
-                    new Point(_startPosX + 1, _startPosY + 59),
-                }
-            );
-            g.FillRectangle(bodyColor, _startPosX + 20, _startPosY + 50, 120, 20); //body
-            g.FillPolygon(additionalBrush, new Point[] //up left wing
-               {
-                    new Point(_startPosX + 36, _startPosY + 49),
-                    new Point(_startPosX + 36, _startPosY + 1),
-                    new Point(_startPosX + 45, _startPosY + 1),
-                    new Point(_startPosX + 55, _startPosY + 49),
-               }
-           );
-            g.FillPolygon(additionalBrush, new Point[] //down left wing
-                {
-                    new Point(_startPosX + 36, _startPosY + 71),
-                    new Point(_startPosX + 36, _startPosY + 116),
-                    new Point(_startPosX + 45, _startPosY + 116),
-                    new Point(_startPosX + 54, _startPosY + 71),
-                }
-            );
-            g.FillPolygon(wingsColor, new Point[] //up right wing
-                {
-                    new Point(_startPosX + 120, _startPosY + 49),
-                    new Point(_startPosX + 120, _startPosY + 42),
-                    new Point(_startPosX + 140, _startPosY + 7),
-                    new Point(_startPosX + 140, _startPosY + 49),
-                }
-            );
-            g.FillPolygon(wingsColor, new Point[] //down right wing
-                {
-                    new Point(_startPosX + 120, _startPosY + 70),
-                    new Point(_startPosX + 120, _startPosY + 77),
-                    new Point(_startPosX + 140, _startPosY + 112),
-                    new Point(_startPosX + 140, _startPosY + 70),
-                }
-            );
-
-            g.DrawPolygon(pen, new Point[] //nose
-                {
-                    new Point(_startPosX + 20, _startPosY + 49),
-                    new Point(_startPosX + 20, _startPosY + 70),
-                    new Point(_startPosX, _startPosY + 59),
-                }
-            );
-            g.DrawRectangle(pen, _startPosX + 19, _startPosY + 49, 121, 21); //body
-            g.DrawPolygon(pen, new Point[] //up left wing
-                {
-                    new Point(_startPosX + 35, _startPosY + 49),
-                    new Point(_startPosX + 35, _startPosY),
-                    new Point(_startPosX + 45, _startPosY),
-                    new Point(_startPosX + 55, _startPosY + 49),
-                }
-            );
-            g.DrawPolygon(pen, new Point[] //down left wing
-                {
-                    new Point(_startPosX + 36, _startPosY + 71),
-                    new Point(_startPosX + 36, _startPosY + 116),
-                    new Point(_startPosX + 45, _startPosY + 116),
-                    new Point(_startPosX + 54, _startPosY + 71),
-                }
-            );
-            g.DrawPolygon(pen, new Point[] //up right wing
-                {
-                    new Point(_startPosX + 120, _startPosY + 49),
-                    new Point(_startPosX + 120, _startPosY + 42),
-                    new Point(_startPosX + 140, _startPosY + 7),
-                    new Point(_startPosX + 140, _startPosY + 49),
-                }
-            );
-            g.DrawPolygon(pen, new Point[] //down right wing
-                {
-                    new Point(_startPosX + 120, _startPosY + 70),
-                    new Point(_startPosX + 120, _startPosY + 77),
-                    new Point(_startPosX + 140, _startPosY + 112),
-                    new Point(_startPosX + 140, _startPosY + 70),
-                }
-            );
-            if (EntityAirBomber.FuelTanks)
             {
                 g.FillRectangle(additionalBrush, _startPosX + 63, _startPosY + 34, 20, 15);
                 g.DrawRectangle(pen, _startPosX + 63, _startPosY + 34, 20, 15);

AirBomber/AirBomber/DrawningAirPlane.cs

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    public class DrawningAirPlane
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityAirPlane? EntityAirPlane { get; protected set; }
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        private int _pictureWidth;
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        private int _pictureHeight;
+        /// <summary>
+        /// Левая координата прорисовки самолета
+        /// </summary>
+        protected int _startPosX;
+        /// <summary>
+        /// Верхняя кооридната прорисовки самолета
+        /// </summary>
+        protected int _startPosY;
+        /// <summary>
+        /// Ширина прорисовки самолета
+        /// </summary>
+        protected readonly int _airPlaneWidth = 100;
+        /// <summary>
+        /// Высота прорисовки самолета
+        /// </summary>
+        protected readonly int _airPlaneHeight = 55;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public DrawningAirPlane(int speed, double weight, Color bodyColor, int
+        width, int height)
+        {
+            // TODO: Продумать проверки
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntityAirPlane = new EntityAirPlane(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        /// <param name="airPlaneWidth">Ширина прорисовки самолета</param>
+        /// <param name="airPlaneHeight">Высота прорисовки самолета</param>
+        protected DrawningAirPlane(int speed, double weight, Color bodyColor, int
+        width, int height, int airPlaneWidth, int airPlaneHeight)
+        {
+            // TODO: Продумать проверки
+            _pictureWidth = width;
+            _pictureHeight = height;
+            _airPlaneWidth = airPlaneWidth;
+            _airPlaneHeight = airPlaneHeight;
+            EntityAirPlane = new EntityAirPlane(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Установка позиции
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        public void SetPosition(int x, int y)
+        {
+            // TODO: Изменение x, y, если при установке объект выходит за границы
+            _startPosX = x;
+            _startPosY = y;
+        }
+        /// <summary>
+        /// Изменение направления перемещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(DirectionType direction)
+        {
+            if (EntityAirPlane == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                //влево
+                case DirectionType.Left:
+                    if (_startPosX - EntityAirPlane.Step > 0)
+                    {
+                        _startPosX -= (int)EntityAirPlane.Step;
+                    }
+                    break;
+                //вверх
+                case DirectionType.Up:
+                    if (_startPosY - EntityAirPlane.Step > 0)
+                    {
+                        _startPosY -= (int)EntityAirPlane.Step;
+                    }
+                    break;
+                // вправо
+                case DirectionType.Right:
+                    // TODO: Продумать логику
+                    break;
+                //вниз
+                case DirectionType.Down:
+                    // TODO: Продумать логику
+                    break;
+            }
+        }
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void DrawPlane(Graphics g)
+        {
+            if (EntityAirPlane == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush bodyColor = new SolidBrush(EntityAirPlane.BodyColor);
+            Brush wingsColor = new SolidBrush(Color.DeepPink);
+            g.FillPolygon(bodyColor, new Point[] //nose
+                {
+                    new Point(_startPosX + 19, _startPosY + 50),
+                    new Point(_startPosX + 19, _startPosY + 69),
+                    new Point(_startPosX + 1, _startPosY + 59),
+                }
+            );
+            g.FillRectangle(bodyColor, _startPosX + 20, _startPosY + 50, 120, 20); //body
+            g.FillPolygon(bodyColor, new Point[] //up left wing
+               {
+                    new Point(_startPosX + 36, _startPosY + 49),
+                    new Point(_startPosX + 36, _startPosY + 1),
+                    new Point(_startPosX + 45, _startPosY + 1),
+                    new Point(_startPosX + 55, _startPosY + 49),
+               }
+           );
+            g.FillPolygon(bodyColor, new Point[] //down left wing
+                {
+                    new Point(_startPosX + 36, _startPosY + 71),
+                    new Point(_startPosX + 36, _startPosY + 116),
+                    new Point(_startPosX + 45, _startPosY + 116),
+                    new Point(_startPosX + 54, _startPosY + 71),
+                }
+            );
+            g.FillPolygon(wingsColor, new Point[] //up right wing
+                {
+                    new Point(_startPosX + 120, _startPosY + 49),
+                    new Point(_startPosX + 120, _startPosY + 42),
+                    new Point(_startPosX + 140, _startPosY + 7),
+                    new Point(_startPosX + 140, _startPosY + 49),
+                }
+            );
+            g.FillPolygon(wingsColor, new Point[] //down right wing
+                {
+                    new Point(_startPosX + 120, _startPosY + 70),
+                    new Point(_startPosX + 120, _startPosY + 77),
+                    new Point(_startPosX + 140, _startPosY + 112),
+                    new Point(_startPosX + 140, _startPosY + 70),
+                }
+            );
+
+            g.DrawPolygon(pen, new Point[] //nose
+                {
+                    new Point(_startPosX + 20, _startPosY + 49),
+                    new Point(_startPosX + 20, _startPosY + 70),
+                    new Point(_startPosX, _startPosY + 59),
+                }
+            );
+            g.DrawRectangle(pen, _startPosX + 19, _startPosY + 49, 121, 21); //body
+            g.DrawPolygon(pen, new Point[] //up left wing
+                {
+                    new Point(_startPosX + 35, _startPosY + 49),
+                    new Point(_startPosX + 35, _startPosY),
+                    new Point(_startPosX + 45, _startPosY),
+                    new Point(_startPosX + 55, _startPosY + 49),
+                }
+            );
+            g.DrawPolygon(pen, new Point[] //down left wing
+                {
+                    new Point(_startPosX + 36, _startPosY + 71),
+                    new Point(_startPosX + 36, _startPosY + 116),
+                    new Point(_startPosX + 45, _startPosY + 116),
+                    new Point(_startPosX + 54, _startPosY + 71),
+                }
+            );
+            g.DrawPolygon(pen, new Point[] //up right wing
+                {
+                    new Point(_startPosX + 120, _startPosY + 49),
+                    new Point(_startPosX + 120, _startPosY + 42),
+                    new Point(_startPosX + 140, _startPosY + 7),
+                    new Point(_startPosX + 140, _startPosY + 49),
+                }
+            );
+            g.DrawPolygon(pen, new Point[] //down right wing
+                {
+                    new Point(_startPosX + 120, _startPosY + 70),
+                    new Point(_startPosX + 120, _startPosY + 77),
+                    new Point(_startPosX + 140, _startPosY + 112),
+                    new Point(_startPosX + 140, _startPosY + 70),
+                }
+            );
+        }
+
+    }
+}

AirBomber/AirBomber/EntityAirBomber.cs

@@ -6,22 +6,15 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    public class EntityAirBomber
+    public class EntityAirBomber : EntityAirPlane
     {
-        public int Speed { get; private set; }
-        public double Weight { get; private set; }
-        public Color BodyColor { get; private set; }
         public Color AdditionalColor { get; private set; }
         public bool Bombs { get; private set; }
         public Color BombsColor { get; private set; }
         public bool FuelTanks { get; private set; } 
-        public double Step => (double)Speed * 100 / Weight;
+        public EntityAirBomber(int speed, double weight, Color bodyColor, Color
-        public void Init(int speed, double weight, Color bodyColor, Color
         additionalColor, bool bombs, Color bombsColor, bool fuelTanks)
         {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
             AdditionalColor = additionalColor;
             Bombs = bombs;
             BombsColor = bombsColor;

AirBomber/AirBomber/EntityAirPlane.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    public class EntityAirPlane
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weight { get; private set; }
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения самолета
+        /// </summary>
+        public double Step => (double)Speed * 100 / Weight;
+        /// <summary>
+        /// Конструктор с параметрами
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес самолета</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        public EntityAirPlane(int speed, double weight, Color bodyColor)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+        }
+
+    }
+}