From ba3b017e155e0349001376a6149d2bb5c98e2ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=BE=D1=84=D1=8C=D1=8F=20=D0=AF=D0=BA=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=87=D1=83=D0=BA?= <yakobchuk.2004@mail.ru>
Date: Mon, 27 Nov 2023 22:11:30 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0-?=
 =?UTF-8?q?=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=C2=AB=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D1=82=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=C2=BB=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sailboat/Sailboat/EntitySailboat.cs | 33 +++++++++--------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/Sailboat/Sailboat/EntitySailboat.cs b/Sailboat/Sailboat/EntitySailboat.cs
index b9e4614..4568ffe 100644
--- a/Sailboat/Sailboat/EntitySailboat.cs
+++ b/Sailboat/Sailboat/EntitySailboat.cs
@@ -4,38 +4,28 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Sailboat
+namespace Sailboat.Entities
 {
-    public class EntitySailboat
+    /// <summary>
+    /// Класс-сущность "Парусная лодка"
+    /// </summary>
+    public class EntitySailboat : EntityBoat
     {
-        /// <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 Color AdditionalColor { get; private set; }
+
         /// <summary>
         /// Признак (опция) наличия усиленного корпуса
         /// </summary>
         public bool Hull { get; private set; }
+
         /// <summary>
         /// Признак (опция) наличия паруса
         /// </summary>
         public bool Sail { get; private set; }
-        /// <summary>
-        /// Шаг перемещения лодки
-        /// </summary>
-        public double Step => (double)Speed * 100 / Weight;
+
         /// <summary>
         /// Инициализация полей объекта-класса парусной лодки
         /// </summary>
@@ -45,12 +35,9 @@ namespace Sailboat
         /// <param name="additionalColor">Дополнительный цвет</param>
         /// <param name="hull">Признак наличия усиленного корпуса</param>
         /// <param name="sail">Признак наличия паруса</param>
-        public void Init(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool hull, bool sail)
+        public EntitySailboat(int speed, double weight, Color bodyColor, Color
+        additionalColor, bool hull, bool sail) : base(speed, weight, bodyColor)
         {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
             AdditionalColor = additionalColor;
             Hull = hull;
             Sail = sail;