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

Fix effects of hosted anomaly when transform is parented (#37179)

Browse Source 
* hosted anomaly effects now are at the correct location when the host is in a container or buckled

* oops, not keeping the uid and transform together

* use world positions to get the position of the anomaly -- my previous method was reinventing the wheel.
This commit is contained in:
Quantum-cross
2025-05-06 13:01:37 -04:00
committed by GitHub
parent 4ce09bd2da
commit 3f3be47ae4
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Shared/Anomaly/SharedAnomalySystem.cs
View File

@@ -371,13 +371,19 @@ public abstract class SharedAnomalySystem : EntitySystem
if (!TryComp<MapGridComponent>(xform.GridUid, out var grid)) if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
return null; return null;
// How many spawn points we will be aiming to return
var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability * powerModifier) + 0.5f); var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability * powerModifier) + 0.5f);
var localpos = xform.Coordinates.Position; // When the entity is in a container or buckled (such as a hosted anomaly), local coordinates will not be comparable
var tilerefs = _map.GetLocalTilesIntersecting( // to tile coordinates.
// Get the world coordinates for the anomalous entity
var worldPos = _transform.GetWorldPosition(uid);
// Get a list of the tiles within the maximum range of the effect
var tilerefs = _map.GetTilesIntersecting(
xform.GridUid.Value, xform.GridUid.Value,
grid, grid,
new Box2(localpos + new Vector2(-settings.MaxRange, -settings.MaxRange), localpos + new Vector2(settings.MaxRange, settings.MaxRange))) new Box2(worldPos + new Vector2(-settings.MaxRange), worldPos + new Vector2(settings.MaxRange)))
.ToList(); .ToList();
if (tilerefs.Count == 0) if (tilerefs.Count == 0)
@@ -391,7 +397,10 @@ public abstract class SharedAnomalySystem : EntitySystem
break; break;
var tileref = Random.Pick(tilerefs); var tileref = Random.Pick(tilerefs);
var distance = MathF.Sqrt(MathF.Pow(tileref.X - xform.LocalPosition.X, 2) + MathF.Pow(tileref.Y - xform.LocalPosition.Y, 2));
// Get the world position of the tile to calculate the distance to the anomalous object
var tileWorldPos = _map.GridTileToWorldPos(xform.GridUid.Value, grid, tileref.GridIndices);
var distance = Vector2.Distance(tileWorldPos, worldPos);
//cut outer & inner circle //cut outer & inner circle
if (distance > settings.MaxRange || distance < settings.MinRange) if (distance > settings.MaxRange || distance < settings.MinRange)