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

Little NodeContainer ECS (#17702)

Browse Source
This commit is contained in:
faint
2023-06-28 14:28:38 +03:00
committed by GitHub
parent c25f3f08ed
commit 2f85b5ea3c
27 changed files with 143 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Spreader/SpreaderNode.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.NodeContainer;
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.Nodes;
using Robust.Shared.Map.Components;
@@ -10,6 +11,8 @@ namespace Content.Server.Spreader;
/// </summary>
public sealed class SpreaderNode : Node
{
// [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
/// <inheritdoc/>
public override IEnumerable<Node> GetReachableNodes(TransformComponent xform, EntityQuery<NodeContainerComponent> nodeQuery, EntityQuery<TransformComponent> xformQuery,
MapGridComponent? grid, IEntityManager entMan)
@@ -19,10 +22,12 @@ public sealed class SpreaderNode : Node
entMan.System<SpreaderSystem>().GetNeighbors(xform.Owner, Name, out _, out _, out var neighbors);
var _nodeContainer = entMan.System<NodeContainerSystem>();
foreach (var neighbor in neighbors)
{
if (!nodeQuery.TryGetComponent(neighbor, out var nodeContainer) ||
!nodeContainer.TryGetNode<SpreaderNode>(Name, out var neighborNode))
!_nodeContainer.TryGetNode<SpreaderNode>(nodeContainer, Name, out var neighborNode))
{
continue;
}

6
Content.Server/Spreader/SpreaderSystem.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.NodeContainer;
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.NodeGroups;
using Content.Server.Shuttles.Components;
using Content.Shared.Atmos;
@@ -24,6 +25,7 @@ public sealed class SpreaderSystem : EntitySystem
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
private static readonly TimeSpan SpreadCooldown = TimeSpan.FromSeconds(1);
@@ -138,13 +140,13 @@ public sealed class SpreaderSystem : EntitySystem
foreach (var sGroup in _spreaderGroups)
{
// Cleanup
if (!nodeQuery.TryGetComponent(uid, out var nodeComponent))
if (!nodeQuery.TryGetComponent(uid, out var nodeContainer))
{
RemCompDeferred<EdgeSpreaderComponent>(uid);
continue;
}
if (!nodeComponent.TryGetNode<SpreaderNode>(sGroup, out var node))
if (!_nodeContainer.TryGetNode<SpreaderNode>(nodeContainer, sGroup, out var node))
continue;
// Not allowed this tick?