diff --git a/AirBomber/AirBomber/DrawningAirBomber.cs b/AirBomber/AirBomber/DrawningAirBomber.cs
index b9decf0..a5d0dbe 100644
--- a/AirBomber/AirBomber/DrawningAirBomber.cs
+++ b/AirBomber/AirBomber/DrawningAirBomber.cs
@@ -7,87 +7,42 @@ using System.Threading.Tasks;
namespace AirBomber
{
- public class DrawningAirBomber
+ public class DrawningAirBomber : DrawningAirPlane
{
- public EntityAirBomber? EntityAirBomber { get; private set; }
- private int _pictureWidth;
- private int _pictureHeight;
- private int _startPosX;
- private int _startPosY;
- private readonly int _bomberWidth = 160;
- private readonly int _bomberHeight = 118;
- public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, Color bombsColor, bool fuelTanks, int width, int height)
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия обвеса
+ /// Признак наличия антикрыла
+ /// Признак наличия гоночной полосы
+ /// Ширина картинки
+ /// Высота картинки
+ public DrawningAirBomber(int speed, double weight, Color bodyColor, Color
+ additionalColor, bool bombs, Color bombsColor, bool fuelTanks, int width, int height) :
+
+ base(speed, weight, bodyColor, width, height, 110, 60)
{
- _pictureWidth = width;
- _pictureHeight = height;
- if (width < _bomberWidth || height < _bomberHeight)
+ if (EntityAirPlane != null)
{
- return false;
- }
- 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;
+ EntityAirPlane = new EntityAirBomber(speed, weight, bodyColor, additionalColor, bombs, fuelTanks);
}
- if (y < 0 || y + _bomberWidth > _pictureHeight)
- {
- y = _pictureHeight - _bomberHeight;
- }
- _startPosX = x;
- _startPosY = y;
}
- public void MoveTransport(DirectionType direction)
+ public override void DrawPlane(Graphics g)
{
- 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)
- {
- if (EntityAirBomber == null)
+ if (EntityAirPlane is not EntityAirPlane sportCar)
{
return;
}
Pen pen = new(Color.Black);
- Brush additionalBrush = new SolidBrush(EntityAirBomber.AdditionalColor);
- Brush bodyColor = new SolidBrush(EntityAirBomber.BodyColor);
- Brush bombsColor = new SolidBrush(EntityAirBomber.BombsColor);
- Brush wingsColor = new SolidBrush(Color.DeepPink);
- if (EntityAirBomber.Bombs)
+ Brush additionalBrush = new
+ SolidBrush(airBomber.AdditionalColor);
+ // обвесы
+ if (airBomber.Bombs)
{
g.FillEllipse(bombsColor, _startPosX + 90, _startPosY + 20, 15, 29);
g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 15, 29);
@@ -95,89 +50,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
- {
- 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),
- }
- );
+ base.DrawPlane(g);
+ // fueltanks
if (EntityAirBomber.FuelTanks)
{
g.FillRectangle(additionalBrush, _startPosX + 63, _startPosY + 34, 20, 15);
diff --git a/AirBomber/AirBomber/DrawningAirPlane.cs b/AirBomber/AirBomber/DrawningAirPlane.cs
index d884669..982df68 100644
--- a/AirBomber/AirBomber/DrawningAirPlane.cs
+++ b/AirBomber/AirBomber/DrawningAirPlane.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AirBomber
{
- internal class DrawningAirPlane
+ public class DrawningAirPlane
{
///
/// Класс-сущность