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

Add closing storage UIs to StorageInteractionTest (#28633)

Browse Source
This commit is contained in:
Leon Friedrich
2024-06-06 10:14:25 +12:00
committed by GitHub
parent 8e85bec2ce
commit ba57e3e4d9
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
View File

@@ -4,6 +4,7 @@ using Content.IntegrationTests.Tests.Interaction;
using Content.Shared.Input; using Content.Shared.Input;
using Content.Shared.PDA; using Content.Shared.PDA;
using Content.Shared.Storage; using Content.Shared.Storage;
using Content.Shared.Timing;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -27,11 +28,22 @@ public sealed class StorageInteractionTest : InteractionTest
Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.False); Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.False);
Assert.That(IsUiOpen(PdaUiKey.Key), Is.False); Assert.That(IsUiOpen(PdaUiKey.Key), Is.False);
await Server.WaitPost(() => SEntMan.RemoveComponent<UseDelayComponent>(STarget!.Value));
await RunTicks(5);
// Activating the backpack opens the UI // Activating the backpack opens the UI
await Activate(); await Activate();
Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True); Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
Assert.That(IsUiOpen(PdaUiKey.Key), Is.False); Assert.That(IsUiOpen(PdaUiKey.Key), Is.False);
// Activating it again closes the UI
await Activate();
Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.False);
// Open it again
await Activate();
Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
// Pick up a PDA // Pick up a PDA
var pda = await PlaceInHands("PassengerPDA"); var pda = await PlaceInHands("PassengerPDA");
var sPda = ToServer(pda); var sPda = ToServer(pda);

4
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -298,7 +298,7 @@ public abstract class SharedStorageSystem : EntitySystem
return; return;
// prevent spamming bag open / honkerton honk sound // prevent spamming bag open / honkerton honk sound
silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay)); silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay), id: OpenUiUseDelayID);
if (!CanInteract(entity, (uid, storageComp), silent: silent)) if (!CanInteract(entity, (uid, storageComp), silent: silent))
return; return;
@@ -308,7 +308,7 @@ public abstract class SharedStorageSystem : EntitySystem
Audio.PlayPredicted(storageComp.StorageOpenSound, uid, entity); Audio.PlayPredicted(storageComp.StorageOpenSound, uid, entity);
if (useDelay != null) if (useDelay != null)
UseDelay.TryResetDelay((uid, useDelay)); UseDelay.TryResetDelay((uid, useDelay), id: OpenUiUseDelayID);
} }
_ui.OpenUi(uid, StorageComponent.StorageUiKey.Key, entity); _ui.OpenUi(uid, StorageComponent.StorageUiKey.Key, entity);