From d9dff2745f04b46b1be795219fbdca59c50decb3 Mon Sep 17 00:00:00 2001
From: Nikita <tolikr0635@gmail.com>
Date: Sat, 22 Feb 2025 22:43:37 +0400
Subject: [PATCH] Revert "some fixes"

This reverts commit 4a4c658554820c82099c5585384ad98bc3b844de.
---
 .../Drawnings/DrawningBoat.cs                 | 32 +++++++++----------
 .../MovementStrategy/MoveToBorder.cs          |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs
index 34ae17d..8bcf450 100644
--- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs
+++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs
@@ -32,11 +32,11 @@ public class DrawningBoat
     /// <summary>
     /// Ширина прорисовки катамарана
     /// </summary>
-    private readonly int _drawningBoatWidth = 60;
+    private readonly int _drawningCatamaranWidth = 60;
     /// <summary>
     /// Высота прорисовки катамарана
     /// </summary>
-    private readonly int _drawningBoatHeight = 22;
+    private readonly int _drawningCatamaranHeight = 25;
     /// <summary>
     /// координата х обьекта
     /// </summary>
@@ -48,11 +48,11 @@ public class DrawningBoat
     /// <summary>
     /// ширина обьекта
     /// </summary>
-    public int GetWidth => _drawningBoatWidth;
+    public int GetWidth => _drawningCatamaranWidth;
     /// <summary>
     /// высота обьекта
     /// </summary>
-    public int GetHeight => _drawningBoatHeight;
+    public int GetHeight => _drawningCatamaranHeight;
     
     /// <summary>
     /// пустой конструктор
@@ -78,12 +78,12 @@ public class DrawningBoat
     /// <summary>
     /// Конструктор
     /// </summary>
-    /// <param name="drawningBoatWidth">Ширина катера</param>
-    /// <param name="drawningBoatHeight">высота катера</param>
-   public DrawningBoat(int drawningBoatWidth, int drawningBoatHeight) : this()
+    /// <param name="drawningCatamaranWidth">Ширина катера</param>
+    /// <param name="drawningCatamaranHeight">высота катера</param>
+   public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this()
     {
-        _drawningBoatWidth = drawningBoatWidth;
-        _drawningBoatHeight = drawningBoatHeight;
+        _drawningCatamaranWidth = drawningCatamaranWidth;
+        _drawningCatamaranHeight = drawningCatamaranHeight;
         
     }
     /// <summary>
@@ -94,7 +94,7 @@ public class DrawningBoat
     /// <returns></returns>
     public bool SetPictureSize(int width, int height)
     {
-        if (_drawningBoatHeight < height && _drawningBoatWidth < width)
+        if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width)
         {
             _pictureHeight = height;
             _pictureWidth = width;
@@ -113,12 +113,12 @@ public class DrawningBoat
         {
             return;
         }
-        if (x > _pictureWidth - _drawningBoatWidth || x < 0)
-            _startPosX = x < 0 ? 0 : _pictureWidth - _drawningBoatWidth;
+        if (x > _pictureWidth - _drawningCatamaranWidth || x < 0)
+            _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth;
         else
             _startPosX = x;
-        if (y > _pictureHeight - _drawningBoatHeight || y < 0)
-            _startPosY = y < 0 ? 0 : _pictureHeight - _drawningBoatHeight;
+        if (y > _pictureHeight - _drawningCatamaranHeight || y < 0)
+            _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight;
         else
             _startPosY = y;
     }
@@ -148,13 +148,13 @@ public class DrawningBoat
                 }
                 return true;
             case DirectionType.Right:
-                if (_startPosX.Value + (int)EntityBoat.Step + _drawningBoatWidth <= _pictureWidth)
+                if (_startPosX.Value + (int)EntityBoat.Step + _drawningCatamaranWidth <= _pictureWidth)
                 {
                     _startPosX += (int)EntityBoat.Step;
                 }
                 return true;
             case DirectionType.Down:
-                if (_startPosY.Value + (int)EntityBoat.Step + _drawningBoatHeight <= _pictureHeight)
+                if (_startPosY.Value + (int)EntityBoat.Step + _drawningCatamaranHeight <= _pictureHeight)
                 {
                     _startPosY += (int)EntityBoat.Step;
                 }
diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs
index 188f4f3..ba16109 100644
--- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs
+++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs
@@ -15,9 +15,9 @@ public class MoveToBorder : AbstractStrategy
         ObjectParameters? objParams = GetObjectParameters;
         if (objParams == null)
             return;
-        if (objParams.RightBorder + GetStep() <= FieldWidth)
+        if (objParams.RightBorder + GetStep() < FieldWidth)
             MoveRight();
-        if (objParams.DownBorder + GetStep() <= FieldHeight)
+        if (objParams.DownBorder + GetStep() < FieldHeight)
             MoveDown();
 
     }