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

Remove transform methods from mapgrid (#12233)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-01 11:27:18 +11:00
committed by GitHub
parent 297686c4ff
commit c9a2ab1cee
25 changed files with 144 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ namespace Content.IntegrationTests.Tests.Fluids
// Check that the map and grid are paused
await server.WaitAssertion(() =>
{
Assert.True(sMapManager.IsGridPaused(sGridId));
Assert.True(metaSystem.EntityPaused(sGridId));
Assert.True(sMapManager.IsMapPaused(sMapId));
});
@@ -143,7 +143,7 @@ namespace Content.IntegrationTests.Tests.Fluids
evaporation = entityManager.GetComponent<EvaporationComponent>(puddle.Owner);
metaSystem.SetEntityPaused(puddle.Owner, true, meta); // See https://github.com/space-wizards/RobustToolbox/issues/1445
Assert.True(meta.EntityPaused);
Assert.True(metaSystem.EntityPaused(puddle.Owner, meta));
// Check that the puddle is going to evaporate
Assert.Positive(evaporation.EvaporateTime);
@@ -174,7 +174,7 @@ namespace Content.IntegrationTests.Tests.Fluids
await server.WaitAssertion(() =>
{
Assert.False(sMapManager.IsMapPaused(sMapId));
Assert.False(sMapManager.IsGridPaused(sGridId));
Assert.False(metaSystem.EntityPaused(sGridId));
Assert.False(meta.EntityPaused);
// Check that the puddle still exists

18
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
View File

@@ -53,24 +53,32 @@ namespace Content.IntegrationTests.Tests
await server.WaitPost(() =>
{
Assert.Multiple(() => mapLoader.LoadMap(new MapId(10), mapPath));
});
await server.WaitIdleAsync();
await server.WaitAssertion(() =>
{
{
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(10, 10), out var mapGrid))
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(10, 10), out var mapGrid) ||
!sEntities.TryGetComponent<TransformComponent>(mapGrid.GridEntityId, out var gridXform))
{
Assert.Fail();
return;
}
Assert.That(mapGrid.WorldPosition, Is.EqualTo(new Vector2(10, 10)));
Assert.That(gridXform.WorldPosition, Is.EqualTo(new Vector2(10, 10)));
Assert.That(mapGrid.GetTileRef(new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(1, (TileRenderFlag)1, 255)));
}
{
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(-8, -8), out var mapGrid))
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(-8, -8), out var mapGrid) ||
!sEntities.TryGetComponent<TransformComponent>(mapGrid.GridEntityId, out var gridXform))
{
Assert.Fail();
return;
}
Assert.That(mapGrid.WorldPosition, Is.EqualTo(new Vector2(-8, -8)));
Assert.That(gridXform.WorldPosition, Is.EqualTo(new Vector2(-8, -8)));
Assert.That(mapGrid.GetTileRef(new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(2, (TileRenderFlag)1, 254)));
}
});