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

Content changes for mapgrid kill (#12567)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-22 13:12:04 +11:00
committed by GitHub
parent 9170e7ac9d
commit 6c76061887
75 changed files with 192 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/NodeContainer/Nodes/AdjacentNode.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
namespace Content.Server.NodeContainer.Nodes
{
@@ -11,7 +12,7 @@ namespace Content.Server.NodeContainer.Nodes
public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
EntityQuery<NodeContainerComponent> nodeQuery,
EntityQuery<TransformComponent> xformQuery,
IMapGrid? grid,
MapGridComponent? grid,
IEntityManager entMan)
{
if (!xform.Anchored || grid == null)

3
Content.Server/NodeContainer/Nodes/Node.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.NodeGroups;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
namespace Content.Server.NodeContainer.Nodes
{
@@ -97,7 +98,7 @@ namespace Content.Server.NodeContainer.Nodes
public abstract IEnumerable<Node> GetReachableNodes(TransformComponent xform,
EntityQuery<NodeContainerComponent> nodeQuery,
EntityQuery<TransformComponent> xformQuery,
IMapGrid? grid,
MapGridComponent? grid,
IEntityManager entMan);
}
}

7
Content.Server/NodeContainer/Nodes/NodeHelpers.cs
View File

@@ -1,5 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
namespace Content.Server.NodeContainer.Nodes
{
@@ -8,7 +9,7 @@ namespace Content.Server.NodeContainer.Nodes
/// </summary>
public static class NodeHelpers
{
public static IEnumerable<Node> GetNodesInTile(EntityQuery<NodeContainerComponent> nodeQuery, IMapGrid grid, Vector2i coords)
public static IEnumerable<Node> GetNodesInTile(EntityQuery<NodeContainerComponent> nodeQuery, MapGridComponent grid, Vector2i coords)
{
foreach (var entityUid in grid.GetAnchoredEntities(coords))
{
@@ -24,7 +25,7 @@ namespace Content.Server.NodeContainer.Nodes
public static IEnumerable<(Direction dir, Node node)> GetCardinalNeighborNodes(
EntityQuery<NodeContainerComponent> nodeQuery,
IMapGrid grid,
MapGridComponent grid,
Vector2i coords,
bool includeSameTile = true)
{
@@ -42,7 +43,7 @@ namespace Content.Server.NodeContainer.Nodes
[SuppressMessage("ReSharper", "EnforceForeachStatementBraces")]
public static IEnumerable<(Direction dir, EntityUid entity)> GetCardinalNeighborCells(
IMapGrid grid,
MapGridComponent grid,
Vector2i coords,
bool includeSameTile = true)
{

7
Content.Server/NodeContainer/Nodes/PipeNode.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.NodeGroups;
using Content.Shared.Atmos;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Utility;
namespace Content.Server.NodeContainer.Nodes
@@ -152,7 +153,7 @@ namespace Content.Server.NodeContainer.Nodes
public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
EntityQuery<NodeContainerComponent> nodeQuery,
EntityQuery<TransformComponent> xformQuery,
IMapGrid? grid,
MapGridComponent? grid,
IEntityManager entMan)
{
if (_alwaysReachable != null)
@@ -195,7 +196,7 @@ namespace Content.Server.NodeContainer.Nodes
/// <summary>
/// Gets the pipes that can connect to us from entities on the tile or adjacent in a direction.
/// </summary>
private IEnumerable<PipeNode> LinkableNodesInDirection(Vector2i pos, PipeDirection pipeDir, IMapGrid grid,
private IEnumerable<PipeNode> LinkableNodesInDirection(Vector2i pos, PipeDirection pipeDir, MapGridComponent grid,
EntityQuery<NodeContainerComponent> nodeQuery)
{
foreach (var pipe in PipesInDirection(pos, pipeDir, grid, nodeQuery))
@@ -211,7 +212,7 @@ namespace Content.Server.NodeContainer.Nodes
/// <summary>
/// Gets the pipes from entities on the tile adjacent in a direction.
/// </summary>
protected IEnumerable<PipeNode> PipesInDirection(Vector2i pos, PipeDirection pipeDir, IMapGrid grid,
protected IEnumerable<PipeNode> PipesInDirection(Vector2i pos, PipeDirection pipeDir, MapGridComponent grid,
EntityQuery<NodeContainerComponent> nodeQuery)
{
var offsetPos = pos.Offset(pipeDir.ToDirection());

3
Content.Server/NodeContainer/Nodes/PortPipeNode.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
namespace Content.Server.NodeContainer.Nodes
{
@@ -8,7 +9,7 @@ namespace Content.Server.NodeContainer.Nodes
public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
EntityQuery<NodeContainerComponent> nodeQuery,
EntityQuery<TransformComponent> xformQuery,
IMapGrid? grid,
MapGridComponent? grid,
IEntityManager entMan)
{
if (!xform.Anchored || grid == null)

3
Content.Server/NodeContainer/Nodes/PortablePipeNode.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
namespace Content.Server.NodeContainer.Nodes
{
@@ -8,7 +9,7 @@ namespace Content.Server.NodeContainer.Nodes
public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
EntityQuery<NodeContainerComponent> nodeQuery,
EntityQuery<TransformComponent> xformQuery,
IMapGrid? grid,
MapGridComponent? grid,
IEntityManager entMan)
{
if (!xform.Anchored || grid == null)