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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.IntegrationTests/Tests/Body/LungTest.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using Content.Server.Atmos.Components;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Body
MetabolizerSystem metaSys = default;
MapId mapId;
GridId? grid = null;
EntityUid? grid = null;
SharedBodyComponent body = default;
EntityUid human = default;
GridAtmosphereComponent relevantAtmos = default;
@@ -91,12 +91,11 @@ namespace Content.IntegrationTests.Tests.Body
await server.WaitAssertion(() =>
{
var coords = new Vector2(0.5f, -1f);
var geid = mapManager.GetGridEuid(grid.Value);
var coordinates = new EntityCoordinates(geid, coords);
var coordinates = new EntityCoordinates(grid.Value, coords);
human = entityManager.SpawnEntity("HumanBodyDummy", coordinates);
respSys = EntitySystem.Get<RespiratorSystem>();
metaSys = EntitySystem.Get<MetabolizerSystem>();
relevantAtmos = entityManager.GetComponent<GridAtmosphereComponent>(geid);
relevantAtmos = entityManager.GetComponent<GridAtmosphereComponent>(grid.Value);
startingMoles = GetMapMoles();
Assert.True(entityManager.TryGetComponent(human, out body));
@@ -138,7 +137,7 @@ namespace Content.IntegrationTests.Tests.Body
var entityManager = server.ResolveDependency<IEntityManager>();
MapId mapId;
GridId? grid = null;
EntityUid? grid = null;
RespiratorComponent respirator = null;
EntityUid human = default;
@@ -155,8 +154,7 @@ namespace Content.IntegrationTests.Tests.Body
await server.WaitAssertion(() =>
{
var center = new Vector2(0.5f, -1.5f);
var geid = mapManager.GetGridEuid(grid.Value);
var coordinates = new EntityCoordinates(geid, center);
var coordinates = new EntityCoordinates(grid.Value, center);
human = entityManager.SpawnEntity("HumanBodyDummy", coordinates);
Assert.True(entityManager.HasComponent<SharedBodyComponent>(human));

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

@@ -45,12 +45,7 @@ namespace Content.IntegrationTests.Tests
mapManager.AddUninitializedMap(mapId);
var gridId = new GridId(1);
if (!mapManager.TryGetGrid(gridId, out grid))
{
grid = mapManager.CreateGrid(mapId, gridId);
}
grid = mapManager.CreateGrid(mapId);
var tileDefinition = tileDefinitionManager["underplating"];
var tile = new Tile(tileDefinition.TileId);
@@ -136,12 +131,7 @@ namespace Content.IntegrationTests.Tests
mapManager.AddUninitializedMap(mapId);
var gridId = new GridId(1);
if (!mapManager.TryGetGrid(gridId, out grid))
{
grid = mapManager.CreateGrid(mapId, gridId);
}
grid = mapManager.CreateGrid(mapId);
var tileDefinition = tileDefinitionManager["underplating"];
var tile = new Tile(tileDefinition.TileId);
@@ -239,12 +229,7 @@ namespace Content.IntegrationTests.Tests
mapManager.AddUninitializedMap(mapId);
var gridId = new GridId(1);
if (!mapManager.TryGetGrid(gridId, out grid))
{
grid = mapManager.CreateGrid(mapId, gridId);
}
grid = mapManager.CreateGrid(mapId);
var tileDefinition = tileDefinitionManager["underplating"];
var tile = new Tile(tileDefinition.TileId);

10
Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Threading.Tasks;
using Content.Server.Fluids.Components;
@@ -55,13 +55,13 @@ public sealed class FluidSpill : ContentIntegrationTest
var spillSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SpillableSystem>();
var gameTiming = server.ResolveDependency<IGameTiming>();
MapId mapId;
GridId gridId = default;
EntityUid gridId = default;
await server.WaitPost(() =>
{
mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
gridId = grid.Index;
gridId = grid.GridEntityId;
for (var x = 0; x < 3; x++)
{
@@ -118,7 +118,7 @@ public sealed class FluidSpill : ContentIntegrationTest
var spillSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SpillableSystem>();
var gameTiming = server.ResolveDependency<IGameTiming>();
MapId mapId;
GridId gridId = default;
EntityUid gridId = default;
await server.WaitPost(() =>
{
@@ -133,7 +133,7 @@ public sealed class FluidSpill : ContentIntegrationTest
}
}
gridId = grid.Index;
gridId = grid.GridEntityId;
});
await server.WaitAssertion(() =>

8
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -92,8 +92,7 @@ namespace Content.IntegrationTests.Tests.Fluids
MapId sMapId = default;
IMapGrid sGrid;
GridId sGridId = default;
EntityUid sGridEntity = default;
EntityUid sGridId = default;
EntityCoordinates sCoordinates = default;
// Spawn a paused map with one tile to spawn puddles on
@@ -102,9 +101,8 @@ namespace Content.IntegrationTests.Tests.Fluids
sMapId = sMapManager.CreateMap();
sMapManager.SetMapPaused(sMapId, true);
sGrid = sMapManager.CreateGrid(sMapId);
sGridId = sGrid.Index;
sGridEntity = sGrid.GridEntityId;
entityManager.GetComponent<MetaDataComponent>(sGridEntity).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444
sGridId = sGrid.GridEntityId;
entityManager.GetComponent<MetaDataComponent>(sGridId).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444
var tileDefinition = sTileDefinitionManager["underplating"];
var tile = new Tile(tileDefinition.TileId);

5
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -25,8 +25,9 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>();
server.Post(() =>
{
// TODO: Un-hardcode the grid Id for this test.
mapLoader.SaveBlueprint(new GridId(1), "save load save 1.yml");
// TODO: Properly find the "main" station grid.
var grid0 = mapManager.GetAllGrids().First();
mapLoader.SaveBlueprint(grid0.GridEntityId, "save load save 1.yml");
var mapId = mapManager.CreateMap();
var grid = mapLoader.LoadBlueprint(mapId, "save load save 1.yml").gridId;
mapLoader.SaveBlueprint(grid!.Value, "save load save 2.yml");