tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert 39040 FTL Fixes (#41540)

Browse Source 
Revert "FTL Fixes (#39040)"

This reverts commit 52a9f9b576.
This commit is contained in:
slarticodefast
2025-11-23 14:14:12 +01:00
committed by GitHub
parent 8d4888b726
commit 5e294dcecc
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -801,7 +801,11 @@ public sealed partial class ShuttleSystem
while (iteration < FTLProximityIterations) while (iteration < FTLProximityIterations)
{ {
grids.Clear(); grids.Clear();
_mapManager.FindGridsIntersecting(mapId, targetAABB, ref grids); // We pass in an expanded offset here so we can safely do a random offset later.
// We don't include this in the actual targetAABB because then we would be double-expanding it.
// Once in this loop, then again when placing the shuttle later.
// Note that targetAABB already has expansionAmount factored in already.
_mapManager.FindGridsIntersecting(mapId, targetAABB.Enlarged(maxOffset), ref grids);
foreach (var grid in grids) foreach (var grid in grids)
{ {
@@ -834,10 +838,6 @@ public sealed partial class ShuttleSystem
if (nearbyGrids.Contains(uid)) if (nearbyGrids.Contains(uid))
continue; continue;
// We pass in an expanded offset here so we can safely do a random offset later.
// We don't include this in the actual targetAABB because then we would be double-expanding it.
// Once in this loop, then again when placing the shuttle later.
// Note that targetAABB already has expansionAmount factored in already.
targetAABB = targetAABB.Union( targetAABB = targetAABB.Union(
_transform.GetWorldMatrix(uid) _transform.GetWorldMatrix(uid)
.TransformBox(Comp<MapGridComponent>(uid).LocalAABB.Enlarged(expansionAmount))); .TransformBox(Comp<MapGridComponent>(uid).LocalAABB.Enlarged(expansionAmount)));
@@ -857,7 +857,7 @@ public sealed partial class ShuttleSystem
// TODO: This should prefer the position's angle instead. // TODO: This should prefer the position's angle instead.
// TODO: This is pretty crude for multiple landings. // TODO: This is pretty crude for multiple landings.
if (nearbyGrids.Count >= 1) if (nearbyGrids.Count > 1 || !HasComp<MapComponent>(targetXform.GridUid))
{ {
// Pick a random angle // Pick a random angle
var offsetAngle = _random.NextAngle(); var offsetAngle = _random.NextAngle();
@@ -866,9 +866,13 @@ public sealed partial class ShuttleSystem
var minRadius = MathF.Max(targetAABB.Width / 2f, targetAABB.Height / 2f); var minRadius = MathF.Max(targetAABB.Width / 2f, targetAABB.Height / 2f);
spawnPos = targetAABB.Center + offsetAngle.RotateVec(new Vector2(_random.NextFloat(minRadius + minOffset, minRadius + maxOffset), 0f)); spawnPos = targetAABB.Center + offsetAngle.RotateVec(new Vector2(_random.NextFloat(minRadius + minOffset, minRadius + maxOffset), 0f));
} }
else if (shuttleBody != null)
{
(spawnPos, angle) = _transform.GetWorldPositionRotation(targetXform);
}
else else
{ {
spawnPos = _transform.ToWorldPosition(targetCoordinates); spawnPos = _transform.GetWorldPosition(targetXform);
} }
var offset = Vector2.Zero; var offset = Vector2.Zero;
@@ -889,10 +893,10 @@ public sealed partial class ShuttleSystem
} }
// Rotate our localcenter around so we spawn exactly where we "think" we should (center of grid on the dot). // Rotate our localcenter around so we spawn exactly where we "think" we should (center of grid on the dot).
var transform = new Transform(_transform.ToWorldPosition(xform.Coordinates), angle); var transform = new Transform(spawnPos, angle);
var adjustedOffset = Robust.Shared.Physics.Transform.Mul(transform, offset); spawnPos = Robust.Shared.Physics.Transform.Mul(transform, offset);
coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos + adjustedOffset); coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos - offset);
return true; return true;
} }