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

More rules tweaks (#16918)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-29 15:11:52 +10:00
committed by GitHub
parent 71d482d8ad
commit 3ffd4d6b2e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ using Content.Shared.Access.Components;
using Content.Shared.Access.Systems;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics.Components;
namespace Content.Shared.Random;
@@ -72,8 +73,10 @@ public sealed class RulesSystem : EntitySystem
foreach (var comp in _lookup.GetComponentsInRange<AccessReaderComponent>(xform.MapID,
worldPos, access.Range))
{
if (access.Anchored && !xformQuery.GetComponent(comp.Owner).Anchored ||
!_reader.AreAccessTagsAllowed(access.Access, comp))
if (!_reader.AreAccessTagsAllowed(access.Access, comp) ||
access.Anchored &&
(!xformQuery.TryGetComponent(comp.Owner, out var compXform) ||
!compXform.Anchored))
{
continue;
}
@@ -113,7 +116,8 @@ public sealed class RulesSystem : EntitySystem
worldPos, nearbyComps.Range))
{
if (nearbyComps.Anchored &&
(!xformQuery.TryGetComponent(comp.Owner, out var compXform) || !compXform.Anchored))
(!xformQuery.TryGetComponent(comp.Owner, out var compXform) ||
!compXform.Anchored))
{
continue;
}
@@ -186,7 +190,7 @@ public sealed class RulesSystem : EntitySystem
if (!tiles.Tiles.Contains(_tileDef[tile.Tile.TypeId].ID))
continue;
if (tiles.Anchored && grid.GetAnchoredEntitiesEnumerator(tile.GridIndices).MoveNext(out _))
if (tiles.IgnoreAnchored && grid.GetAnchoredEntitiesEnumerator(tile.GridIndices).MoveNext(out _))
continue;
matchingTileCount++;