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

Allow sound to play at the start of anomaly supercritical animation (#36260)

Browse Source 
* Add datafield to AnomalyComponent to play a sound when an anomaly enters supercriticality

* use Entity<T> pattern

* use implicit default for nullable

* don't forget to resolve the AnomalyComponent...

* Add comment for StartSupercriticalEvent "ent" parameter

* use implicit casts from Entity<T> to EntityUid

* StartSupercriticalEvent requires AnomalyComponent to resolve
This commit is contained in:
Quantum-cross
2025-04-08 05:11:32 -04:00
committed by GitHub
parent 5cc8b01e64
commit 716c0ef51f
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Anomaly/AnomalySystem.Commands.cs
View File

@@ -44,10 +44,10 @@ public sealed partial class AnomalySystem
if (!NetEntity.TryParse(args[0], out var uidNet) || !TryGetEntity(uidNet, out var uid))
return;
if (!HasComp<AnomalyComponent>(uid))
if (!TryComp<AnomalyComponent>(uid, out var anomaly))
return;
StartSupercriticalEvent(uid.Value);
StartSupercriticalEvent((uid.Value, anomaly));
}
private CompletionResult GetAnomalyCompletion(IConsoleShell shell, string[] args)

6
Content.Shared/Anomaly/Components/AnomalyComponent.cs
View File

@@ -129,6 +129,12 @@ public sealed partial class AnomalyComponent : Component
/// </summary>
[DataField]
public SoundSpecifier? SupercriticalSound = new SoundCollectionSpecifier("Explosion");
/// <summary>
/// The sound plays at the start of the animation when an anomaly goes supercritical
/// </summary>
[DataField]
public SoundSpecifier? SupercriticalSoundAtAnimationStart;
#endregion
/// <summary>

25
Content.Shared/Anomaly/SharedAnomalySystem.cs
View File

@@ -116,21 +116,26 @@ public abstract class SharedAnomalySystem : EntitySystem
/// <summary>
/// Begins the animation for going supercritical
/// </summary>
/// <param name="uid"></param>
public void StartSupercriticalEvent(EntityUid uid)
/// <param name="ent">Entity to go supercritical</param>
public void StartSupercriticalEvent(Entity<AnomalyComponent?> ent)
{
// don't restart it if it's already begun
if (HasComp<AnomalySupercriticalComponent>(uid))
if (HasComp<AnomalySupercriticalComponent>(ent))
return;
AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
if (_net.IsServer)
Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
if(!Resolve(ent, ref ent.Comp))
return;
var super = AddComp<AnomalySupercriticalComponent>(uid);
AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(ent.Owner)} began to go supercritical.");
if (_net.IsServer)
Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(ent.Owner)}");
Audio.PlayPvs(ent.Comp.SupercriticalSoundAtAnimationStart, Transform(ent).Coordinates);
var super = AddComp<AnomalySupercriticalComponent>(ent);
super.EndTime = Timing.CurTime + super.SupercriticalDuration;
Appearance.SetData(uid, AnomalyVisuals.Supercritical, true);
Dirty(uid, super);
Appearance.SetData(ent, AnomalyVisuals.Supercritical, true);
Dirty(ent, super);
}
/// <summary>
@@ -240,7 +245,7 @@ public abstract class SharedAnomalySystem : EntitySystem
var newVal = component.Severity + change;
if (newVal >= 1)
StartSupercriticalEvent(uid);
StartSupercriticalEvent((uid, component));
component.Severity = Math.Clamp(newVal, 0, 1);
Dirty(uid, component);