mara/servicepoint-tanks
Archived
Watch
0
0
Fork
You've already forked servicepoint-tanks
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

position is now center, socket improvements

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-04-13 14:07:14 +02:00
commit d4d0abd013
1 changed files with 129 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TanksServer/GameLogic/MoveTanks.cs
View file

@ -47,9 +47,7 @@ internal sealed class MoveTanks(
private bool TryMoveTankTo(Tank tank, FloatPosition newPosition)
{
var (topLeft, bottomRight) = TankManager.GetTankBounds(newPosition.ToPixelPosition());
if (HitsWall(topLeft, bottomRight))
if (HitsWall(newPosition))
return false;
if (HitsTank(tank, newPosition))
return false;
@ -63,15 +61,16 @@ internal sealed class MoveTanks(
.Where(otherTank => otherTank != tank)
.Any(otherTank => newPosition.Distance(otherTank.Position) < MapService.TileSize);
private bool HitsWall(PixelPosition topLeft, PixelPosition bottomRight)
private bool HitsWall(FloatPosition newPosition)
{
var (topLeft, bottomRight) = Tank.GetBoundsForCenter(newPosition);
TilePosition[] positions =
[
topLeft.ToTilePosition(),
new PixelPosition(bottomRight.X, topLeft.Y).ToTilePosition(),
new PixelPosition(topLeft.X, bottomRight.Y).ToTilePosition(),
bottomRight.ToTilePosition(),
bottomRight.ToTilePosition()
];
return positions.Any(map.IsCurrentlyWall);
}
}
}