From 2fc9f2e8cb2f9d58719e0ee5b274f6e748ddb26e Mon Sep 17 00:00:00 2001
From: MorozovDanil <morozov2005danil@mail.ru>
Date: Mon, 19 Feb 2024 11:48:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DrawningContainerShip.cs                     | 11 +++++------
 .../ProjectContainerShip/EntityContainerShip.cs  | 16 ++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs
index 095031b..a903343 100644
--- a/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs
@@ -50,12 +50,12 @@ public class DrawningContainerShip
     /// <param name="weight">Вес</param>
     /// <param name="bodyColor">Основной цвет</param>
     /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="bodyKit">Признак наличия контейнеров</param>
+    /// <param name="container">Признак наличия контейнеров</param>
     /// <param name="Crane">Признак наличия крана</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool Crane)
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool container, bool Crane)
     {
         EntityContainerShip = new EntityContainerShip();
-        EntityContainerShip.Init(speed, weight, bodyColor, additionalColor, bodyKit, Crane);
+        EntityContainerShip.Init(speed, weight, bodyColor, additionalColor, container, Crane);
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
@@ -176,7 +176,7 @@ public class DrawningContainerShip
         
         // контейнеры
 
-        if (EntityContainerShip.BodyKit)
+        if (EntityContainerShip.Container)
         {
             g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
             g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
@@ -184,7 +184,6 @@ public class DrawningContainerShip
             g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
             g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
             g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
-            
         }
 
         //границы лодки
@@ -205,9 +204,9 @@ public class DrawningContainerShip
         
         //палуба
 
-        //Brush brYellow = new SolidBrush(Color.LightYellow);
         g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 30, 30, 30);
         g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 30, 30, 30);
+
         // кран
 
         if (EntityContainerShip.Crane)
diff --git a/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs
index 600f9fb..f5fa306 100644
--- a/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs
@@ -28,35 +28,35 @@ public class EntityContainerShip
     /// <summary>
     /// Признак (опция) наличия Контейнеров
     /// </summary>
-    public bool BodyKit { get; private set; }
+    public bool Container { get; private set; }
 
     /// <summary>
-    /// Признак (опция) наличия антикрыла
+    /// Признак (опция) наличия крана
     /// </summary>
     public bool Crane { get; private set; }
 
 
     /// <summary>
-    /// Шаг перемещения автомобиля
+    /// Шаг перемещения контейнеровоза
     /// </summary>
     public double Step => Speed * 100 / Weight;
 
     /// <summary>
-    /// Инициализация полей объекта-класса спортивного автомобиля
+    /// Инициализация полей объекта-класса контейнеровоза
     /// </summary>
     /// <param name="speed">Скорость</param>
     /// <param name="weight">Вес контейнеровоза</param>
     /// <param name="bodyColor">Основной цвет</param>
     /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="bodyKit">Признак наличия контейнеров</param>
-    /// <param name="crane">Признак наличия антикрыла</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool crane)
+    /// <param name="container">Признак наличия контейнеров</param>
+    /// <param name="crane">Признак наличия крана</param>
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool container, bool crane)
     {
         Speed = speed;
         Weight = weight;
         BodyColor = bodyColor;
         AdditionalColor = additionalColor;
-        BodyKit = bodyKit;
+        Container = container;
         Crane = crane;
     }
 }
\ No newline at end of file