From 7f1f1ca3e4d798e0b256c8c3deb2ff00d45e5004 Mon Sep 17 00:00:00 2001
From: Hells Hound <irisha1234517@gmail.com>
Date: Sun, 18 Sep 2022 21:41:23 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20DrawingAircraftCarrie?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AircraftCarrier/DrawingAircraftCarrier.cs | 33 +++++++++++++
 .../AircraftCarrier/DrawingWarship.cs         | 19 +++++++-
 .../AircraftCarrier/EntityAircraftCarrier.cs  | 46 +++++++++++++++++++
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 AircraftCarrier/AircraftCarrier/DrawingAircraftCarrier.cs
 create mode 100644 AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs

diff --git a/AircraftCarrier/AircraftCarrier/DrawingAircraftCarrier.cs b/AircraftCarrier/AircraftCarrier/DrawingAircraftCarrier.cs
new file mode 100644
index 0000000..f85e406
--- /dev/null
+++ b/AircraftCarrier/AircraftCarrier/DrawingAircraftCarrier.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AircraftCarrier
+{
+    internal class DrawingAircraftCarrier : DrawingWarship
+    {
+        /// <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 DrawingAircraftCarrier(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+            base(speed, weight, bodyColor, 110, 60)
+        {
+            Warship = new EntityAircraftCarrier(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
+        }
+
+        public override void DrawTransport(Graphics g)
+        {
+            base.DrawTransport(g);
+        }
+    }
+
+}
diff --git a/AircraftCarrier/AircraftCarrier/DrawingWarship.cs b/AircraftCarrier/AircraftCarrier/DrawingWarship.cs
index a97c5df..0f377aa 100644
--- a/AircraftCarrier/AircraftCarrier/DrawingWarship.cs
+++ b/AircraftCarrier/AircraftCarrier/DrawingWarship.cs
@@ -14,7 +14,7 @@ namespace AircraftCarrier
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityWarship Warship { get; private set; }
+        public EntityWarship Warship { get; protected set; }
         /// <summary>
         /// Левая координата отрисовки военного корабля
         /// </summary>
@@ -49,6 +49,21 @@ namespace AircraftCarrier
         {
             Warship = new EntityWarship(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 DrawingWarship(int speed, float weight, Color bodyColor, int warshipWidth, int warshipHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _warshipWidth = warshipWidth;
+            _warshipHeight = warshipHeight;
+        }
         /// <summary>
         /// Установка позиции военного корабля
         /// </summary>
@@ -127,7 +142,7 @@ namespace AircraftCarrier
         /// Отрисовка военного корабля
         /// </summary>
         /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
             || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
diff --git a/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs b/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs
new file mode 100644
index 0000000..e99bdbd
--- /dev/null
+++ b/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AircraftCarrier
+{
+    internal class EntityAircraftCarrier : EntityWarship
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        /// Признак наличия обвеса
+        /// </summary>
+        public bool BodyKit { get; private set; }
+        /// <summary>
+        /// Признак наличия антикрыла
+        /// </summary>
+        public bool Wing { get; private set; }
+        /// <summary>
+        /// Признак наличия гоночной полосы
+        /// </summary>
+        public bool SportLine { get; private set; }
+        /// <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 EntityAircraftCarrier(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            BodyKit = bodyKit;
+            Wing = wing;
+            SportLine = sportLine;
+        }
+    }
+}