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

#4219 revert of single sound removal in EmitSoundSystem

Browse Source
This commit is contained in:
Galactic Chimp
2021-06-27 21:30:28 +02:00
parent c8e3775ea5
commit a0889a9151
6 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Server/Sound/EmitSoundSystem.cs
View File

@@ -1,8 +1,8 @@
#nullable enable
using Content.Shared.Audio;
using Content.Shared.Interaction;
using Content.Shared.Throwing;
using Content.Server.Interaction.Components;
using Content.Server.Sound;
using Content.Server.Throwing;
using JetBrains.Annotations;
using Robust.Shared.Audio;
@@ -13,7 +13,8 @@ using Robust.Shared.Player;
using Robust.Shared.Random;
using Robust.Shared.Log;
namespace Content.Server.Sound
namespace Content.Server.GameObjects.EntitySystems
{
[UsedImplicitly]
public class EmitSoundSystem : EntitySystem
@@ -33,20 +34,27 @@ namespace Content.Server.Sound
private void PlaySound(BaseEmitSoundComponent component)
{
if (!string.IsNullOrWhiteSpace(component.SoundCollectionName))
if (!string.IsNullOrWhiteSpace(component._soundCollectionName))
{
PlayRandomSoundFromCollection(component);
}
else if(!string.IsNullOrWhiteSpace(component._soundName))
{
PlaySingleSound(component._soundName, component);
}
else
{
Logger.Warning($"{nameof(component)}: {component.Owner} has no {nameof(component.SoundCollectionName)} to play.");
Logger.Warning($"{nameof(component)} Uid:{component.Owner.Uid} has neither {nameof(component._soundCollectionName)} nor {nameof(component._soundName)} to play.");
}
}
private void PlayRandomSoundFromCollection(BaseEmitSoundComponent component)
{
var file = SelectRandomSoundFromSoundCollection(component.SoundCollectionName!);
PlaySingleSound(file, component);
if (!string.IsNullOrWhiteSpace(component._soundCollectionName))
{
var file = SelectRandomSoundFromSoundCollection(component._soundCollectionName);
PlaySingleSound(file, component);
}
}
private string SelectRandomSoundFromSoundCollection(string soundCollectionName)
@@ -57,10 +65,15 @@ namespace Content.Server.Sound
private static void PlaySingleSound(string soundName, BaseEmitSoundComponent component)
{
if (component.PitchVariation > 0.0)
if (string.IsNullOrWhiteSpace(soundName))
{
return;
}
if (component._pitchVariation > 0.0)
{
SoundSystem.Play(Filter.Pvs(component.Owner), soundName, component.Owner,
AudioHelpers.WithVariation(component.PitchVariation).WithVolume(-2f));
AudioHelpers.WithVariation(component._pitchVariation).WithVolume(-2f));
}
else
{