* fix: cryo pod now uses health-analyzer system to update body state in UI * refactor: use EntityEventRefHandler instead ComponentEventRefHandler in CryoPodComponent subscribe on EntRemovedFromContainerMessage --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
This commit is contained in:
@@ -7,7 +7,7 @@ namespace Content.Server.Medical.Components;
|
||||
/// After scanning, retrieves the target Uid to use with its related UI.
|
||||
/// </summary>
|
||||
[RegisterComponent]
|
||||
[Access(typeof(HealthAnalyzerSystem))]
|
||||
[Access(typeof(HealthAnalyzerSystem), typeof(CryoPodSystem))]
|
||||
public sealed partial class HealthAnalyzerComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -30,6 +30,7 @@ using Content.Shared.Medical.Cryogenics;
|
||||
using Content.Shared.MedicalScanner;
|
||||
using Content.Shared.Verbs;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.Containers;
|
||||
using Robust.Shared.Timing;
|
||||
using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
|
||||
|
||||
@@ -71,6 +72,7 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
|
||||
SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
|
||||
SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
|
||||
SubscribeLocalEvent<CryoPodComponent, AfterActivatableUIOpenEvent>(OnActivateUI);
|
||||
SubscribeLocalEvent<CryoPodComponent, EntRemovedFromContainerMessage>(OnEjected);
|
||||
}
|
||||
|
||||
public override void Update(float frameTime)
|
||||
@@ -187,6 +189,11 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
|
||||
TryComp<TemperatureComponent>(entity.Comp.BodyContainer.ContainedEntity, out var temp);
|
||||
TryComp<BloodstreamComponent>(entity.Comp.BodyContainer.ContainedEntity, out var bloodstream);
|
||||
|
||||
if (TryComp<HealthAnalyzerComponent>(entity, out var healthAnalyzer))
|
||||
{
|
||||
healthAnalyzer.ScannedEntity = entity.Comp.BodyContainer.ContainedEntity;
|
||||
}
|
||||
|
||||
_userInterfaceSystem.TrySendUiMessage(
|
||||
entity.Owner,
|
||||
HealthAnalyzerUiKey.Key,
|
||||
@@ -282,5 +289,16 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
|
||||
args.GasMixtures = gasMixDict;
|
||||
}
|
||||
|
||||
private void OnEjected(Entity<CryoPodComponent> cryoPod, ref EntRemovedFromContainerMessage args)
|
||||
{
|
||||
if (TryComp<HealthAnalyzerComponent>(cryoPod.Owner, out var healthAnalyzer))
|
||||
{
|
||||
healthAnalyzer.ScannedEntity = null;
|
||||
}
|
||||
|
||||
// if body is ejected - no need to display health-analyzer
|
||||
_uiSystem.TryCloseAll(cryoPod.Owner, HealthAnalyzerUiKey.Key);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
@@ -85,6 +85,8 @@
|
||||
whitelist:
|
||||
components:
|
||||
- FitsInDispenser
|
||||
- type: HealthAnalyzer
|
||||
scanDelay: 0
|
||||
- type: UserInterface
|
||||
interfaces:
|
||||
- key: enum.HealthAnalyzerUiKey.Key
|
||||
|
||||
Reference in New Issue
Block a user