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

Change component tests to not use stationstation (#1963)

Browse Source
This commit is contained in:
DrSmugleaf
2020-08-30 12:00:47 +02:00
committed by GitHub
parent 9d6c394f6b
commit b83c8126d7
2 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -121,18 +121,32 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>(); var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>(); var entityManager = server.ResolveDependency<IEntityManager>();
var mapLoader = server.ResolveDependency<IMapLoader>();
var pauseManager = server.ResolveDependency<IPauseManager>(); var pauseManager = server.ResolveDependency<IPauseManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>(); var componentFactory = server.ResolveDependency<IComponentFactory>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
IMapGrid grid = default; IMapGrid grid = default;
server.Post(() => server.Post(() =>
{ {
// Load test map // Create a one tile grid to stave off the grid 0 monsters
var mapId = mapManager.CreateMap(); var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId); pauseManager.AddUninitializedMap(mapId);
grid = mapLoader.LoadBlueprint(mapId, "Maps/stationstation.yml");
var gridId = new GridId(1);
if (!mapManager.TryGetGrid(gridId, out grid))
{
grid = mapManager.CreateGrid(mapId, gridId);
}
var tileDefinition = tileDefinitionManager["underplating"];
var tile = new Tile(tileDefinition.TileId);
var coordinates = new GridCoordinates(0, 0, gridId);
grid.SetTile(coordinates, tile);
pauseManager.DoMapInitialize(mapId); pauseManager.DoMapInitialize(mapId);
}); });
@@ -202,18 +216,32 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>(); var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>(); var entityManager = server.ResolveDependency<IEntityManager>();
var mapLoader = server.ResolveDependency<IMapLoader>();
var pauseManager = server.ResolveDependency<IPauseManager>(); var pauseManager = server.ResolveDependency<IPauseManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>(); var componentFactory = server.ResolveDependency<IComponentFactory>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
IMapGrid grid = default; IMapGrid grid = default;
server.Post(() => server.Post(() =>
{ {
// Load test map // Create a one tile grid to stave off the grid 0 monsters
var mapId = mapManager.CreateMap(); var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId); pauseManager.AddUninitializedMap(mapId);
grid = mapLoader.LoadBlueprint(mapId, "Maps/stationstation.yml");
var gridId = new GridId(1);
if (!mapManager.TryGetGrid(gridId, out grid))
{
grid = mapManager.CreateGrid(mapId, gridId);
}
var tileDefinition = tileDefinitionManager["underplating"];
var tile = new Tile(tileDefinition.TileId);
var coordinates = new GridCoordinates(0, 0, gridId);
grid.SetTile(coordinates, tile);
pauseManager.DoMapInitialize(mapId); pauseManager.DoMapInitialize(mapId);
}); });

13
Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs
View File

@@ -27,15 +27,16 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
[ViewVariables] [ViewVariables]
private readonly List<PipeNode> _pipes = new List<PipeNode>(); private readonly List<PipeNode> _pipes = new List<PipeNode>();
[ViewVariables] [ViewVariables] private AtmosphereSystem _atmosphereSystem;
private IGridAtmosphereComponent _gridAtmos;
[ViewVariables] private IGridAtmosphereComponent GridAtmos => _atmosphereSystem.GetGridAtmosphere(GridId);
public override void Initialize(Node sourceNode) public override void Initialize(Node sourceNode)
{ {
base.Initialize(sourceNode); base.Initialize(sourceNode);
_gridAtmos = EntitySystem.Get<AtmosphereSystem>()
.GetGridAtmosphere(GridId); _atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
_gridAtmos?.AddPipeNet(this); GridAtmos?.AddPipeNet(this);
} }
public void Update() public void Update()
@@ -88,7 +89,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
private void RemoveFromGridAtmos() private void RemoveFromGridAtmos()
{ {
_gridAtmos.RemovePipeNet(this); GridAtmos?.RemovePipeNet(this);
} }
private class NullPipeNet : IPipeNet private class NullPipeNet : IPipeNet