Обновленный класс прорисовки «продвинутого» объекта + fix in EntityAirBomber

AirBomber/AirBomber/DrawningAirBomber.cs

@@ -6,190 +6,37 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    public class DrawningAirBomber
+    public class DrawningAirBomber : DrawningAirPlane
     {
-        public EntityAirBomber? EntityAirBomber { get; private set; }
+        public DrawningAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, bool fuelTanks, int width, int height) :
-        private int _pictureWidth;
+        base(speed, weight, bodyColor, width, height, 160, 118)
-        private int _pictureHeight;
-        private int _startPosX;
-        private int _startPosY;
-        private readonly int _bomberWidth = 160;
-        private readonly int _bomberHeight = 118;
-        private DrawningEngines drawningEngines;
-
-        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, bool fuelTanks, int engines, int width, int height)
         {
-            if (width < _bomberWidth || height < _bomberHeight)
+            if (EntityAirPlane != null)
             {
-                return false;
+                EntityAirPlane = new EntityAirBomber(speed, weight, bodyColor, additionalColor, bombs, fuelTanks);
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            EntityAirBomber = new EntityAirBomber();
-            EntityAirBomber.Init(speed, weight, bodyColor, additionalColor, bombs, fuelTanks, engines);
-
-            drawningEngines = new DrawningEngines();
-            drawningEngines.SetAmount(engines);
-
-            return true;
-        }
-
-        public void SetPosition(int x, int y)
-        {
-            if (x < 0 || x + _bomberWidth > _pictureWidth)
-            {
-                x = _pictureWidth - _bomberWidth;
-            }
-
-            if (y < 0 || y + _bomberWidth > _pictureHeight)
-            {
-                y = _pictureHeight - _bomberHeight;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        public void MoveTransport(DirectionType direction)
-        {
-            if (EntityAirBomber == null)
-            {
-                return;
-            }
-            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 EntityAirBomber 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 wingsColor = new SolidBrush(Color.DeepPink);
+            // bombs
-            if (EntityAirBomber.Bombs)
+            g.FillEllipse(additionalBrush, _startPosX + 90, _startPosY + 20, 15, 29);
-            {
+            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 15, 29);
+            g.FillEllipse(additionalBrush, _startPosX + 90, _startPosY + 70, 15, 29);
+            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 70, 15, 29);
             g.FillEllipse(additionalBrush, _startPosX + 140, _startPosY + 50, 15, 15);
             g.DrawEllipse(pen, _startPosX + 140, _startPosY + 50, 15, 15);
-                g.FillEllipse(additionalBrush, _startPosX + 140, _startPosY + 30, 15, 15);
+            // fueltanks
-                g.DrawEllipse(pen, _startPosX + 140, _startPosY + 30, 15, 15);
+            g.FillRectangle(additionalBrush, _startPosX + 63, _startPosY + 34, 20, 15);
-                g.FillEllipse(additionalBrush, _startPosX + 140, _startPosY + 70, 15, 15);
+            g.DrawRectangle(pen, _startPosX + 63, _startPosY + 34, 20, 15);
-                g.DrawEllipse(pen, _startPosX + 140, _startPosY + 70, 15, 15);
+            g.FillRectangle(additionalBrush, _startPosX + 63, _startPosY + 70, 20, 15);
-            }
+            g.DrawRectangle(pen, _startPosX + 63, _startPosY + 70, 20, 15);
-            g.FillPolygon(additionalBrush, 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(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 + 85, _startPosY + 34, 30, 15);
-                g.DrawRectangle(pen, _startPosX + 85, _startPosY + 34, 30, 15);
-                g.FillRectangle(additionalBrush, _startPosX + 85, _startPosY + 70, 30, 15);
-                g.DrawRectangle(pen, _startPosX + 85, _startPosY + 70, 30, 15);
-            }
-            drawningEngines.DrawEngines(g, _startPosX, _startPosY);
         }
     }
 }

AirBomber/AirBomber/DrawningAirPlane.cs

@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    public class DrawningAirPlane
+    {
+        public EntityAirPlane? EntityAirPlane { get; protected set; }
+        private int _pictureWidth;
+        private int _pictureHeight;
+        protected int _startPosX;
+        protected int _startPosY;
+        protected readonly int _airPlaneWidth = 150;
+        protected readonly int _airPlaneHeight = 118;
+        public DrawningAirPlane(int speed, double weight, Color bodyColor, int
+        width, int height)
+        {
+            if (width < _airPlaneWidth || height < _airPlaneHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntityAirPlane = new EntityAirPlane(speed, weight, bodyColor);
+        }
+        protected DrawningAirPlane(int speed, double weight, Color bodyColor, int
+        width, int height, int airPlaneWidth, int airPlaneHeight)
+        {
+            if (width < _airPlaneWidth || height < _airPlaneHeight)
+            {
+                return;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            _airPlaneWidth = airPlaneWidth;
+            _airPlaneHeight = airPlaneHeight;
+            EntityAirPlane = new EntityAirPlane(speed, weight, bodyColor);
+        }
+        public void SetPosition(int x, int y)
+        {
+            if (x < 0 || x + _airPlaneWidth > _pictureWidth)
+            {
+                x = _pictureWidth - _airPlaneWidth;
+            }
+            if (y < 0 || y + _airPlaneHeight > _pictureHeight)
+            {
+                y = _pictureHeight - _airPlaneHeight;
+            }
+            _startPosX = x;
+            _startPosY = y;
+        }
+        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),
+                }
+            );
+        }
+        public int GetPosX => _startPosX;
+        public int GetPosY => _startPosY;
+        public int GetWidth => _airPlaneWidth;
+        public int GetHeight => _airPlaneHeight;
+        public bool CanMove(DirectionType direction)
+        {
+            if (EntityAirPlane == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                //влево
+                DirectionType.Left => _startPosX - EntityAirPlane.Step > 0,
+                //вверх
+                DirectionType.Up => _startPosY - EntityAirPlane.Step > 0,
+                // вправо
+                DirectionType.Right => _startPosX + EntityAirPlane.Step + _airPlaneWidth < _pictureWidth,
+                //вниз
+                DirectionType.Down => _startPosY + EntityAirPlane.Step + _airPlaneHeight < _pictureHeight,
+                _ => false,
+            };
+        }
+        public void MovePlane(DirectionType direction)
+        {
+            if (!CanMove(direction) || EntityAirPlane == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                case DirectionType.Left:
+                    _startPosX -= (int)EntityAirPlane.Step;
+                    break;
+                case DirectionType.Up:
+                    _startPosY -= (int)EntityAirPlane.Step;
+                    break;
+                case DirectionType.Right:
+                    _startPosX += (int)EntityAirPlane.Step;
+                    break;
+                case DirectionType.Down:
+                    _startPosY += (int)EntityAirPlane.Step;
+                    break;
+            }
+        }
+    }
+}

AirBomber/AirBomber/EntityAirBomber.cs

@@ -6,25 +6,16 @@ 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 bool FuelTanks { get; private set; }
-        public int Engines { get; private set; }
+        public EntityAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, bool fuelTanks) : base(speed, weight, bodyColor)
-        public double Step => (double)Speed * 100 / Weight;
-        public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, bool fuelTanks, int engines)
         {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
             AdditionalColor = additionalColor;
             Bombs = bombs;
             FuelTanks = fuelTanks;
-            Engines = engines;
         }
     }
 }

AirBomber/AirBomber/EntityAirPlane.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    internal class EntityAirPlane
+    {
+    }
+}