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

Replace some sound PlayEntity with PlayPvs (#34317)

Browse Source
This commit is contained in:
Leon Friedrich
2025-01-11 01:44:30 +11:00
committed by GitHub
parent dff9abfe74
commit 7ae7821213
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Audio/AudioHelpers.cs
View File

@@ -4,11 +4,12 @@ using Robust.Shared.Random;
namespace Content.Shared.Audio
{
public static class AudioHelpers{
public static class AudioHelpers
{
/// <summary>
/// Returns a random pitch.
/// </summary>
[Obsolete("Use variation datafield.")]
[Obsolete("Use AudioParams.Variation data-field")]
public static AudioParams WithVariation(float amplitude)
{
return WithVariation(amplitude, null);
@@ -17,6 +18,7 @@ namespace Content.Shared.Audio
/// <summary>
/// Returns a random pitch.
/// </summary>
[Obsolete("Use AudioParams.Variation data-field")]
public static AudioParams WithVariation(float amplitude, IRobustRandom? rand)
{
IoCManager.Resolve(ref rand);
@@ -42,22 +44,22 @@ namespace Content.Shared.Audio
/// </summary>
/// <param name="shift">Number of semitones to shift, positive or negative. Clamped between -12 and 12
/// which correspond to a pitch multiplier of 0.5 and 2.0 respectively.</param>
public static AudioParams ShiftSemitone(int shift)
public static AudioParams ShiftSemitone(AudioParams @params, int shift)
{
shift = MathHelper.Clamp(shift, -12, 12);
float pitchMult = SemitoneMultipliers[shift + 12];
return AudioParams.Default.WithPitchScale(pitchMult);
return @params.WithPitchScale(pitchMult);
}
/// <summary>
/// Returns a pitch multiplier shifted by a random number of semitones within variation.
/// </summary>
/// <param name="variation">Max number of semitones to shift in either direction. Values above 12 have no effect.</param>
public static AudioParams WithSemitoneVariation(int variation, IRobustRandom? rand)
public static AudioParams WithSemitoneVariation(AudioParams @params, int variation, IRobustRandom rand)
{
IoCManager.Resolve(ref rand);
variation = Math.Clamp(variation, 0, 12);
return ShiftSemitone(rand.Next(-variation, variation));
return ShiftSemitone(@params, rand.Next(-variation, variation));
}
}
}