Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Maint ambience tweaks (#16917)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-29 14:19:00 +10:00
committed by GitHub
parent d5a24758b2
commit 42b4109bbb
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Shared/Random/RulesSystem.cs
View File

@@ -94,7 +94,9 @@ public sealed class RulesSystem : EntitySystem
}
case NearbyComponentsRule nearbyComps:
{
if (!TryComp<TransformComponent>(uid, out var xform) ||
var xformQuery = GetEntityQuery<TransformComponent>();
if (!xformQuery.TryGetComponent(uid, out var xform) ||
xform.MapUid == null)
{
return false;
@@ -104,19 +106,25 @@ public sealed class RulesSystem : EntitySystem
var worldPos = _transform.GetWorldPosition(xform);
var count = 0;
foreach (var comp in nearbyComps.Components.Values)
foreach (var compType in nearbyComps.Components.Values)
{
// TODO: Update this when we get the callback version
foreach (var _ in _lookup.GetComponentsInRange(comp.Component.GetType(), xform.MapID,
foreach (var comp in _lookup.GetComponentsInRange(compType.Component.GetType(), xform.MapID,
worldPos, nearbyComps.Range))
{
if (nearbyComps.Anchored &&
(!xformQuery.TryGetComponent(comp.Owner, out var compXform) || !compXform.Anchored))
{
continue;
}
count++;
if (count >= nearbyComps.Count)
{
found = true;
break;
}
if (count < nearbyComps.Count)
continue;
found = true;
break;
}
if (found)
@@ -178,6 +186,9 @@ public sealed class RulesSystem : EntitySystem
if (!tiles.Tiles.Contains(_tileDef[tile.Tile.TypeId].ID))
continue;
if (tiles.Anchored && grid.GetAnchoredEntitiesEnumerator(tile.GridIndices).MoveNext(out _))
continue;
matchingTileCount++;
}