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

Inserted SoundSpecifier where appropiate

Browse Source
This commit is contained in:
Galactic Chimp
2021-07-31 15:17:16 +02:00
parent 41c30aa28b
commit b2e40d540f
90 changed files with 663 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Trigger/TimerTriggerVisualizer.cs
View File

@@ -1,4 +1,5 @@
using System;
using System;
using Content.Shared.Sound;
using Content.Shared.Trigger;
using JetBrains.Annotations;
using Robust.Client.Animations;
@@ -15,7 +16,7 @@ namespace Content.Client.Trigger
private const string AnimationKey = "priming_animation";
[DataField("countdown_sound", required: true)]
private string? _countdownSound;
private SoundSpecifier _countdownSound = default!;
private Animation PrimingAnimation = default!;
@@ -28,11 +29,11 @@ namespace Content.Client.Trigger
flick.LayerKey = TriggerVisualLayers.Base;
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("primed", 0f));
if (_countdownSound != null)
if (_countdownSound.TryGetSound(out var countdownSound))
{
var sound = new AnimationTrackPlaySound();
PrimingAnimation.AnimationTracks.Add(sound);
sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound, 0));
sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(countdownSound, 0));
}
}
}