Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for frequencymultiplier in character sounds #15082

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −2
Open

Support for frequencymultiplier in character sounds #15082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ public void PlaySound(CharacterSound.SoundType soundType, float soundIntervalFac
}
var selectedSound = matchingSounds.GetRandomUnsynced();
if (selectedSound?.Sound == null) { return; }
soundChannel = SoundPlayer.PlaySound(selectedSound.Sound, AnimController.WorldPosition, selectedSound.Volume, selectedSound.Range, hullGuess: CurrentHull, ignoreMuffling: selectedSound.IgnoreMuffling);
soundChannel = SoundPlayer.PlaySound(selectedSound.Sound, AnimController.WorldPosition, selectedSound.Volume, selectedSound.Range, hullGuess: CurrentHull, ignoreMuffling: selectedSound.IgnoreMuffling, freqMult: selectedSound.GetRandomFrequencyMultiplier());
soundTimer = Params.SoundInterval;
}

Expand Down
8 changes: 8 additions & 0 deletions Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterSound.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Barotrauma.Sounds;
using Microsoft.Xna.Framework;
using System.Collections.Immutable;

namespace Barotrauma
Expand All @@ -16,6 +17,8 @@ public enum SoundType
public SoundType Type => Params.State;
public ImmutableHashSet<Identifier> TagSet => Params.TagSet;
public float Volume => roundSound == null ? 0.0f : roundSound.Volume;

public Vector2 FrequencyMultiplierRange => roundSound == null ? new Vector2(1.0f) : roundSound.FrequencyMultiplierRange;
public float Range => roundSound == null ? 0.0f : roundSound.Range;
public Sound Sound => roundSound?.Sound;

Expand All @@ -26,5 +29,10 @@ public CharacterSound(CharacterParams.SoundParams soundParams)
Params = soundParams;
roundSound = RoundSound.Load(soundParams.Element);
}

public float GetRandomFrequencyMultiplier()
{
return Rand.Range(FrequencyMultiplierRange.X, FrequencyMultiplierRange.Y);
}
}
}
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public float FrequencyMultiplier
{
if (value is < MinFrequencyMultiplier or > MaxFrequencyMultiplier)
{
DebugConsole.ThrowError($"Frequency multiplier out of range: {value}" + Environment.StackTrace.CleanupStackTrace());
DebugConsole.ThrowError($"Frequency multiplier out of range: {value} . Minimum acceptable frequency value is {MinFrequencyMultiplier} , maximum acceptable frequency value is {MaxFrequencyMultiplier} ." + Environment.StackTrace.CleanupStackTrace());
}
frequencyMultiplier = Math.Clamp(value, MinFrequencyMultiplier, MaxFrequencyMultiplier);

Expand Down