nikskob/PIbd-14_Skobelev_N.N._Base
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Revert "some fixes"

Browse Source 
This reverts commit 4a4c658554820c82099c5585384ad98bc3b844de.
This commit is contained in:
Nikita 2025-02-22 22:43:37 +04:00
parent 7a4d86902f
commit d9dff2745f
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs
View File

@ -32,11 +32,11 @@ public class DrawningBoat
/// <summary> /// <summary>
/// Ширина прорисовки катамарана /// Ширина прорисовки катамарана
/// </summary> /// </summary>
private readonly int _drawningBoatWidth = 60; private readonly int _drawningCatamaranWidth = 60;
/// <summary> /// <summary>
/// Высота прорисовки катамарана /// Высота прорисовки катамарана
/// </summary> /// </summary>
private readonly int _drawningBoatHeight = 22; private readonly int _drawningCatamaranHeight = 25;
/// <summary> /// <summary>
/// координата х обьекта /// координата х обьекта
/// </summary> /// </summary>
@ -48,11 +48,11 @@ public class DrawningBoat
/// <summary> /// <summary>
/// ширина обьекта /// ширина обьекта
/// </summary> /// </summary>
public int GetWidth => _drawningBoatWidth; public int GetWidth => _drawningCatamaranWidth;
/// <summary> /// <summary>
/// высота обьекта /// высота обьекта
/// </summary> /// </summary>
public int GetHeight => _drawningBoatHeight; public int GetHeight => _drawningCatamaranHeight;
/// <summary> /// <summary>
/// пустой конструктор /// пустой конструктор
@ -78,12 +78,12 @@ public class DrawningBoat
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
/// <param name="drawningBoatWidth">Ширина катера</param> /// <param name="drawningCatamaranWidth">Ширина катера</param>
/// <param name="drawningBoatHeight">высота катера</param> /// <param name="drawningCatamaranHeight">высота катера</param>
public DrawningBoat(int drawningBoatWidth, int drawningBoatHeight) : this() public DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this()
{ {
_drawningBoatWidth = drawningBoatWidth; _drawningCatamaranWidth = drawningCatamaranWidth;
_drawningBoatHeight = drawningBoatHeight; _drawningCatamaranHeight = drawningCatamaranHeight;
} }
/// <summary> /// <summary>
@ -94,7 +94,7 @@ public class DrawningBoat
/// <returns></returns> /// <returns></returns>
public bool SetPictureSize(int width, int height) public bool SetPictureSize(int width, int height)
{ {
if (_drawningBoatHeight < height && _drawningBoatWidth < width) if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width)
{ {
_pictureHeight = height; _pictureHeight = height;
_pictureWidth = width; _pictureWidth = width;
@ -113,12 +113,12 @@ public class DrawningBoat
{ {
return; return;
} }
if (x > _pictureWidth - _drawningBoatWidth || x < 0) if (x > _pictureWidth - _drawningCatamaranWidth || x < 0)
_startPosX = x < 0 ? 0 : _pictureWidth - _drawningBoatWidth; _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth;
else else
_startPosX = x; _startPosX = x;
if (y > _pictureHeight - _drawningBoatHeight || y < 0) if (y > _pictureHeight - _drawningCatamaranHeight || y < 0)
_startPosY = y < 0 ? 0 : _pictureHeight - _drawningBoatHeight; _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight;
else else
_startPosY = y; _startPosY = y;
} }
@ -148,13 +148,13 @@ public class DrawningBoat
} }
return true; return true;
case DirectionType.Right: case DirectionType.Right:
if (_startPosX.Value + (int)EntityBoat.Step + _drawningBoatWidth <= _pictureWidth) if (_startPosX.Value + (int)EntityBoat.Step + _drawningCatamaranWidth <= _pictureWidth)
{ {
_startPosX += (int)EntityBoat.Step; _startPosX += (int)EntityBoat.Step;
} }
return true; return true;
case DirectionType.Down: case DirectionType.Down:
if (_startPosY.Value + (int)EntityBoat.Step + _drawningBoatHeight <= _pictureHeight) if (_startPosY.Value + (int)EntityBoat.Step + _drawningCatamaranHeight <= _pictureHeight)
{ {
_startPosY += (int)EntityBoat.Step; _startPosY += (int)EntityBoat.Step;
} }

4
ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs
View File

@ -15,9 +15,9 @@ public class MoveToBorder : AbstractStrategy
ObjectParameters? objParams = GetObjectParameters; ObjectParameters? objParams = GetObjectParameters;
if (objParams == null) if (objParams == null)
return; return;
if (objParams.RightBorder + GetStep() <= FieldWidth) if (objParams.RightBorder + GetStep() < FieldWidth)
MoveRight(); MoveRight();
if (objParams.DownBorder + GetStep() <= FieldHeight) if (objParams.DownBorder + GetStep() < FieldHeight)
MoveDown(); MoveDown();
} }