removed TryGetSound + made some SoundSpecifier datafields required
This commit is contained in:
@@ -15,7 +15,7 @@ namespace Content.Client.Trigger
|
||||
{
|
||||
private const string AnimationKey = "priming_animation";
|
||||
|
||||
[DataField("countdown_sound", required: true)]
|
||||
[DataField("countdown_sound")]
|
||||
private SoundSpecifier _countdownSound = default!;
|
||||
|
||||
private Animation PrimingAnimation = default!;
|
||||
@@ -29,12 +29,9 @@ namespace Content.Client.Trigger
|
||||
flick.LayerKey = TriggerVisualLayers.Base;
|
||||
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("primed", 0f));
|
||||
|
||||
if (_countdownSound.TryGetSound(out var countdownSound))
|
||||
{
|
||||
var sound = new AnimationTrackPlaySound();
|
||||
PrimingAnimation.AnimationTracks.Add(sound);
|
||||
sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(countdownSound, 0));
|
||||
}
|
||||
var sound = new AnimationTrackPlaySound();
|
||||
PrimingAnimation.AnimationTracks.Add(sound);
|
||||
sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound.GetSound(), 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user