Implement ECS alternative for IDragDropOn and fully ECS disposal units (#6380)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Julian Giebel
2022-01-30 17:53:22 +01:00
committed by GitHub
parent 1bece1c1ba
commit 305cff2659
10 changed files with 147 additions and 128 deletions

View File

@@ -53,7 +53,7 @@ namespace Content.IntegrationTests.Tests.Disposal
{
foreach (var entity in entities)
{
Assert.That(unit.ContainedEntities.Contains(entity), Is.EqualTo(result));
Assert.That(unit.Container.ContainedEntities.Contains(entity), Is.EqualTo(result));
}
}
@@ -65,11 +65,11 @@ namespace Content.IntegrationTests.Tests.Disposal
private void Flush(DisposalUnitComponent unit, bool result, params EntityUid[] entities)
{
Assert.That(unit.ContainedEntities, Is.SupersetOf(entities));
Assert.That(entities.Length, Is.EqualTo(unit.ContainedEntities.Count));
Assert.That(unit.Container.ContainedEntities, Is.SupersetOf(entities));
Assert.That(entities.Length, Is.EqualTo(unit.Container.ContainedEntities.Count));
Assert.That(result, Is.EqualTo(EntitySystem.Get<DisposalUnitSystem>().TryFlush(unit)));
Assert.That(result || entities.Length == 0, Is.EqualTo(unit.ContainedEntities.Count == 0));
Assert.That(result || entities.Length == 0, Is.EqualTo(unit.Container.ContainedEntities.Count == 0));
}
private const string Prototypes = @"
@@ -194,7 +194,7 @@ namespace Content.IntegrationTests.Tests.Disposal
// Remove power need
Assert.True(entityManager.TryGetComponent(disposalUnit, out ApcPowerReceiverComponent power));
power!.NeedsPower = false;
Assert.True(unit.Powered);
unit.Powered = true;//Power state changed event doesn't get fired smh
// Flush with a mob and an item
Flush(unit, true, human, wrench);