diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 8bcf450..19fd8ee 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -30,13 +30,13 @@ public class DrawningBoat /// protected int? _startPosY; /// - /// Ширина прорисовки катамарана + /// Ширина прорисовки лодки /// - private readonly int _drawningCatamaranWidth = 60; + private readonly int _drawningBoatWidth = 60; /// - /// Высота прорисовки катамарана + /// Высота прорисовки лодки /// - private readonly int _drawningCatamaranHeight = 25; + private readonly int _drawningBoatHeight = 22; /// /// координата х обьекта /// @@ -48,11 +48,11 @@ public class DrawningBoat /// /// ширина обьекта /// - public int GetWidth => _drawningCatamaranWidth; + public int GetWidth => _drawningBoatWidth; /// /// высота обьекта /// - public int GetHeight => _drawningCatamaranHeight; + public int GetHeight => _drawningBoatHeight; /// /// пустой конструктор @@ -82,8 +82,8 @@ public class DrawningBoat /// высота катера public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() { - _drawningCatamaranWidth = drawningCatamaranWidth; - _drawningCatamaranHeight = drawningCatamaranHeight; + _drawningBoatWidth = drawningCatamaranWidth; + _drawningBoatHeight = drawningCatamaranHeight; } /// @@ -94,7 +94,7 @@ public class DrawningBoat /// public bool SetPictureSize(int width, int height) { - if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width) + if (_drawningBoatHeight < height && _drawningBoatWidth < width) { _pictureHeight = height; _pictureWidth = width; @@ -113,12 +113,12 @@ public class DrawningBoat { return; } - if (x > _pictureWidth - _drawningCatamaranWidth || x < 0) - _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth; + if (x > _pictureWidth - _drawningBoatWidth || x < 0) + _startPosX = x < 0 ? 0 : _pictureWidth - _drawningBoatWidth; else _startPosX = x; - if (y > _pictureHeight - _drawningCatamaranHeight || y < 0) - _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight; + if (y > _pictureHeight - _drawningBoatHeight || y < 0) + _startPosY = y < 0 ? 0 : _pictureHeight - _drawningBoatHeight; else _startPosY = y; } @@ -148,13 +148,13 @@ public class DrawningBoat } return true; case DirectionType.Right: - if (_startPosX.Value + (int)EntityBoat.Step + _drawningCatamaranWidth <= _pictureWidth) + if (_startPosX.Value + (int)EntityBoat.Step + _drawningBoatWidth <= _pictureWidth) { _startPosX += (int)EntityBoat.Step; } return true; case DirectionType.Down: - if (_startPosY.Value + (int)EntityBoat.Step + _drawningCatamaranHeight <= _pictureHeight) + if (_startPosY.Value + (int)EntityBoat.Step + _drawningBoatHeight <= _pictureHeight) { _startPosY += (int)EntityBoat.Step; } diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs index ba16109..188f4f3 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(); }