From d5a506cd3a2b4dcd23d7000915b2b7aaf3116563 Mon Sep 17 00:00:00 2001
From: Egor_Shtyrkin <shtyrkinegor@gmail.com>
Date: Thu, 25 Apr 2024 18:09:11 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=20=E2=84=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Drawnings/DrawningAircraftCarrier.cs         | 16 +++++-----------
 .../Drawnings/DrawningWarship.cs                 |  6 +++---
 .../FormAircraftCarrier.cs                       |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs
index 46e14b2..21c0608 100644
--- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs
+++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs
@@ -17,28 +17,25 @@ public class DrawningAircraftCarrier : DrawningWarship
     /// <param name="additionalColor">Дополнительный цвет</param>
     /// <param name="aircraftDeck">Признак наличия взлётно-посадочной полосы</param>
     /// <param name="controlRoom">Признак наличия рубки управления</param>
-    public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool aircraftDeck, bool controlRoom) : base(145, 55)
+    public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool aircraftDeck, bool controlRoom) : base(145, 57)
     {
         EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, aircraftDeck, controlRoom);
     }
 
     public override void DrawTransport(Graphics g)
     {
-        if (EntityWarship == null || EntityWarship is not EntityAircraftCarrier warship || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityWarship == null || EntityWarship is not EntityAircraftCarrier aircraftcarrier || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(warship.AdditionalColor);
+        Brush additionalBrush = new SolidBrush(aircraftcarrier.AdditionalColor);
 
-        _startPosX += 5;
-        _startPosY += 10;
         base.DrawTransport(g);
-        
 
         //рубка управления
-        if (warship.ControlRoom)
+        if (aircraftcarrier.ControlRoom)
         {
             g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 42, 15, 15);
             g.FillRectangle(additionalBrush, _startPosX.Value + 65, _startPosY.Value + 42, 15, 15);
@@ -56,7 +53,7 @@ public class DrawningAircraftCarrier : DrawningWarship
         }
 
         //палуба для взлёта самолётов
-        if (warship.AircraftDeck)
+        if (aircraftcarrier.AircraftDeck)
         {
             Point[] DeckPoint =
             {
@@ -68,9 +65,6 @@ public class DrawningAircraftCarrier : DrawningWarship
             g.FillPolygon(additionalBrush, DeckPoint);
             g.DrawPolygon(pen, DeckPoint);
             g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 35, _startPosX.Value + 50, _startPosY.Value + 10);
-
-            _startPosX -= 5;
-            _startPosX -= 10;
         }
     }
 }
diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs
index fa2bc32..a2a35a5 100644
--- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs
+++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs
@@ -94,10 +94,10 @@ public class DrawningWarship
     /// </summary>
     /// <param name="drawningWarshipWidth">Ширина прорисовки военного корабля</param>
     /// <param name="drawningWarshipHeight">Высота прорисовки военного корабля</param>
-    protected DrawningWarship(int drawningAircraftCarrierWidth, int drawningAircraftCarrierHeight) : this()
+    protected DrawningWarship(int drawningWarshipWidth, int drawningWarshipHeight) : this()
     {
-        _drawningWarshipWidth = drawningAircraftCarrierWidth;
-        _drawningWarshipHeight = drawningAircraftCarrierHeight;
+        _drawningWarshipWidth = drawningWarshipWidth;
+        _drawningWarshipHeight = drawningWarshipHeight;
     }
 
     /// <summary>
diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs
index 0f52da8..75d24cc 100644
--- a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs
+++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs
@@ -145,7 +145,7 @@ public partial class FormAircraftCarrier : Form
             _strategy = comboBoxStrategy.SelectedIndex switch
             {
                 0 => new MoveToCenter(),
-                1 => new MoveToCenter(),
+                1 => new MoveToBorder(),
                 _ => null,
             };
             if(_strategy == null)