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

Moves buckling and vehicles to shared, some cleanup (#15923)

Browse Source
This commit is contained in:
AJCM-git
2023-05-01 03:04:23 -04:00
committed by GitHub
parent 2343dd1d3c
commit 878c7c0b85
33 changed files with 1451 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
View File

@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using Content.Server.Body.Systems;
using Content.Server.Buckle.Systems;
using Content.Shared.Buckle;
using Content.Shared.ActionBlocker;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
@@ -57,7 +57,7 @@ namespace Content.IntegrationTests.Tests.Buckle
var coordinates = testMap.GridCoords;
var entityManager = server.ResolveDependency<IEntityManager>();
var actionBlocker = entityManager.EntitySysManager.GetEntitySystem<ActionBlockerSystem>();
var buckleSystem = entityManager.EntitySysManager.GetEntitySystem<BuckleSystem>();
var buckleSystem = entityManager.EntitySysManager.GetEntitySystem<SharedBuckleSystem>();
var standingState = entityManager.EntitySysManager.GetEntitySystem<StandingStateSystem>();
EntityUid human = default;
@@ -108,7 +108,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.False(buckleSystem.TryBuckle(human, human, chair, buckle));
// Trying to unbuckle too quickly fails
Assert.False(buckleSystem.TryUnbuckle(human, human, buckle: buckle));
Assert.False(buckleSystem.TryUnbuckle(human, human, buckleComp: buckle));
Assert.True(buckle.Buckled);
Assert.False(buckleSystem.ToggleBuckle(human, human, chair, buckle: buckle));
Assert.True(buckle.Buckled);
@@ -123,7 +123,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.True(buckle.Buckled);
// Unbuckle
Assert.True(buckleSystem.TryUnbuckle(human, human, buckle: buckle));
Assert.True(buckleSystem.TryUnbuckle(human, human, buckleComp: buckle));
Assert.Null(buckle.BuckledTo);
Assert.False(buckle.Buckled);
Assert.True(actionBlocker.CanMove(human));
@@ -135,11 +135,11 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.Zero(strap.OccupiedSize);
// Re-buckling has no cooldown
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
Assert.True(buckle.Buckled);
// On cooldown
Assert.False(buckleSystem.TryUnbuckle(human, human, buckle: buckle));
Assert.False(buckleSystem.TryUnbuckle(human, human, buckleComp: buckle));
Assert.True(buckle.Buckled);
Assert.False(buckleSystem.ToggleBuckle(human, human, chair, buckle: buckle));
Assert.True(buckle.Buckled);
@@ -156,15 +156,15 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.True(buckle.Buckled);
// Unbuckle
Assert.True(buckleSystem.TryUnbuckle(human, human, buckle: buckle));
Assert.True(buckleSystem.TryUnbuckle(human, human, buckleComp: buckle));
Assert.False(buckle.Buckled);
// Move away from the chair
entityManager.GetComponent<TransformComponent>(human).WorldPosition += (1000, 1000);
// Out of range
Assert.False(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.False(buckleSystem.TryUnbuckle(human, human, buckle: buckle));
Assert.False(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
Assert.False(buckleSystem.TryUnbuckle(human, human, buckleComp: buckle));
Assert.False(buckleSystem.ToggleBuckle(human, human, chair, buckle: buckle));
// Move near the chair
@@ -172,22 +172,22 @@ namespace Content.IntegrationTests.Tests.Buckle
entityManager.GetComponent<TransformComponent>(chair).WorldPosition + (0.5f, 0);
// In range
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
Assert.True(buckle.Buckled);
Assert.False(buckleSystem.TryUnbuckle(human, human, buckle: buckle));
Assert.False(buckleSystem.TryUnbuckle(human, human, buckleComp: buckle));
Assert.True(buckle.Buckled);
Assert.False(buckleSystem.ToggleBuckle(human, human, chair, buckle: buckle));
Assert.True(buckle.Buckled);
// Force unbuckle
Assert.True(buckleSystem.TryUnbuckle(human, human, true, buckle: buckle));
Assert.True(buckleSystem.TryUnbuckle(human, human, true, buckleComp: buckle));
Assert.False(buckle.Buckled);
Assert.True(actionBlocker.CanMove(human));
Assert.True(actionBlocker.CanChangeDirection(human));
Assert.True(standingState.Down(human));
// Re-buckle
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
// Move away from the chair
entityManager.GetComponent<TransformComponent>(human).WorldPosition += (1, 0);
@@ -225,7 +225,7 @@ namespace Content.IntegrationTests.Tests.Buckle
var entityManager = server.ResolveDependency<IEntityManager>();
var handsSys = entityManager.EntitySysManager.GetEntitySystem<SharedHandsSystem>();
var buckleSystem = entityManager.EntitySysManager.GetEntitySystem<BuckleSystem>();
var buckleSystem = entityManager.EntitySysManager.GetEntitySystem<SharedBuckleSystem>();
await server.WaitAssertion(() =>
{
@@ -239,7 +239,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.True(entityManager.TryGetComponent(human, out body));
// Buckle
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
Assert.NotNull(buckle.BuckledTo);
Assert.True(buckle.Buckled);
@@ -288,7 +288,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.Null(hand.HeldEntity);
}
buckleSystem.TryUnbuckle(human, human, true, buckle: buckle);
buckleSystem.TryUnbuckle(human, human, true, buckleComp: buckle);
});
await pairTracker.CleanReturnAsync();
@@ -304,7 +304,7 @@ namespace Content.IntegrationTests.Tests.Buckle
var testMap = await PoolManager.CreateTestMap(pairTracker);
var coordinates = testMap.GridCoords;
var entityManager = server.ResolveDependency<IEntityManager>();
var buckleSystem = entityManager.System<BuckleSystem>();
var buckleSystem = entityManager.System<SharedBuckleSystem>();
EntityUid human = default;
EntityUid chair = default;
@@ -320,7 +320,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.True(entityManager.HasComponent<StrapComponent>(chair));
// Buckle
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
Assert.NotNull(buckle.BuckledTo);
Assert.True(buckle.Buckled);
@@ -338,7 +338,7 @@ namespace Content.IntegrationTests.Tests.Buckle
entityManager.GetComponent<TransformComponent>(human).WorldPosition -= (100, 0);
// Buckle
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckle: buckle));
Assert.True(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
Assert.NotNull(buckle.BuckledTo);
Assert.True(buckle.Buckled);
});