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

removed TryGetSound + made some SoundSpecifier datafields required

Browse Source
This commit is contained in:
Galactic Chimp
2021-07-31 19:52:33 +02:00
parent 8ff703c338
commit 57016d14b4
114 changed files with 519 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Light.Visualizers
{
[DataField("minBlinkingTime")] private float _minBlinkingTime = 0.5f;
[DataField("maxBlinkingTime")] private float _maxBlinkingTime = 2;
[DataField("blinkingSound")] private SoundSpecifier _blinkingSound = default!;
[DataField("blinkingSound", required: true)] private SoundSpecifier _blinkingSound = default!;
private bool _wasBlinking;
@@ -97,7 +97,7 @@ namespace Content.Client.Light.Visualizers
var randomTime = random.NextFloat() *
(_maxBlinkingTime - _minBlinkingTime) + _minBlinkingTime;
var blinkingAnim = new Animation()
var blinkingAnim = new Animation()
{
Length = TimeSpan.FromSeconds(randomTime),
AnimationTracks =
@@ -123,18 +123,15 @@ namespace Content.Client.Light.Visualizers
}
}
}
};
};
if (_blinkingSound.TryGetSound(out var blinkingSound))
blinkingAnim.AnimationTracks.Add(new AnimationTrackPlaySound()
{
blinkingAnim.AnimationTracks.Add(new AnimationTrackPlaySound()
KeyFrames =
{
KeyFrames =
{
new AnimationTrackPlaySound.KeyFrame(blinkingSound, 0.5f)
}
});
}
new AnimationTrackPlaySound.KeyFrame(_blinkingSound.GetSound(), 0.5f)
}
});
return blinkingAnim;
}