diff --git a/Content.Client/PDA/PDAComponent.cs b/Content.Client/PDA/PDAComponent.cs index b9e0c206dc..7538b70906 100644 --- a/Content.Client/PDA/PDAComponent.cs +++ b/Content.Client/PDA/PDAComponent.cs @@ -1,26 +1,39 @@ using Content.Shared.PDA; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Players; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; namespace Content.Client.PDA { [RegisterComponent] public class PDAComponent : SharedPDAComponent { + [ViewVariables] + [DataField("buySuccessSound")] + private SoundSpecifier BuySuccessSound { get; } = new SoundPathSpecifier("/Audio/Effects/kaching.ogg"); + + [ViewVariables] + [DataField("insufficientFundsSound")] + private SoundSpecifier InsufficientFundsSound { get; } = new SoundPathSpecifier("/Audio/Effects/error.ogg"); + public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { base.HandleNetworkMessage(message, netChannel, session); switch(message) { - case PDAUplinkBuySuccessMessage _ : - SoundSystem.Play(Filter.Local(), "/Audio/Effects/kaching.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + case PDAUplinkBuySuccessMessage: + if(BuySuccessSound.TryGetSound(out var buySuccessSound)) + SoundSystem.Play(Filter.Local(), buySuccessSound, Owner, AudioParams.Default.WithVolume(-2f)); break; - case PDAUplinkInsufficientFundsMessage _ : - SoundSystem.Play(Filter.Local(), "/Audio/Effects/error.ogg", Owner, AudioParams.Default); + case PDAUplinkInsufficientFundsMessage: + if(InsufficientFundsSound.TryGetSound(out var insufficientFundsSound)) + SoundSystem.Play(Filter.Local(), insufficientFundsSound, Owner, AudioParams.Default); break; } } diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs index 00ba58d930..d206ba6507 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Threading.Tasks; using Content.Server.Destructible; using Content.Server.Destructible.Thresholds; @@ -100,7 +100,7 @@ namespace Content.IntegrationTests.Tests.Destructible var actsThreshold = (DoActsBehavior) threshold.Behaviors[2]; Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage)); - Assert.That(soundThreshold.Sound, Is.EqualTo("/Audio/Effects/woodhit.ogg")); + Assert.That(soundThreshold.Sound.GetSound(), Is.EqualTo("/Audio/Effects/woodhit.ogg")); Assert.That(spawnThreshold.Spawn, Is.Not.Null); Assert.That(spawnThreshold.Spawn.Count, Is.EqualTo(1)); Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId)); @@ -164,7 +164,7 @@ namespace Content.IntegrationTests.Tests.Destructible // Check that it matches the YAML prototype Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage)); - Assert.That(soundThreshold.Sound, Is.EqualTo("/Audio/Effects/woodhit.ogg")); + Assert.That(soundThreshold.Sound.GetSound(), Is.EqualTo("/Audio/Effects/woodhit.ogg")); Assert.That(spawnThreshold.Spawn, Is.Not.Null); Assert.That(spawnThreshold.Spawn.Count, Is.EqualTo(1)); Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId)); @@ -215,7 +215,7 @@ namespace Content.IntegrationTests.Tests.Destructible // Check that it matches the YAML prototype Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage)); - Assert.That(soundThreshold.Sound, Is.EqualTo("/Audio/Effects/woodhit.ogg")); + Assert.That(soundThreshold.Sound.GetSound(), Is.EqualTo("/Audio/Effects/woodhit.ogg")); Assert.That(spawnThreshold.Spawn, Is.Not.Null); Assert.That(spawnThreshold.Spawn.Count, Is.EqualTo(1)); Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId)); diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs index 54873aa4e8..4a4a064b28 100644 --- a/Content.Server/AME/Components/AMEControllerComponent.cs +++ b/Content.Server/AME/Components/AMEControllerComponent.cs @@ -11,12 +11,14 @@ using Content.Shared.AME; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.AME.Components @@ -32,6 +34,8 @@ namespace Content.Server.AME.Components private AppearanceComponent? _appearance; private PowerSupplierComponent? _powerSupplier; + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + [DataField("injectSound")] private SoundSpecifier _injectSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg"); private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; @@ -312,12 +316,14 @@ namespace Content.Server.AME.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var clickSound)) + SoundSystem.Play(Filter.Pvs(Owner), clickSound, Owner, AudioParams.Default.WithVolume(-2f)); } private void InjectSound(bool overloading) { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/bang.ogg", Owner, AudioParams.Default.WithVolume(overloading ? 10f : 0f)); + if(_injectSound.TryGetSound(out var injectSound)) + SoundSystem.Play(Filter.Pvs(Owner), injectSound, Owner, AudioParams.Default.WithVolume(overloading ? 10f : 0f)); } async Task IInteractUsing.InteractUsing(InteractUsingEventArgs args) diff --git a/Content.Server/AME/Components/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs index 42fc2de82e..8b0b140a73 100644 --- a/Content.Server/AME/Components/AMEPartComponent.cs +++ b/Content.Server/AME/Components/AMEPartComponent.cs @@ -4,8 +4,8 @@ using System.Threading.Tasks; using Content.Server.Hands.Components; using Content.Server.Tools.Components; using Content.Shared.Interaction; -using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Tool; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -14,6 +14,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.AME.Components { @@ -25,7 +26,7 @@ namespace Content.Server.AME.Components [Dependency] private readonly IServerEntityManager _serverEntityManager = default!; public override string Name => "AMEPart"; - private string _unwrap = "/Audio/Effects/unwrap.ogg"; + [DataField("unwrapSound")] private SoundSpecifier _unwrapSound = new SoundPathSpecifier("/Audio/Effects/unwrap.ogg"); async Task IInteractUsing.InteractUsing(InteractUsingEventArgs args) { @@ -51,7 +52,8 @@ namespace Content.Server.AME.Components var ent = _serverEntityManager.SpawnEntity("AMEShielding", mapGrid.GridTileToLocal(snapPos)); ent.Transform.LocalRotation = Owner.Transform.LocalRotation; - SoundSystem.Play(Filter.Pvs(Owner), _unwrap, Owner); + if(_unwrapSound.TryGetSound(out var unwrapSound)) + SoundSystem.Play(Filter.Pvs(Owner), unwrapSound, Owner); Owner.Delete(); diff --git a/Content.Server/Actions/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs index a54992a282..fc06630b98 100644 --- a/Content.Server/Actions/Actions/DisarmAction.cs +++ b/Content.Server/Actions/Actions/DisarmAction.cs @@ -1,6 +1,4 @@ #nullable enable -using System; -using System.Linq; using Content.Server.Act; using Content.Server.Interaction; using Content.Server.Notification; @@ -11,9 +9,9 @@ using Content.Shared.Actions.Behaviors; using Content.Shared.Actions.Components; using Content.Shared.Audio; using Content.Shared.Cooldown; -using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -24,6 +22,9 @@ using Robust.Shared.Maths; using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; +using System; +using System.Linq; namespace Content.Server.Actions.Actions { @@ -35,6 +36,14 @@ namespace Content.Server.Actions.Actions [DataField("pushProb")] private float _pushProb = 0.4f; [DataField("cooldown")] private float _cooldown = 1.5f; + [ViewVariables] + [DataField("punchMissSound")] + private SoundSpecifier PunchMissSound { get; } = new SoundPathSpecifier("/Audio/Weapons/punchmiss.ogg"); + + [ViewVariables] + [DataField("disarmSuccessSound")] + private SoundSpecifier DisarmSuccessSound { get; } = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg"); + public void DoTargetEntityAction(TargetEntityActionEventArgs args) { var disarmedActs = args.Target.GetAllComponents().ToArray(); @@ -70,8 +79,9 @@ namespace Content.Server.Actions.Actions if (random.Prob(_failProb)) { - SoundSystem.Play(Filter.Pvs(args.Performer), "/Audio/Weapons/punchmiss.ogg", args.Performer, - AudioHelpers.WithVariation(0.025f)); + if(PunchMissSound.TryGetSound(out var punchMissSound)) + SoundSystem.Play(Filter.Pvs(args.Performer), punchMissSound, args.Performer, AudioHelpers.WithVariation(0.025f)); + args.Performer.PopupMessageOtherClients(Loc.GetString("disarm-action-popup-message-other-clients", ("performerName", args.Performer.Name), ("targetName", args.Target.Name))); @@ -94,8 +104,8 @@ namespace Content.Server.Actions.Actions return; } - SoundSystem.Play(Filter.Pvs(args.Performer), "/Audio/Effects/thudswoosh.ogg", args.Performer.Transform.Coordinates, - AudioHelpers.WithVariation(0.025f)); + if(DisarmSuccessSound.TryGetSound(out var disarmSuccessSound)) + SoundSystem.Play(Filter.Pvs(args.Performer), disarmSuccessSound, args.Performer.Transform.Coordinates, AudioHelpers.WithVariation(0.025f)); } } } diff --git a/Content.Server/Actions/Actions/ScreamAction.cs b/Content.Server/Actions/Actions/ScreamAction.cs index 0f1fa8cfdb..fdad420c57 100644 --- a/Content.Server/Actions/Actions/ScreamAction.cs +++ b/Content.Server/Actions/Actions/ScreamAction.cs @@ -1,6 +1,4 @@ #nullable enable -using System; -using System.Collections.Generic; using Content.Server.CharacterAppearance.Components; using Content.Shared.ActionBlocker; using Content.Shared.Actions.Behaviors; @@ -8,7 +6,7 @@ using Content.Shared.Actions.Components; using Content.Shared.Audio; using Content.Shared.CharacterAppearance; using Content.Shared.Cooldown; -using Content.Shared.Speech; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -16,6 +14,7 @@ using Robust.Shared.IoC; using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Serialization.Manager.Attributes; +using System; namespace Content.Server.Actions.Actions { @@ -28,9 +27,9 @@ namespace Content.Server.Actions.Actions [Dependency] private readonly IRobustRandom _random = default!; - [DataField("male")] private List? _male; - [DataField("female")] private List? _female; - [DataField("wilhelm")] private string? _wilhelm; + [DataField("male")] private SoundSpecifier _male = default!; + [DataField("female")] private SoundSpecifier _female = default!; + [DataField("wilhelm")] private SoundSpecifier _wilhelm = default!; /// seconds [DataField("cooldown")] private float _cooldown = 10; @@ -46,31 +45,27 @@ namespace Content.Server.Actions.Actions if (!args.Performer.TryGetComponent(out var humanoid)) return; if (!args.Performer.TryGetComponent(out var actions)) return; - if (_random.Prob(.01f) && !string.IsNullOrWhiteSpace(_wilhelm)) + if (_random.Prob(.01f) && _wilhelm.TryGetSound(out var wilhelm)) { - SoundSystem.Play(Filter.Pvs(args.Performer), _wilhelm, args.Performer, AudioParams.Default.WithVolume(Volume)); + SoundSystem.Play(Filter.Pvs(args.Performer), wilhelm, args.Performer, AudioParams.Default.WithVolume(Volume)); } else { switch (humanoid.Sex) { case Sex.Male: - if (_male == null) break; - SoundSystem.Play(Filter.Pvs(args.Performer), _random.Pick(_male), args.Performer, - AudioHelpers.WithVariation(Variation).WithVolume(Volume)); + if (_male.TryGetSound(out var male)) + SoundSystem.Play(Filter.Pvs(args.Performer), male, args.Performer, AudioHelpers.WithVariation(Variation).WithVolume(Volume)); break; case Sex.Female: - if (_female == null) break; - SoundSystem.Play(Filter.Pvs(args.Performer), _random.Pick(_female), args.Performer, - AudioHelpers.WithVariation(Variation).WithVolume(Volume)); + if (_female.TryGetSound(out var female)) + SoundSystem.Play(Filter.Pvs(args.Performer), female, args.Performer, AudioHelpers.WithVariation(Variation).WithVolume(Volume)); break; default: throw new ArgumentOutOfRangeException(); } } - - actions.Cooldown(args.ActionType, Cooldowns.SecondsFromNow(_cooldown)); } } diff --git a/Content.Server/Actions/Spells/GiveItemSpell.cs b/Content.Server/Actions/Spells/GiveItemSpell.cs index d7cac3a1b2..01d4826fde 100644 --- a/Content.Server/Actions/Spells/GiveItemSpell.cs +++ b/Content.Server/Actions/Spells/GiveItemSpell.cs @@ -6,6 +6,7 @@ using Content.Shared.Actions.Behaviors; using Content.Shared.Actions.Components; using Content.Shared.Cooldown; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -27,7 +28,7 @@ namespace Content.Server.Actions.Spells [ViewVariables] [DataField("cooldown")] public float CoolDown { get; set; } = 1f; [ViewVariables] [DataField("spellItem")] public string ItemProto { get; set; } = default!; - [ViewVariables] [DataField("castSound")] public string? CastSound { get; set; } = default!; + [ViewVariables] [DataField("castSound")] public SoundSpecifier CastSound { get; set; } = default!; //Rubber-band snapping items into player's hands, originally was a workaround, later found it works quite well with stuns //Not sure if needs fixing @@ -68,8 +69,8 @@ namespace Content.Server.Actions.Spells handsComponent.PutInHandOrDrop(itemComponent); - if (CastSound != null) - SoundSystem.Play(Filter.Pvs(caster), CastSound, caster); + if (CastSound.TryGetSound(out var castSound)) + SoundSystem.Play(Filter.Pvs(caster), castSound, caster); } } } diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index d2aae64b6a..3654ad9a96 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Arcade; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; +using Content.Shared.Sound; using Content.Shared.Wires; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -39,6 +40,13 @@ namespace Content.Server.Arcade.Components [ViewVariables] private bool _enemyInvincibilityFlag; [ViewVariables] private SpaceVillainGame _game = null!; + [DataField("newGameSound")] private SoundSpecifier _newGameSound = new SoundPathSpecifier("/Audio/Effects/Arcade/newgame.ogg"); + [DataField("playerAttackSound")] private SoundSpecifier _playerAttackSound = new SoundPathSpecifier("/Audio/Effects/Arcade/player_attack.ogg"); + [DataField("playerHealSound")] private SoundSpecifier _playerHealSound = new SoundPathSpecifier("/Audio/Effects/Arcade/player_heal.ogg"); + [DataField("playerChargeSound")] private SoundSpecifier _playerChargeSound = new SoundPathSpecifier("/Audio/Effects/Arcade/player_charge.ogg"); + [DataField("winSound")] private SoundSpecifier _winSound = new SoundPathSpecifier("/Audio/Effects/Arcade/win.ogg"); + [DataField("gameOverSound")] private SoundSpecifier _gameOverSound = new SoundPathSpecifier("/Audio/Effects/Arcade/gameover.ogg"); + [ViewVariables(VVAccess.ReadWrite)] [DataField("possibleFightVerbs")] private List _possibleFightVerbs = new List() {"Defeat", "Annihilate", "Save", "Strike", "Stop", "Destroy", "Robust", "Romance", "Pwn", "Own"}; [ViewVariables(VVAccess.ReadWrite)] [DataField("possibleFirstEnemyNames")] private List _possibleFirstEnemyNames = new List(){ @@ -124,7 +132,9 @@ namespace Content.Server.Arcade.Components _game?.ExecutePlayerAction(msg.PlayerAction); break; case PlayerAction.NewGame: - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/Arcade/newgame.ogg", Owner, AudioParams.Default.WithVolume(-4f)); + if(_newGameSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-4f)); + _game = new SpaceVillainGame(this); UserInterface?.SendMessage(_game.GenerateMetaDataMessage()); break; @@ -292,8 +302,10 @@ namespace Content.Server.Arcade.Components _latestPlayerActionMessage = Loc.GetString("space-villain-game-player-attack-message", ("enemyName", _enemyName), ("attackAmount", attackAmount)); - SoundSystem.Play(Filter.Pvs(_owner.Owner), "/Audio/Effects/Arcade/player_attack.ogg", _owner.Owner, AudioParams.Default.WithVolume(-4f)); - if(!_owner._enemyInvincibilityFlag) _enemyHp -= attackAmount; + if(_owner._playerAttackSound.TryGetSound(out var playerAttackSound)) + SoundSystem.Play(Filter.Pvs(_owner.Owner), playerAttackSound, _owner.Owner, AudioParams.Default.WithVolume(-4f)); + if(!_owner._enemyInvincibilityFlag) + _enemyHp -= attackAmount; _turtleTracker -= _turtleTracker > 0 ? 1 : 0; break; case PlayerAction.Heal: @@ -302,15 +314,18 @@ namespace Content.Server.Arcade.Components _latestPlayerActionMessage = Loc.GetString("space-villain-game-player-heal-message", ("magicPointAmount", pointAmount), ("healAmount", healAmount)); - SoundSystem.Play(Filter.Pvs(_owner.Owner), "/Audio/Effects/Arcade/player_heal.ogg", _owner.Owner, AudioParams.Default.WithVolume(-4f)); - if(!_owner._playerInvincibilityFlag) _playerMp -= pointAmount; + if(_owner._playerHealSound.TryGetSound(out var playerHealSound)) + SoundSystem.Play(Filter.Pvs(_owner.Owner), playerHealSound, _owner.Owner, AudioParams.Default.WithVolume(-4f)); + if(!_owner._playerInvincibilityFlag) + _playerMp -= pointAmount; _playerHp += healAmount; _turtleTracker++; break; case PlayerAction.Recharge: var chargeAmount = _random.Next(4, 7); _latestPlayerActionMessage = Loc.GetString("space-villain-game-player-recharge-message",("regainedPoints", chargeAmount)); - SoundSystem.Play(Filter.Pvs(_owner.Owner), "/Audio/Effects/Arcade/player_charge.ogg", _owner.Owner, AudioParams.Default.WithVolume(-4f)); + if(_owner._playerChargeSound.TryGetSound(out var playerChargeSound)) + SoundSystem.Play(Filter.Pvs(_owner.Owner), playerChargeSound, _owner.Owner, AudioParams.Default.WithVolume(-4f)); _playerMp += chargeAmount; _turtleTracker -= _turtleTracker > 0 ? 1 : 0; break; @@ -344,7 +359,8 @@ namespace Content.Server.Arcade.Components UpdateUi(Loc.GetString("space-villain-game-player-wins-message"), Loc.GetString("space-villain-game-enemy-dies-message",("enemyName", _enemyName)), true); - SoundSystem.Play(Filter.Pvs(_owner.Owner), "/Audio/Effects/Arcade/win.ogg", _owner.Owner, AudioParams.Default.WithVolume(-4f)); + if(_owner._winSound.TryGetSound(out var winSound)) + SoundSystem.Play(Filter.Pvs(_owner.Owner), winSound, _owner.Owner, AudioParams.Default.WithVolume(-4f)); _owner.ProcessWin(); return false; } @@ -357,7 +373,8 @@ namespace Content.Server.Arcade.Components UpdateUi(Loc.GetString("space-villain-game-player-loses-message"), Loc.GetString("space-villain-game-enemy-cheers-message",("enemyName", _enemyName)), true); - SoundSystem.Play(Filter.Pvs(_owner.Owner), "/Audio/Effects/Arcade/gameover.ogg", _owner.Owner, AudioParams.Default.WithVolume(-4f)); + if(_owner._gameOverSound.TryGetSound(out var gameOverSound)) + SoundSystem.Play(Filter.Pvs(_owner.Owner), gameOverSound, _owner.Owner, AudioParams.Default.WithVolume(-4f)); return false; } if (_enemyHp <= 0 || _enemyMp <= 0) @@ -366,7 +383,8 @@ namespace Content.Server.Arcade.Components UpdateUi(Loc.GetString("space-villain-game-player-loses-message"), Loc.GetString("space-villain-game-enemy-dies-with-player-message ", ("enemyName", _enemyName)), true); - SoundSystem.Play(Filter.Pvs(_owner.Owner), "/Audio/Effects/Arcade/gameover.ogg", _owner.Owner, AudioParams.Default.WithVolume(-4f)); + if (_owner._gameOverSound.TryGetSound(out var gameOverSound)) + SoundSystem.Play(Filter.Pvs(_owner.Owner), gameOverSound, _owner.Owner, AudioParams.Default.WithVolume(-4f)); return false; } diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs index d30494b082..81f1706817 100644 --- a/Content.Server/Atmos/Components/GasTankComponent.cs +++ b/Content.Server/Atmos/Components/GasTankComponent.cs @@ -18,6 +18,7 @@ using Content.Shared.Audio; using Content.Shared.DragDrop; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Sound; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -48,6 +49,8 @@ namespace Content.Server.Atmos.Components [ViewVariables] private BoundUserInterface? _userInterface; + [DataField("ruptureSound")] private SoundSpecifier _ruptureSound = new SoundPathSpecifier("Audio/Effects/spray.ogg"); + [DataField("air")] [ViewVariables] public GasMixture Air { get; set; } = new(); /// @@ -282,8 +285,8 @@ namespace Content.Server.Atmos.Components var tileAtmos = Owner.Transform.Coordinates.GetTileAtmosphere(); tileAtmos?.AssumeAir(Air); - SoundSystem.Play(Filter.Pvs(Owner), "Audio/Effects/spray.ogg", Owner.Transform.Coordinates, - AudioHelpers.WithVariation(0.125f)); + if(_ruptureSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.125f)); Owner.QueueDelete(); return; diff --git a/Content.Server/Body/BodyComponent.cs b/Content.Server/Body/BodyComponent.cs index 9710f58a51..5c4b81a6d5 100644 --- a/Content.Server/Body/BodyComponent.cs +++ b/Content.Server/Body/BodyComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Body.Slot; using Content.Shared.MobState; using Content.Shared.Movement.Components; using Content.Shared.Random.Helpers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; @@ -16,6 +17,7 @@ using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Player; using Robust.Shared.Players; +using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Body { @@ -26,6 +28,8 @@ namespace Content.Server.Body { private Container _partContainer = default!; + [DataField("gibSound")] private SoundSpecifier _gibSound = new SoundCollectionSpecifier("gib"); + protected override bool CanAddPart(string slotId, SharedBodyPartComponent part) { return base.CanAddPart(slotId, part) && @@ -101,8 +105,8 @@ namespace Content.Server.Body { base.Gib(gibParts); - SoundSystem.Play(Filter.Pvs(Owner), AudioHelpers.GetRandomFileFromSoundCollection("gib"), Owner.Transform.Coordinates, - AudioHelpers.WithVariation(0.025f)); + if(_gibSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.025f)); if (Owner.TryGetComponent(out ContainerManagerComponent? container)) { diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index d3af8dc4b8..6c283dc626 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -724,9 +724,9 @@ namespace Content.Server.Botany.Components sprayed = true; amount = ReagentUnit.New(1); - if (!string.IsNullOrEmpty(spray.SpraySound)) + if (spray.SpraySound.TryGetSound(out var spraySound)) { - SoundSystem.Play(Filter.Pvs(usingItem), spray.SpraySound, usingItem, AudioHelpers.WithVariation(0.125f)); + SoundSystem.Play(Filter.Pvs(usingItem), spraySound, usingItem, AudioHelpers.WithVariation(0.125f)); } } diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 2291bbb4e0..fce20fc6f8 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -242,7 +242,10 @@ namespace Content.Server.Buckle.Components return false; } - SoundSystem.Play(Filter.Pvs(Owner), strap.BuckleSound, Owner); + if(strap.BuckleSound.TryGetSound(out var buckleSound)) + { + SoundSystem.Play(Filter.Pvs(Owner), buckleSound, Owner); + } if (!strap.TryAdd(this)) { @@ -350,8 +353,11 @@ namespace Content.Server.Buckle.Components UpdateBuckleStatus(); oldBuckledTo.Remove(this); - SoundSystem.Play(Filter.Pvs(Owner), oldBuckledTo.UnbuckleSound, Owner); - + if (oldBuckledTo.UnbuckleSound.TryGetSound(out var unbuckleSound)) + { + SoundSystem.Play(Filter.Pvs(Owner), unbuckleSound, Owner); + } + SendMessage(new UnbuckleMessage(Owner, oldBuckledTo.Owner)); return true; diff --git a/Content.Server/Buckle/Components/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs index e27355a13e..699523a0f2 100644 --- a/Content.Server/Buckle/Components/StrapComponent.cs +++ b/Content.Server/Buckle/Components/StrapComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.DragDrop; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Helpers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; @@ -56,14 +57,14 @@ namespace Content.Server.Buckle.Components /// [ViewVariables] [DataField("buckleSound")] - public string BuckleSound { get; } = "/Audio/Effects/buckle.ogg"; + public SoundSpecifier BuckleSound { get; } = new SoundPathSpecifier("/Audio/Effects/buckle.ogg"); /// /// The sound to be played when a mob is unbuckled /// [ViewVariables] [DataField("unbuckleSound")] - public string UnbuckleSound { get; } = "/Audio/Effects/unbuckle.ogg"; + public SoundSpecifier UnbuckleSound { get; } = new SoundPathSpecifier("/Audio/Effects/unbuckle.ogg"); /// /// ID of the alert to show when buckled diff --git a/Content.Server/Cabinet/ItemCabinetComponent.cs b/Content.Server/Cabinet/ItemCabinetComponent.cs index f85f311ce2..dd72e2d3d5 100644 --- a/Content.Server/Cabinet/ItemCabinetComponent.cs +++ b/Content.Server/Cabinet/ItemCabinetComponent.cs @@ -1,5 +1,6 @@ -using Content.Shared.ActionBlocker; +using Content.Shared.ActionBlocker; using Content.Shared.Interaction.Events; +using Content.Shared.Sound; using Content.Shared.Verbs; using Content.Shared.Whitelist; using Robust.Shared.Containers; @@ -24,7 +25,7 @@ namespace Content.Server.Cabinet /// [ViewVariables(VVAccess.ReadWrite)] [DataField("doorSound")] - public string? DoorSound { get; set; } + public SoundSpecifier DoorSound { get; set; } = default!; /// /// The prototype that should be spawned inside the cabinet when it is map initialized. diff --git a/Content.Server/Cabinet/ItemCabinetSystem.cs b/Content.Server/Cabinet/ItemCabinetSystem.cs index b0e49e0821..39772ee9b6 100644 --- a/Content.Server/Cabinet/ItemCabinetSystem.cs +++ b/Content.Server/Cabinet/ItemCabinetSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Hands.Components; +using Content.Server.Hands.Components; using Content.Server.Items; using Content.Shared.Audio; using Content.Shared.Cabinet; @@ -146,8 +146,10 @@ namespace Content.Server.Cabinet private static void ClickLatchSound(ItemCabinetComponent comp) { - if (comp.DoorSound == null) return; - SoundSystem.Play(Filter.Pvs(comp.Owner), comp.DoorSound, comp.Owner, AudioHelpers.WithVariation(0.15f)); + if(comp.DoorSound.TryGetSound(out var doorSound)) + { + SoundSystem.Play(Filter.Pvs(comp.Owner), doorSound, comp.Owner, AudioHelpers.WithVariation(0.15f)); + } } } diff --git a/Content.Server/Cargo/Components/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs index 4a53d52b48..d975e159fa 100644 --- a/Content.Server/Cargo/Components/CargoConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoConsoleComponent.cs @@ -6,6 +6,7 @@ using Content.Server.UserInterface; using Content.Shared.Cargo; using Content.Shared.Cargo.Components; using Content.Shared.Interaction; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -59,6 +60,9 @@ namespace Content.Server.Cargo.Components [DataField("requestOnly")] private bool _requestOnly = false; + [DataField("errorSound")] + private SoundSpecifier _errorSound = new SoundPathSpecifier("/Audio/Effects/error.ogg"); + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private CargoConsoleSystem _cargoConsoleSystem = default!; @@ -112,9 +116,10 @@ namespace Content.Server.Cargo.Components } if (!_cargoConsoleSystem.AddOrder(orders.Database.Id, msg.Requester, msg.Reason, msg.ProductId, - msg.Amount, _bankAccount.Id)) + msg.Amount, _bankAccount.Id) && + _errorSound.TryGetSound(out var errorSound)) { - SoundSystem.Play(Filter.Local(), "/Audio/Effects/error.ogg", Owner, AudioParams.Default); + SoundSystem.Play(Filter.Local(), errorSound, Owner, AudioParams.Default); } break; } @@ -137,14 +142,16 @@ namespace Content.Server.Cargo.Components break; var capacity = _cargoConsoleSystem.GetCapacity(orders.Database.Id); if ( - capacity.CurrentCapacity == capacity.MaxCapacity + (capacity.CurrentCapacity == capacity.MaxCapacity || capacity.CurrentCapacity + order.Amount > capacity.MaxCapacity || !_cargoConsoleSystem.CheckBalance(_bankAccount.Id, (-product.PointCost) * order.Amount) || !_cargoConsoleSystem.ApproveOrder(orders.Database.Id, msg.OrderNumber) - || !_cargoConsoleSystem.ChangeBalance(_bankAccount.Id, (-product.PointCost) * order.Amount) + || !_cargoConsoleSystem.ChangeBalance(_bankAccount.Id, (-product.PointCost) * order.Amount)) + && + _errorSound.TryGetSound(out var errorSound) ) { - SoundSystem.Play(Filter.Local(), "/Audio/Effects/error.ogg", Owner, AudioParams.Default); + SoundSystem.Play(Filter.Local(), errorSound, Owner, AudioParams.Default); break; } UpdateUIState(); diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index ba31eb3d13..099ec71451 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -2,10 +2,12 @@ using System.Collections.Generic; using Content.Server.Power.Components; using Content.Shared.Cargo; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Cargo.Components { @@ -21,6 +23,7 @@ namespace Content.Server.Cargo.Components private const float TeleportDelay = 15f; private List _teleportQueue = new List(); private CargoTelepadState _currentState = CargoTelepadState.Unpowered; + [DataField("teleportSound")] private SoundSpecifier _teleportSound = new SoundPathSpecifier("/Audio/Machines/phasein.ogg"); public override void HandleMessage(ComponentMessage message, IComponent? component) { @@ -72,7 +75,8 @@ namespace Content.Server.Cargo.Components { if (!Deleted && !Owner.Deleted && _currentState == CargoTelepadState.Teleporting && _teleportQueue.Count > 0) { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/phasein.ogg", Owner, AudioParams.Default.WithVolume(-8f)); + if (_teleportSound.TryGetSound(out var teleportSound)) + SoundSystem.Play(Filter.Pvs(Owner), teleportSound, Owner, AudioParams.Default.WithVolume(-8f)); Owner.EntityManager.SpawnEntity(_teleportQueue[0].Product, Owner.Transform.Coordinates); _teleportQueue.RemoveAt(0); if (Owner.TryGetComponent(out var spriteComponent) && spriteComponent.LayerCount > 0) diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 7ae9b4193f..e67d231ae8 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Chemistry.Solution; using Content.Shared.Interaction; using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -21,6 +22,7 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.Chemistry.Components @@ -46,6 +48,8 @@ namespace Content.Server.Chemistry.Components [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ChemMasterUiKey.Key); + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + /// /// Called once per instance of this component. Gets references to any other components needed /// by this component and initializes it's UI and other data. @@ -417,7 +421,8 @@ namespace Content.Server.Chemistry.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-2f)); } [Verb] diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index 0e2c688f47..fd3974fac6 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -27,6 +28,9 @@ namespace Content.Server.Chemistry.Components [ViewVariables(VVAccess.ReadWrite)] public ReagentUnit TransferAmount { get; set; } = ReagentUnit.New(5); + [DataField("InjectSound")] + private SoundSpecifier _injectSound = new SoundPathSpecifier("/Audio/Items/hypospray.ogg"); + [ComponentDependency] private readonly SolutionContainerComponent? _solution = default!; protected override void Initialize() @@ -68,7 +72,8 @@ namespace Content.Server.Chemistry.Components meleeSys.SendLunge(angle, user); } - SoundSystem.Play(Filter.Pvs(user), "/Audio/Items/hypospray.ogg", user); + if(_injectSound.TryGetSound(out var injectSound)) + SoundSystem.Play(Filter.Pvs(user), injectSound, user); var targetSolution = target.GetComponent(); diff --git a/Content.Server/Chemistry/Components/PillComponent.cs b/Content.Server/Chemistry/Components/PillComponent.cs index 770558ca59..5454744f0b 100644 --- a/Content.Server/Chemistry/Components/PillComponent.cs +++ b/Content.Server/Chemistry/Components/PillComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -23,7 +24,7 @@ namespace Content.Server.Chemistry.Components [ViewVariables] [DataField("useSound")] - protected override string? UseSound { get; set; } = default; + protected override SoundSpecifier UseSound { get; set; } = default!; [ViewVariables] [DataField("trash")] @@ -98,9 +99,9 @@ namespace Content.Server.Chemistry.Components firstStomach.TryTransferSolution(split); - if (UseSound != null) + if (UseSound.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(trueTarget), UseSound, trueTarget, AudioParams.Default.WithVolume(-1f)); + SoundSystem.Play(Filter.Pvs(trueTarget), sound, trueTarget, AudioParams.Default.WithVolume(-1f)); } trueTarget.PopupMessage(user, Loc.GetString("pill-component-swallow-success-message")); diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 938f009b8e..eb090d63e0 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution; using Content.Shared.Interaction; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -47,6 +48,8 @@ namespace Content.Server.Chemistry.Components [ViewVariables] private ContainerSlot _beakerContainer = default!; [ViewVariables] [DataField("pack")] private string _packPrototypeId = ""; + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + [ViewVariables] private bool HasBeaker => _beakerContainer.ContainedEntity != null; [ViewVariables] private ReagentUnit _dispenseAmount = ReagentUnit.New(10); [UsedImplicitly] [ViewVariables] private SolutionContainerComponent? Solution => _beakerContainer.ContainedEntity?.GetComponent(); @@ -359,7 +362,8 @@ namespace Content.Server.Chemistry.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-2f)); } [Verb] diff --git a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs index f60c5417c7..b95ffa1207 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs @@ -13,8 +13,8 @@ namespace Content.Server.Chemistry.EntitySystems { base.OnReaction(reaction, owner, unitReactions); - if (reaction.Sound != null) - SoundSystem.Play(Filter.Pvs(owner), reaction.Sound, owner.Transform.Coordinates); + if (reaction.Sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(owner), sound, owner.Transform.Coordinates); } } } diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index ed9f447f0e..bf4ba13e66 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -4,6 +4,7 @@ using Content.Server.Chemistry.Components; using Content.Server.Coordinates.Helpers; using Content.Shared.Audio; using Content.Shared.Chemistry.Reaction; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -80,7 +81,7 @@ namespace Content.Server.Chemistry.ReactionEffects /// /// Sound that will get played when this reaction effect occurs. /// - [DataField("sound")] private string? _sound; + [DataField("sound")] private SoundSpecifier _sound = default!; protected AreaReactionEffect() { @@ -136,9 +137,9 @@ namespace Content.Server.Chemistry.ReactionEffects areaEffectComponent.TryAddSolution(solution); areaEffectComponent.Start(amount, _duration, _spreadDelay, _removeDelay); - if (!string.IsNullOrEmpty(_sound)) + if (_sound.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(solutionEntity), _sound, solutionEntity, AudioHelpers.WithVariation(0.125f)); + SoundSystem.Play(Filter.Pvs(solutionEntity), sound, solutionEntity, AudioHelpers.WithVariation(0.125f)); } } diff --git a/Content.Server/Construction/Completions/PlaySound.cs b/Content.Server/Construction/Completions/PlaySound.cs index 6d0f7de98c..8386d08678 100644 --- a/Content.Server/Construction/Completions/PlaySound.cs +++ b/Content.Server/Construction/Completions/PlaySound.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Content.Shared.Audio; using Content.Shared.Construction; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -14,21 +15,12 @@ namespace Content.Server.Construction.Completions [DataDefinition] public class PlaySound : IGraphAction { - [DataField("soundCollection")] public string SoundCollection { get; private set; } = string.Empty; - [DataField("sound")] public string Sound { get; private set; } = string.Empty; + [DataField("sound")] public SoundSpecifier Sound { get; private set; } = default!; public async Task PerformAction(IEntity entity, IEntity? user) { - var sound = GetSound(); - - if (string.IsNullOrEmpty(sound)) return; - - SoundSystem.Play(Filter.Pvs(entity), sound, entity, AudioHelpers.WithVariation(0.125f)); - } - - private string GetSound() - { - return !string.IsNullOrEmpty(SoundCollection) ? AudioHelpers.GetRandomFileFromSoundCollection(SoundCollection) : Sound; + if(Sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(entity), sound, entity, AudioHelpers.WithVariation(0.125f)); } } } diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index 13d0f4b90b..c06457ef13 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/Content.Server/Crayon/CrayonComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -31,7 +32,7 @@ namespace Content.Server.Crayon //TODO: useSound [DataField("useSound")] - private string? _useSound = string.Empty; + private SoundSpecifier _useSound = default!; [ViewVariables] public Color Color { get; set; } @@ -135,9 +136,9 @@ namespace Content.Server.Crayon appearance.SetData(CrayonVisuals.Rotation, eventArgs.User.Transform.LocalRotation); } - if (!string.IsNullOrEmpty(_useSound)) + if (_useSound.TryGetSound(out var useSound)) { - SoundSystem.Play(Filter.Pvs(Owner), _useSound, Owner, AudioHelpers.WithVariation(0.125f)); + SoundSystem.Play(Filter.Pvs(Owner), useSound, Owner, AudioHelpers.WithVariation(0.125f)); } // Decrease "Ammo" diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 4293558043..6ed45b2cd1 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -232,13 +232,13 @@ namespace Content.Server.Cuffs.Components if (isOwner) { - if (cuff.StartBreakoutSound != null) - SoundSystem.Play(Filter.Pvs(Owner), cuff.StartBreakoutSound, Owner); + if (cuff.StartBreakoutSound.TryGetSound(out var startBreakoutSound)) + SoundSystem.Play(Filter.Pvs(Owner), startBreakoutSound, Owner); } else { - if (cuff.StartUncuffSound != null) - SoundSystem.Play(Filter.Pvs(Owner), cuff.StartUncuffSound, Owner); + if (cuff.StartUncuffSound.TryGetSound(out var startUncuffSound)) + SoundSystem.Play(Filter.Pvs(Owner), startUncuffSound, Owner); } var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime; @@ -259,8 +259,8 @@ namespace Content.Server.Cuffs.Components if (result != DoAfterStatus.Cancelled) { - if (cuff.EndUncuffSound != null) - SoundSystem.Play(Filter.Pvs(Owner), cuff.EndUncuffSound, Owner); + if (cuff.EndUncuffSound.TryGetSound(out var endUncuffSound)) + SoundSystem.Play(Filter.Pvs(Owner), endUncuffSound, Owner); Container.ForceRemove(cuffsToRemove); cuffsToRemove.Transform.AttachToGridOrMap(); diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs index bac2720916..f93bb55d6b 100644 --- a/Content.Server/Cuffs/Components/HandcuffComponent.cs +++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -114,18 +115,18 @@ namespace Content.Server.Cuffs.Components } [DataField("startCuffSound")] - public string StartCuffSound { get; set; } = "/Audio/Items/Handcuffs/cuff_start.ogg"; + public SoundSpecifier StartCuffSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_start.ogg"); - [DataField("endCuffSound")] public string EndCuffSound { get; set; } = "/Audio/Items/Handcuffs/cuff_end.ogg"; + [DataField("endCuffSound")] public SoundSpecifier EndCuffSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_end.ogg"); [DataField("startBreakoutSound")] - public string StartBreakoutSound { get; set; } = "/Audio/Items/Handcuffs/cuff_breakout_start.ogg"; + public SoundSpecifier StartBreakoutSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_breakout_start.ogg"); [DataField("startUncuffSound")] - public string StartUncuffSound { get; set; } = "/Audio/Items/Handcuffs/cuff_takeoff_start.ogg"; + public SoundSpecifier StartUncuffSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_start.ogg"); [DataField("endUncuffSound")] - public string EndUncuffSound { get; set; } = "/Audio/Items/Handcuffs/cuff_takeoff_end.ogg"; + public SoundSpecifier EndUncuffSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg"); [DataField("color")] public Color Color { get; set; } = Color.White; @@ -184,8 +185,8 @@ namespace Content.Server.Cuffs.Components eventArgs.User.PopupMessage(Loc.GetString("handcuff-component-start-cuffing-target-message",("targetName", eventArgs.Target))); eventArgs.User.PopupMessage(eventArgs.Target, Loc.GetString("handcuff-component-start-cuffing-by-other-message",("otherName", eventArgs.User))); - if (StartCuffSound != null) - SoundSystem.Play(Filter.Pvs(Owner), StartCuffSound, Owner); + if (StartCuffSound.TryGetSound(out var startCuffSound)) + SoundSystem.Play(Filter.Pvs(Owner), startCuffSound, Owner); TryUpdateCuff(eventArgs.User, eventArgs.Target, cuffed); return true; @@ -222,8 +223,8 @@ namespace Content.Server.Cuffs.Components { if (cuffs.TryAddNewCuffs(user, Owner)) { - if (EndCuffSound != null) - SoundSystem.Play(Filter.Pvs(Owner), EndCuffSound, Owner); + if (EndCuffSound.TryGetSound(out var endCuffSound)) + SoundSystem.Play(Filter.Pvs(Owner), endCuffSound, Owner); user.PopupMessage(Loc.GetString("handcuff-component-cuff-other-success-message",("otherName", target))); target.PopupMessage(Loc.GetString("handcuff-component-cuff-by-other-success-message", ("otherName", user))); diff --git a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs index 7d1b1a38ee..83a5ca51be 100644 --- a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs +++ b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs @@ -1,8 +1,9 @@ -using System; +using System; using Content.Server.Stunnable.Components; using Content.Shared.Audio; using Content.Shared.Damage; using Content.Shared.Damage.Components; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -32,7 +33,7 @@ namespace Content.Server.Damage.Components [DataField("factor")] public float Factor { get; set; } = 1f; [DataField("soundHit")] - public string SoundHit { get; set; } = ""; + public SoundSpecifier SoundHit { get; set; } = default!; [DataField("stunChance")] public float StunChance { get; set; } = 0.25f; [DataField("stunMinimumDamage")] @@ -51,8 +52,8 @@ namespace Content.Server.Damage.Components if (speed < MinimumSpeed) return; - if (!string.IsNullOrEmpty(SoundHit)) - SoundSystem.Play(Filter.Pvs(otherFixture.Body.Owner), SoundHit, otherFixture.Body.Owner, AudioHelpers.WithVariation(0.125f).WithVolume(-0.125f)); + if (SoundHit.TryGetSound(out var soundHit)) + SoundSystem.Play(Filter.Pvs(otherFixture.Body.Owner), soundHit, otherFixture.Body.Owner, AudioHelpers.WithVariation(0.125f).WithVolume(-0.125f)); if ((_gameTiming.CurTime - _lastHit).TotalSeconds < DamageCooldown) return; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs index 2e531a9d59..67fad570ed 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs @@ -1,5 +1,6 @@ using System; using Content.Shared.Audio; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Player; @@ -14,17 +15,15 @@ namespace Content.Server.Destructible.Thresholds.Behaviors /// /// Sound played upon destruction. /// - [DataField("sound")] public string Sound { get; set; } = string.Empty; + [DataField("sound")] public SoundSpecifier Sound { get; set; } = default!; public void Execute(IEntity owner, DestructibleSystem system) { - if (string.IsNullOrEmpty(Sound)) + if (Sound.TryGetSound(out var sound)) { - return; - } - - var pos = owner.Transform.Coordinates; - SoundSystem.Play(Filter.Pvs(pos), Sound, pos, AudioHelpers.WithVariation(0.125f)); + var pos = owner.Transform.Coordinates; + SoundSystem.Play(Filter.Pvs(pos), sound, pos, AudioHelpers.WithVariation(0.125f)); + } } } } diff --git a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs deleted file mode 100644 index e3ec950665..0000000000 --- a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using Content.Shared.Audio; -using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.Player; -using Robust.Shared.Serialization.Manager.Attributes; - -namespace Content.Server.Destructible.Thresholds.Behaviors -{ - [Serializable] - [DataDefinition] - public class PlaySoundCollectionBehavior : IThresholdBehavior - { - /// - /// Sound collection from which to pick a random sound to play. - /// - [DataField("soundCollection")] - private string SoundCollection { get; set; } = string.Empty; - - public void Execute(IEntity owner, DestructibleSystem system) - { - if (string.IsNullOrEmpty(SoundCollection)) - { - return; - } - - var sound = AudioHelpers.GetRandomFileFromSoundCollection(SoundCollection); - var pos = owner.Transform.Coordinates; - - SoundSystem.Play(Filter.Pvs(pos), sound, pos, AudioHelpers.WithVariation(0.125f)); - } - } -} diff --git a/Content.Server/Dice/DiceComponent.cs b/Content.Server/Dice/DiceComponent.cs index 99bdf36eaa..09abb9ade4 100644 --- a/Content.Server/Dice/DiceComponent.cs +++ b/Content.Server/Dice/DiceComponent.cs @@ -64,7 +64,8 @@ namespace Content.Server.Dice public void PlayDiceEffect() { - SoundSystem.Play(Filter.Pvs(Owner), _sound.GetSound(), Owner, AudioParams.Default); + if(_sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default); } void IActivate.Activate(ActivateEventArgs eventArgs) diff --git a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs index bc202065f2..9059ba2aa9 100644 --- a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs +++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs @@ -24,6 +24,7 @@ using Content.Shared.Interaction; using Content.Shared.Movement; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -88,6 +89,9 @@ namespace Content.Server.Disposal.Mailing [DataField("entryDelay")] private float _entryDelay = 0.5f; + [DataField("receivedMessageSound")] + private SoundSpecifier _receivedMessageSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + /// /// Token used to cancel the automatic engage of a disposal unit /// after an entity enters it. @@ -432,8 +436,8 @@ namespace Content.Server.Disposal.Mailing break; case UiButton.Power: TogglePower(); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); - + if(_receivedMessageSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-2f)); break; default: throw new ArgumentOutOfRangeException(); diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs index 33c7a83feb..2f25c091d1 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; @@ -20,6 +21,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent; @@ -42,6 +44,8 @@ namespace Content.Server.Disposal.Tube.Components [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(DisposalRouterUiKey.Key); + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + public override Direction NextDirection(DisposalHolderComponent holder) { var directions = ConnectableDirections(); @@ -150,7 +154,8 @@ namespace Content.Server.Disposal.Tube.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-2f)); } /// diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs index 3dde6dee78..d2e9b19b9c 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; @@ -17,6 +18,7 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent; @@ -39,6 +41,8 @@ namespace Content.Server.Disposal.Tube.Components [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(DisposalTaggerUiKey.Key); + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + public override Direction NextDirection(DisposalHolderComponent holder) { holder.Tags.Add(_tag); @@ -116,7 +120,8 @@ namespace Content.Server.Disposal.Tube.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-2f)); } /// diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs index 27e5d2b6e7..d247e01323 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Disposal.Components; using Content.Shared.Movement; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; @@ -37,7 +38,7 @@ namespace Content.Server.Disposal.Tube.Components private bool _connected; private bool _broken; [DataField("clangSound")] - private string _clangSound = "/Audio/Effects/clang.ogg"; + private SoundSpecifier _clangSound = new SoundPathSpecifier("/Audio/Effects/clang.ogg"); /// /// Container of entities that are currently inside this tube @@ -266,7 +267,8 @@ namespace Content.Server.Disposal.Tube.Components } _lastClang = _gameTiming.CurTime; - SoundSystem.Play(Filter.Pvs(Owner), _clangSound, Owner.Transform.Coordinates); + if(_clangSound.TryGetSound(out var clangSound)) + SoundSystem.Play(Filter.Pvs(Owner), clangSound, Owner.Transform.Coordinates); break; } } diff --git a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs index c040169240..a6ec72f33f 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs @@ -20,6 +20,7 @@ using Content.Shared.DragDrop; using Content.Shared.Interaction; using Content.Shared.Movement; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Throwing; using Content.Shared.Verbs; using Robust.Server.GameObjects; @@ -78,6 +79,8 @@ namespace Content.Server.Disposal.Unit.Components [DataField("flushDelay")] private readonly TimeSpan _flushDelay = TimeSpan.FromSeconds(3); + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + /// /// Delay from trying to enter disposals ourselves. /// @@ -377,7 +380,8 @@ namespace Content.Server.Disposal.Unit.Components break; case UiButton.Power: TogglePower(); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var clickSound)) + SoundSystem.Play(Filter.Pvs(Owner), clickSound, Owner, AudioParams.Default.WithVolume(-2f)); break; default: throw new ArgumentOutOfRangeException(); diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index ae59d4a65c..22df7199f9 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -8,12 +8,14 @@ using Content.Shared.Doors; using Content.Shared.Interaction; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; using static Content.Shared.Wires.SharedWiresComponent; using static Content.Shared.Wires.SharedWiresComponent.WiresAction; @@ -92,6 +94,10 @@ namespace Content.Server.Doors.Components } } + [DataField("setBoltsDownSound")] private SoundSpecifier _setBoltsDownSound = new SoundPathSpecifier("/Audio/Machines/boltsdown.ogg"); + + [DataField("setBoltsUpSound")] private SoundSpecifier _setBoltsUpSound = new SoundPathSpecifier("/Audio/Machines/boltsup.ogg"); + private static readonly TimeSpan AutoCloseDelayFast = TimeSpan.FromSeconds(1); [ViewVariables(VVAccess.ReadWrite)] @@ -456,7 +462,16 @@ namespace Content.Server.Doors.Components BoltsDown = newBolts; - SoundSystem.Play(Filter.Broadcast(), newBolts ? "/Audio/Machines/boltsdown.ogg" : "/Audio/Machines/boltsup.ogg", Owner); + if (newBolts) + { + if (_setBoltsDownSound.TryGetSound(out var boltsDownSound)) + SoundSystem.Play(Filter.Broadcast(), boltsDownSound, Owner); + } + else + { + if (_setBoltsUpSound.TryGetSound(out var boltsUpSound)) + SoundSystem.Play(Filter.Broadcast(), boltsUpSound, Owner); + } } } } diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index b608dc5304..b6890bed14 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.Doors; using Content.Shared.Interaction; +using Content.Shared.Sound; using Content.Shared.Tool; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -43,6 +44,9 @@ namespace Content.Server.Doors.Components [DataField("board")] private string? _boardPrototype; + [DataField("tryOpenDoorSound")] + private SoundSpecifier _tryOpenDoorSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg"); + public override DoorState State { get => base.State; @@ -235,10 +239,10 @@ namespace Content.Server.Doors.Components { Open(); - if (user.TryGetComponent(out HandsComponent? hands) && hands.Count == 0) + if (user.TryGetComponent(out HandsComponent? hands) && hands.Count == 0 + && _tryOpenDoorSound.TryGetSound(out var tryOpenDoorSound)) { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/bang.ogg", Owner, - AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), tryOpenDoorSound, Owner, AudioParams.Default.WithVolume(-2)); } } else diff --git a/Content.Server/Explosion/Components/FlashExplosiveComponent.cs b/Content.Server/Explosion/Components/FlashExplosiveComponent.cs index 7762e3e8ab..5c0cff4dc8 100644 --- a/Content.Server/Explosion/Components/FlashExplosiveComponent.cs +++ b/Content.Server/Explosion/Components/FlashExplosiveComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Flash.Components; using Content.Server.Storage.Components; using Content.Shared.Acts; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; @@ -22,7 +23,7 @@ namespace Content.Server.Explosion.Components [DataField("duration")] private float _duration = 8.0f; [DataField("sound")] - private string _sound = "/Audio/Effects/flash_bang.ogg"; + private SoundSpecifier _sound = new SoundPathSpecifier("/Audio/Effects/flash_bang.ogg"); [DataField("deleteOnFlash")] private bool _deleteOnFlash = true; @@ -35,9 +36,9 @@ namespace Content.Server.Explosion.Components FlashableComponent.FlashAreaHelper(Owner, _range, _duration); } - if (_sound != null) + if (_sound.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _sound, Owner.Transform.Coordinates); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates); } if (_deleteOnFlash && !Owner.Deleted) diff --git a/Content.Server/Explosion/ExplosionHelper.cs b/Content.Server/Explosion/ExplosionHelper.cs index c85e1036fa..7f5e35e899 100644 --- a/Content.Server/Explosion/ExplosionHelper.cs +++ b/Content.Server/Explosion/ExplosionHelper.cs @@ -8,6 +8,7 @@ using Content.Shared.Acts; using Content.Shared.Interaction.Helpers; using Content.Shared.Maps; using Content.Shared.Physics; +using Content.Shared.Sound; using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Server.Player; @@ -36,6 +37,7 @@ namespace Content.Server.Explosion /// private static readonly float LightBreakChance = 0.3f; private static readonly float HeavyBreakChance = 0.8f; + private static SoundSpecifier _explosionSound = new SoundPathSpecifier("/Audio/Effects/explosion.ogg"); private static bool IgnoreExplosivePassable(IEntity e) => e.HasTag("ExplosivePassable"); @@ -311,7 +313,8 @@ namespace Content.Server.Explosion var boundingBox = new Box2(epicenterMapPos - new Vector2(maxRange, maxRange), epicenterMapPos + new Vector2(maxRange, maxRange)); - SoundSystem.Play(Filter.Broadcast(), "/Audio/Effects/explosion.ogg", epicenter); + if(_explosionSound.TryGetSound(out var explosionSound)) + SoundSystem.Play(Filter.Broadcast(), explosionSound, epicenter); DamageEntitiesInRange(epicenter, boundingBox, devastationRange, heavyImpactRange, maxRange, mapId); var mapGridsNear = mapManager.FindGridsIntersecting(mapId, boundingBox); diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index a09bdf4e20..19f573d3ba 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs @@ -5,10 +5,12 @@ using Content.Shared.Chemistry.Solution.Components; using Content.Shared.Interaction; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; #nullable enable @@ -19,6 +21,8 @@ namespace Content.Server.Extinguisher { public override string Name => "FireExtinguisher"; + [DataField("refillSound")] SoundSpecifier _refillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg"); + // Higher priority than sprays. int IAfterInteract.Priority => 1; @@ -40,7 +44,8 @@ namespace Content.Server.Extinguisher var drained = targetSolution.Drain(trans); container.TryAddSolution(drained); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/refill.ogg", Owner); + if(_refillSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner); eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("fire-extinguisher-component-after-interact-refilled-message",("owner", Owner))); } diff --git a/Content.Server/Flash/Components/FlashComponent.cs b/Content.Server/Flash/Components/FlashComponent.cs index 3b2d77f70e..47b93c14d8 100644 --- a/Content.Server/Flash/Components/FlashComponent.cs +++ b/Content.Server/Flash/Components/FlashComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -29,6 +30,10 @@ namespace Content.Server.Flash.Components [ViewVariables(VVAccess.ReadWrite)] public float SlowTo { get; set; } = 0.5f; + [ViewVariables(VVAccess.ReadWrite)] + [DataField("sound")] + public SoundSpecifier Sound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/flash.ogg"); + public bool Flashing; public bool HasUses => Uses > 0; diff --git a/Content.Server/Flash/Components/FlashableComponent.cs b/Content.Server/Flash/Components/FlashableComponent.cs index 10aa9baf52..0653114aa7 100644 --- a/Content.Server/Flash/Components/FlashableComponent.cs +++ b/Content.Server/Flash/Components/FlashableComponent.cs @@ -2,6 +2,7 @@ using System; using Content.Shared.Flash; using Content.Shared.Interaction.Helpers; using Content.Shared.Physics; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -31,7 +32,7 @@ namespace Content.Server.Flash.Components return new FlashComponentState(_duration, _lastFlash); } - public static void FlashAreaHelper(IEntity source, float range, float duration, string? sound = null) + public static void FlashAreaHelper(IEntity source, float range, float duration, SoundSpecifier? sound = null) { foreach (var entity in IoCManager.Resolve().GetEntitiesInRange(source.Transform.Coordinates, range)) { @@ -41,9 +42,9 @@ namespace Content.Server.Flash.Components flashable.Flash(duration); } - if (!string.IsNullOrEmpty(sound)) + if (sound != null && sound.TryGetSound(out var soundName)) { - SoundSystem.Play(Filter.Pvs(source), sound, source.Transform.Coordinates); + SoundSystem.Play(Filter.Pvs(source), soundName, source.Transform.Coordinates); } } } diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs index 80995e48a3..bb8746def1 100644 --- a/Content.Server/Flash/FlashSystem.cs +++ b/Content.Server/Flash/FlashSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Flash.Components; +using Content.Server.Flash.Components; using Content.Server.Stunnable.Components; using Content.Server.Weapon.Melee; using Content.Shared.Examine; @@ -93,8 +93,8 @@ namespace Content.Server.Flash }); } - SoundSystem.Play(Filter.Pvs(comp.Owner), "/Audio/Weapons/flash.ogg", comp.Owner.Transform.Coordinates, - AudioParams.Default); + if(comp.Sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(comp.Owner), sound, comp.Owner.Transform.Coordinates, AudioParams.Default); return true; } diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs index 2774549cb8..2f3521ab17 100644 --- a/Content.Server/Fluids/Components/BucketComponent.cs +++ b/Content.Server/Fluids/Components/BucketComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -43,7 +44,7 @@ namespace Content.Server.Fluids.Components : ReagentUnit.Zero; [DataField("sound")] - private string? _sound = "/Audio/Effects/Fluids/watersplash.ogg"; + private SoundSpecifier _sound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg"); /// protected override void Initialize() @@ -114,9 +115,9 @@ namespace Content.Server.Fluids.Components return false; } - if (_sound != null) + if (_sound.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _sound, Owner); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner); } return true; diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs index fa0c7ec11e..52c45cb1ad 100644 --- a/Content.Server/Fluids/Components/MopComponent.cs +++ b/Content.Server/Fluids/Components/MopComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -54,7 +55,7 @@ namespace Content.Server.Fluids.Components public ReagentUnit PickupAmount { get; } = ReagentUnit.New(5); [DataField("pickup_sound")] - private string? _pickupSound = "/Audio/Effects/Fluids/slosh.ogg"; + private SoundSpecifier _pickupSound = new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg"); /// /// Multiplier for the do_after delay for how fast the mop works. @@ -163,9 +164,9 @@ namespace Content.Server.Fluids.Components contents.SplitSolution(transferAmount); } - if (!string.IsNullOrWhiteSpace(_pickupSound)) + if (_pickupSound.TryGetSound(out var pickupSound)) { - SoundSystem.Play(Filter.Pvs(Owner), _pickupSound, Owner); + SoundSystem.Play(Filter.Pvs(Owner), pickupSound, Owner); } return true; diff --git a/Content.Server/Fluids/Components/PuddleComponent.cs b/Content.Server/Fluids/Components/PuddleComponent.cs index b54d4bdba0..103b733267 100644 --- a/Content.Server/Fluids/Components/PuddleComponent.cs +++ b/Content.Server/Fluids/Components/PuddleComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Examine; using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Slippery; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -71,7 +72,7 @@ namespace Content.Server.Fluids.Components public float EvaporateTime { get; private set; } = 5f; [DataField("spill_sound")] - private string _spillSound = "/Audio/Effects/Fluids/splat.ogg"; + private SoundSpecifier _spillSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg"); /// /// Whether or not this puddle is currently overflowing onto its neighbors @@ -189,7 +190,8 @@ namespace Content.Server.Fluids.Components return true; } - SoundSystem.Play(Filter.Pvs(Owner), _spillSound, Owner.Transform.Coordinates); + if(_spillSound.TryGetSound(out var spillSound)) + SoundSystem.Play(Filter.Pvs(Owner), spillSound, Owner.Transform.Coordinates); return true; } diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index a843ba0bbc..105f4537e2 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/Content.Server/Fluids/Components/SprayComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Fluids; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Vapor; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -35,8 +36,6 @@ namespace Content.Server.Fluids.Components [DataField("transferAmount")] private ReagentUnit _transferAmount = ReagentUnit.New(10); - [DataField("spraySound")] - private string? _spraySound; [DataField("sprayVelocity")] private float _sprayVelocity = 1.5f; [DataField("sprayAliveTime")] @@ -78,7 +77,8 @@ namespace Content.Server.Fluids.Components set => _sprayVelocity = value; } - public string? SpraySound => _spraySound; + [DataField("spraySound")] + public SoundSpecifier SpraySound { get; } = default!; public ReagentUnit CurrentVolume => Owner.GetComponentOrNull()?.CurrentVolume ?? ReagentUnit.Zero; @@ -172,9 +172,9 @@ namespace Content.Server.Fluids.Components } //Play sound - if (!string.IsNullOrEmpty(_spraySound)) + if (SpraySound.TryGetSound(out var spraySound)) { - SoundSystem.Play(Filter.Pvs(Owner), _spraySound, Owner, AudioHelpers.WithVariation(0.125f)); + SoundSystem.Play(Filter.Pvs(Owner), spraySound, Owner, AudioHelpers.WithVariation(0.125f)); } _lastUseTime = curTime; diff --git a/Content.Server/GameTicking/Rules/RuleSuspicion.cs b/Content.Server/GameTicking/Rules/RuleSuspicion.cs index 9b0bb0a5ce..e1080ef625 100644 --- a/Content.Server/GameTicking/Rules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/Rules/RuleSuspicion.cs @@ -9,6 +9,7 @@ using Content.Server.Suspicion.Roles; using Content.Shared; using Content.Shared.CCVar; using Content.Shared.MobState; +using Content.Shared.Sound; using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.Configuration; @@ -16,6 +17,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Timing; using Timer = Robust.Shared.Timing.Timer; @@ -33,6 +35,8 @@ namespace Content.Server.GameTicking.Rules [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IGameTiming _timing = default!; + [DataField("addedSound")] private SoundSpecifier _addedSound = new SoundPathSpecifier("/Audio/Misc/tatoralert.ogg"); + private readonly CancellationTokenSource _checkTimerCancel = new(); private TimeSpan _endTime; @@ -49,7 +53,9 @@ namespace Content.Server.GameTicking.Rules var filter = Filter.Empty() .AddWhere(session => ((IPlayerSession)session).ContentData()?.Mind?.HasRole() ?? false); - SoundSystem.Play(filter, "/Audio/Misc/tatoralert.ogg", AudioParams.Default); + + if(_addedSound.TryGetSound(out var addedSound)) + SoundSystem.Play(filter, addedSound, AudioParams.Default); EntitySystem.Get().EndTime = _endTime; EntitySystem.Get().AccessType = DoorSystem.AccessTypes.AllowAllNoExternal; diff --git a/Content.Server/GameTicking/Rules/RuleTraitor.cs b/Content.Server/GameTicking/Rules/RuleTraitor.cs index 4bf40c835c..ca697bc3d8 100644 --- a/Content.Server/GameTicking/Rules/RuleTraitor.cs +++ b/Content.Server/GameTicking/Rules/RuleTraitor.cs @@ -1,11 +1,13 @@ using Content.Server.Chat.Managers; using Content.Server.Players; using Content.Server.Traitor; +using Content.Shared.Sound; using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.GameTicking.Rules { @@ -13,13 +15,17 @@ namespace Content.Server.GameTicking.Rules { [Dependency] private readonly IChatManager _chatManager = default!; + [DataField("addedSound")] private SoundSpecifier _addedSound = new SoundPathSpecifier("/Audio/Misc/tatoralert.ogg"); + public override void Added() { _chatManager.DispatchServerAnnouncement(Loc.GetString("rule-traitor-added-announcement")); var filter = Filter.Empty() .AddWhere(session => ((IPlayerSession)session).ContentData()?.Mind?.HasRole() ?? false); - SoundSystem.Play(filter, "/Audio/Misc/tatoralert.ogg", AudioParams.Default); + + if(_addedSound.TryGetSound(out var addedSound)) + SoundSystem.Play(filter, addedSound, AudioParams.Default); } } } diff --git a/Content.Server/Gravity/EntitySystems/GravitySystem.cs b/Content.Server/Gravity/EntitySystems/GravitySystem.cs index 3141128599..92fa41fa92 100644 --- a/Content.Server/Gravity/EntitySystems/GravitySystem.cs +++ b/Content.Server/Gravity/EntitySystems/GravitySystem.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Camera; using Content.Shared.Gravity; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Server.Player; using Robust.Shared.Audio; @@ -108,7 +109,7 @@ namespace Content.Server.Gravity.EntitySystems comp.Enabled = true; var gridId = comp.Owner.Transform.GridID; - ScheduleGridToShake(gridId, ShakeTimes); + ScheduleGridToShake(gridId, ShakeTimes, comp); var message = new GravityChangedMessage(gridId, true); RaiseLocalEvent(message); @@ -120,13 +121,13 @@ namespace Content.Server.Gravity.EntitySystems comp.Enabled = false; var gridId = comp.Owner.Transform.GridID; - ScheduleGridToShake(gridId, ShakeTimes); + ScheduleGridToShake(gridId, ShakeTimes, comp); var message = new GravityChangedMessage(gridId, false); RaiseLocalEvent(message); } - private void ScheduleGridToShake(GridId gridId, uint shakeTimes) + private void ScheduleGridToShake(GridId gridId, uint shakeTimes, GravityComponent comp) { if (!_gridsToShake.Keys.Contains(gridId)) { @@ -140,8 +141,11 @@ namespace Content.Server.Gravity.EntitySystems foreach (var player in _playerManager.GetAllPlayers()) { if (player.AttachedEntity == null - || player.AttachedEntity.Transform.GridID != gridId) continue; - SoundSystem.Play(Filter.Pvs(player.AttachedEntity), "/Audio/Effects/alert.ogg", player.AttachedEntity); + || player.AttachedEntity.Transform.GridID != gridId) + continue; + + if(comp.GravityShakeSound.TryGetSound(out var gravityShakeSound)) + SoundSystem.Play(Filter.Pvs(player.AttachedEntity), gravityShakeSound, player.AttachedEntity); } } diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs index 61a4b53661..4a322cb525 100644 --- a/Content.Server/Hands/Components/HandsComponent.cs +++ b/Content.Server/Hands/Components/HandsComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Hands.Components; using Content.Shared.Notification.Managers; using Content.Shared.Physics.Pull; using Content.Shared.Pulling.Components; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -23,6 +24,7 @@ using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Players; +using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Hands.Components { @@ -34,6 +36,8 @@ namespace Content.Server.Hands.Components { [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [DataField("disarmedSound")] SoundSpecifier _disarmedSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg"); + int IDisarmedAct.Priority => int.MaxValue; // We want this to be the last disarm act to run. public override void HandleMessage(ComponentMessage message, IComponent? component) @@ -175,8 +179,8 @@ namespace Content.Server.Hands.Components if (source != null) { - SoundSystem.Play(Filter.Pvs(source), "/Audio/Effects/thudswoosh.ogg", source, - AudioHelpers.WithVariation(0.025f)); + if(_disarmedSound.TryGetSound(out var disarmedSound)) + SoundSystem.Play(Filter.Pvs(source), disarmedSound, source, AudioHelpers.WithVariation(0.025f)); if (target != null) { diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 8e5c27d0fd..7144e30f2f 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs @@ -161,8 +161,8 @@ namespace Content.Server.Kitchen.Components // TODO: Need to be able to leave them on the spike to do DoT, see ss13. victim.Delete(); - if (SpikeSound != null) - SoundSystem.Play(Filter.Pvs(Owner), SpikeSound, Owner); + if (SpikeSound.TryGetSound(out var spikeSound)) + SoundSystem.Play(Filter.Pvs(Owner), spikeSound, Owner); } SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat) diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index a6453558c5..f6132c1e96 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -24,6 +24,7 @@ using Content.Shared.Kitchen.Components; using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Content.Shared.Power; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -50,12 +51,14 @@ namespace Content.Server.Kitchen.Components [DataField("failureResult")] private string _badRecipeName = "FoodBadRecipe"; [DataField("beginCookingSound")] - private string _startCookingSound = "/Audio/Machines/microwave_start_beep.ogg"; + private SoundSpecifier _startCookingSound = new SoundPathSpecifier("/Audio/Machines/microwave_start_beep.ogg"); [DataField("foodDoneSound")] - private string _cookingCompleteSound = "/Audio/Machines/microwave_done_beep.ogg"; -#endregion + private SoundSpecifier _cookingCompleteSound = new SoundPathSpecifier("/Audio/Machines/microwave_done_beep.ogg"); + [DataField("clickSound")] + private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + #endregion YAMLSERIALIZE -[ViewVariables] + [ViewVariables] private bool _busy = false; private bool _broken; @@ -335,7 +338,8 @@ namespace Content.Server.Kitchen.Components } SetAppearance(MicrowaveVisualState.Cooking); - SoundSystem.Play(Filter.Pvs(Owner), _startCookingSound, Owner, AudioParams.Default); + if(_startCookingSound.TryGetSound(out var startCookingSound)) + SoundSystem.Play(Filter.Pvs(Owner), startCookingSound, Owner, AudioParams.Default); Owner.SpawnTimer((int)(_currentCookTimerTime * _cookTimeMultiplier), (Action)(() => { if (_lostPower) @@ -362,7 +366,9 @@ namespace Content.Server.Kitchen.Components Owner.EntityManager.SpawnEntity(_badRecipeName, Owner.Transform.Coordinates); } } - SoundSystem.Play(Filter.Pvs(Owner), _cookingCompleteSound, Owner, AudioParams.Default.WithVolume(-1f)); + + if(_cookingCompleteSound.TryGetSound(out var cookingCompleteSound)) + SoundSystem.Play(Filter.Pvs(Owner), cookingCompleteSound, Owner, AudioParams.Default.WithVolume(-1f)); SetAppearance(MicrowaveVisualState.Idle); _busy = false; @@ -495,7 +501,8 @@ namespace Content.Server.Kitchen.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var clickSound)) + SoundSystem.Play(Filter.Pvs(Owner), clickSound, Owner,AudioParams.Default.WithVolume(-2f)); } SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat) diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index 4a9ff99166..c6e202cb63 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Kitchen.Components; using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; +using Content.Shared.Sound; using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -67,6 +68,9 @@ namespace Content.Server.Kitchen.Components //YAML serialization vars [ViewVariables(VVAccess.ReadWrite)] [DataField("chamberCapacity")] private int _storageCap = 16; [ViewVariables(VVAccess.ReadWrite)] [DataField("workTime")] private int _workTime = 3500; //3.5 seconds, completely arbitrary for now. + [DataField("clickSound")] private SoundSpecifier _clickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + [DataField("grindSound")] private SoundSpecifier _grindSound = new SoundPathSpecifier("/Audio/Machines/blender.ogg"); + [DataField("juiceSound")] private SoundSpecifier _juiceSound = new SoundPathSpecifier("/Audio/Machines/juicer.ogg"); protected override void Initialize() { @@ -163,7 +167,8 @@ namespace Content.Server.Kitchen.Components private void ClickSound() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_clickSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default.WithVolume(-2f)); } private void SetAppearance() @@ -327,7 +332,8 @@ namespace Content.Server.Kitchen.Components switch (program) { case GrinderProgram.Grind: - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/blender.ogg", Owner, AudioParams.Default); + if(_grindSound.TryGetSound(out var grindSound)) + SoundSystem.Play(Filter.Pvs(Owner), grindSound, Owner, AudioParams.Default); //Get each item inside the chamber and get the reagents it contains. Transfer those reagents to the beaker, given we have one in. Owner.SpawnTimer(_workTime, (Action) (() => { @@ -348,7 +354,8 @@ namespace Content.Server.Kitchen.Components break; case GrinderProgram.Juice: - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/juicer.ogg", Owner, AudioParams.Default); + if(_juiceSound.TryGetSound(out var juiceSound)) + SoundSystem.Play(Filter.Pvs(Owner), juiceSound, Owner, AudioParams.Default); Owner.SpawnTimer(_workTime, (Action) (() => { foreach (var item in _chamber.ContainedEntities.ToList()) diff --git a/Content.Server/Light/Components/ExpendableLightComponent.cs b/Content.Server/Light/Components/ExpendableLightComponent.cs index 1f1c4a9df5..0a834773e1 100644 --- a/Content.Server/Light/Components/ExpendableLightComponent.cs +++ b/Content.Server/Light/Components/ExpendableLightComponent.cs @@ -106,9 +106,9 @@ namespace Content.Server.Light.Components loopingSound.Play(LoopedSound, LoopedSoundParams); } - if (LitSound != string.Empty) + if (LitSound.TryGetSound(out var litSound)) { - SoundSystem.Play(Filter.Pvs(Owner), LitSound, Owner); + SoundSystem.Play(Filter.Pvs(Owner), litSound, Owner); } if (IconStateLit != string.Empty) @@ -126,9 +126,9 @@ namespace Content.Server.Light.Components default: case ExpendableLightState.Dead: - if (DieSound != string.Empty) + if (DieSound.TryGetSound(out var dieSound)) { - SoundSystem.Play(Filter.Pvs(Owner), DieSound, Owner); + SoundSystem.Play(Filter.Pvs(Owner), dieSound, Owner); } if (LoopedSound != string.Empty && Owner.TryGetComponent(out var loopSound)) diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index a2bc02aed3..35dc969031 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/Content.Server/Light/Components/HandheldLightComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Interaction.Events; using Content.Shared.Light.Component; using Content.Shared.Notification.Managers; using Content.Shared.Rounding; +using Content.Shared.Sound; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -46,9 +47,9 @@ namespace Content.Server.Light.Components [ViewVariables] protected override bool HasCell => _cellSlot.HasCell; - [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnSound")] public string? TurnOnSound = "/Audio/Items/flashlight_toggle.ogg"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnFailSound")] public string? TurnOnFailSound = "/Audio/Machines/button.ogg"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOffSound")] public string? TurnOffSound = "/Audio/Items/flashlight_toggle.ogg"; + [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnSound")] public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg"); + [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnFailSound")] public SoundSpecifier TurnOnFailSound = new SoundPathSpecifier("/Audio/Machines/button.ogg"); + [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOffSound")] public SoundSpecifier TurnOffSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg"); [ComponentDependency] private readonly ItemActionsComponent? _itemActions = null; @@ -120,9 +121,9 @@ namespace Content.Server.Light.Components UpdateLightAction(); Owner.EntityManager.EventBus.QueueEvent(EventSource.Local, new DeactivateHandheldLightMessage(this)); - if (makeNoise) + if (makeNoise && TurnOffSound.TryGetSound(out var turnOffSound)) { - if (TurnOffSound != null) SoundSystem.Play(Filter.Pvs(Owner), TurnOffSound, Owner); + SoundSystem.Play(Filter.Pvs(Owner), turnOffSound, Owner); } return true; @@ -137,7 +138,8 @@ namespace Content.Server.Light.Components if (Cell == null) { - if (TurnOnFailSound != null) SoundSystem.Play(Filter.Pvs(Owner), TurnOnFailSound, Owner); + if (TurnOnFailSound.TryGetSound(out var turnOnFailSound)) + SoundSystem.Play(Filter.Pvs(Owner), turnOnFailSound, Owner); Owner.PopupMessage(user, Loc.GetString("handheld-light-component-cell-missing-message")); UpdateLightAction(); return false; @@ -148,7 +150,8 @@ namespace Content.Server.Light.Components // Simple enough. if (Wattage > Cell.CurrentCharge) { - if (TurnOnFailSound != null) SoundSystem.Play(Filter.Pvs(Owner), TurnOnFailSound, Owner); + if (TurnOnFailSound.TryGetSound(out var turnOnFailSound)) + SoundSystem.Play(Filter.Pvs(Owner), turnOnFailSound, Owner); Owner.PopupMessage(user, Loc.GetString("handheld-light-component-cell-dead-message")); UpdateLightAction(); return false; @@ -159,7 +162,8 @@ namespace Content.Server.Light.Components SetState(true); Owner.EntityManager.EventBus.QueueEvent(EventSource.Local, new ActivateHandheldLightMessage(this)); - if (TurnOnSound != null) SoundSystem.Play(Filter.Pvs(Owner), TurnOnSound, Owner); + if (TurnOnSound.TryGetSound(out var turnOnSound)) + SoundSystem.Play(Filter.Pvs(Owner), turnOnSound, Owner); return true; } diff --git a/Content.Server/Light/Components/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs index 68d849a808..a00af4352d 100644 --- a/Content.Server/Light/Components/LightBulbComponent.cs +++ b/Content.Server/Light/Components/LightBulbComponent.cs @@ -2,6 +2,7 @@ using System; using Content.Shared.Acts; using Content.Shared.Audio; +using Content.Shared.Sound; using Content.Shared.Throwing; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -71,6 +72,9 @@ namespace Content.Server.Light.Components private int _powerUse = 40; public int PowerUse => _powerUse; + [DataField("breakSound")] + private SoundSpecifier _breakSound = new SoundCollectionSpecifier("GlassBreak"); + /// /// The current state of the light bulb. Invokes the OnLightBulbStateChange event when set. /// It also updates the bulb's sprite accordingly. @@ -129,10 +133,8 @@ namespace Content.Server.Light.Components public void PlayBreakSound() { - var soundCollection = _prototypeManager.Index("GlassBreak"); - var file = _random.Pick(soundCollection.PickFiles); - - SoundSystem.Play(Filter.Pvs(Owner), file, Owner); + if(_breakSound.TryGetSound(out var breakSound)) + SoundSystem.Play(Filter.Pvs(Owner), breakSound, Owner); } } } diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs index 670527effe..c3fffae599 100644 --- a/Content.Server/Light/Components/MatchstickComponent.cs +++ b/Content.Server/Light/Components/MatchstickComponent.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Smoking; +using Content.Shared.Sound; using Content.Shared.Temperature; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -30,7 +31,7 @@ namespace Content.Server.Light.Components /// /// Sound played when you ignite the matchstick. /// - [DataField("igniteSound")] private string? _igniteSound; + [DataField("igniteSound")] private SoundSpecifier _igniteSound = default!; /// /// Point light component. Gives matches a glow in dark effect. @@ -69,9 +70,9 @@ namespace Content.Server.Light.Components public void Ignite(IEntity user) { // Play Sound - if (!string.IsNullOrEmpty(_igniteSound)) + if (_igniteSound.TryGetSound(out var igniteSound)) { - SoundSystem.Play(Filter.Pvs(Owner), _igniteSound, Owner, + SoundSystem.Play(Filter.Pvs(Owner), igniteSound, Owner, AudioHelpers.WithVariation(0.125f).WithVolume(-0.125f)); } diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 3e5ecd5b19..c8a2401756 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Interaction; using Content.Shared.Light; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -49,6 +50,12 @@ namespace Content.Server.Light.Components private TimeSpan _lastThunk; private TimeSpan? _lastGhostBlink; + [DataField("burnHandSound")] + private SoundSpecifier _burnHandSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg"); + + [DataField("turnOnSound")] + private SoundSpecifier _turnOnSound = new SoundPathSpecifier("/Audio/Machines/light_tube_on.ogg"); + [DataField("hasLampOnSpawn")] private bool _hasLampOnSpawn = true; @@ -119,7 +126,8 @@ namespace Content.Server.Light.Components { Owner.PopupMessage(eventArgs.User, Loc.GetString("powered-light-component-burn-hand")); damageableComponent.ChangeDamage(DamageType.Heat, 20, false, Owner); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/lightburn.ogg", Owner); + if(_burnHandSound.TryGetSound(out var burnHandSound)) + SoundSystem.Play(Filter.Pvs(Owner), burnHandSound, Owner); } void Eject() @@ -221,7 +229,8 @@ namespace Content.Server.Light.Components if (time > _lastThunk + _thunkDelay) { _lastThunk = time; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f)); + if(_turnOnSound.TryGetSound(out var turnOnSound)) + SoundSystem.Play(Filter.Pvs(Owner), turnOnSound, Owner, AudioParams.Default.WithVolume(-10f)); } } else diff --git a/Content.Server/Mining/Components/AsteroidRockComponent.cs b/Content.Server/Mining/Components/AsteroidRockComponent.cs index 000c575fff..246f49ceee 100644 --- a/Content.Server/Mining/Components/AsteroidRockComponent.cs +++ b/Content.Server/Mining/Components/AsteroidRockComponent.cs @@ -34,14 +34,17 @@ namespace Content.Server.Mining.Components async Task IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) { var item = eventArgs.Using; - if (!item.TryGetComponent(out MeleeWeaponComponent? meleeWeaponComponent)) return false; + if (!item.TryGetComponent(out MeleeWeaponComponent? meleeWeaponComponent)) + return false; Owner.GetComponent().ChangeDamage(DamageType.Blunt, meleeWeaponComponent.Damage, false, item); - if (!item.TryGetComponent(out PickaxeComponent? pickaxeComponent)) return true; - if (!string.IsNullOrWhiteSpace(pickaxeComponent.MiningSound)) + if (!item.TryGetComponent(out PickaxeComponent? pickaxeComponent)) + return true; + + if (pickaxeComponent.MiningSound.TryGetSound(out var miningSound)) { - SoundSystem.Play(Filter.Pvs(Owner), pickaxeComponent.MiningSound, Owner, AudioParams.Default); + SoundSystem.Play(Filter.Pvs(Owner), miningSound, Owner, AudioParams.Default); } return true; } diff --git a/Content.Server/Mining/Components/PickaxeComponent.cs b/Content.Server/Mining/Components/PickaxeComponent.cs index 5d64163182..4d9638a184 100644 --- a/Content.Server/Mining/Components/PickaxeComponent.cs +++ b/Content.Server/Mining/Components/PickaxeComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; @@ -5,12 +6,13 @@ namespace Content.Server.Mining.Components { [RegisterComponent] public class PickaxeComponent : Component - { public override string Name => "Pickaxe"; + [DataField("miningSound")] - public string MiningSound = "/Audio/Items/Mining/pickaxe.ogg"; + public SoundSpecifier MiningSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Mining/pickaxe.ogg"); + [DataField("miningSpeedMultiplier")] - public float MiningSpeedMultiplier = 1f; + public float MiningSpeedMultiplier { get; set; } = 1f; } } diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index cd254c9e70..830d70ced8 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Morgue; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Standing; using Content.Shared.Verbs; using Robust.Server.Player; @@ -20,6 +21,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -34,6 +36,8 @@ namespace Content.Server.Morgue.Components { public override string Name => "CrematoriumEntityStorage"; + [DataField("cremateFinishSound")] private SoundSpecifier _cremateFinishSound = new SoundPathSpecifier("/Audio/Machines/ding.ogg"); + [ViewVariables] public bool Cooking { get; private set; } @@ -50,7 +54,7 @@ namespace Content.Server.Morgue.Components { if (Appearance.TryGetData(CrematoriumVisuals.Burning, out bool isBurning) && isBurning) { - message.AddMarkup(Loc.GetString("crematorium-entity-storage-component-on-examine-details-is-burning",("owner", Owner)) + "\n"); + message.AddMarkup(Loc.GetString("crematorium-entity-storage-component-on-examine-details-is-burning", ("owner", Owner)) + "\n"); } if (Appearance.TryGetData(MorgueVisuals.HasContents, out bool hasContents) && hasContents) @@ -68,7 +72,8 @@ namespace Content.Server.Morgue.Components { if (Cooking) { - if (!silent) Owner.PopupMessage(user, Loc.GetString("crematorium-entity-storage-component-is-cooking-safety-message")); + if (!silent) + Owner.PopupMessage(user, Loc.GetString("crematorium-entity-storage-component-is-cooking-safety-message")); return false; } return base.CanOpen(user, silent); @@ -116,7 +121,9 @@ namespace Content.Server.Morgue.Components TryOpenStorage(Owner); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/ding.ogg", Owner); + if (_cremateFinishSound.TryGetSound(out var cremateFinishSound)) + SoundSystem.Play(Filter.Pvs(Owner), cremateFinishSound, Owner); + }, _cremateCancelToken.Token); } diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index 5c6d77b47c..50ba5d47c2 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Interaction.Helpers; using Content.Shared.Morgue; using Content.Shared.Notification.Managers; using Content.Shared.Physics; +using Content.Shared.Sound; using Content.Shared.Standing; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -44,6 +45,9 @@ namespace Content.Server.Morgue.Components [DataField("doSoulBeep")] public bool DoSoulBeep = true; + [DataField("occupantHasSoulAlarmSound")] + private SoundSpecifier _occupantHasSoulAlarmSound = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); + [ViewVariables] [ComponentDependency] protected readonly AppearanceComponent? Appearance = null; @@ -56,13 +60,15 @@ namespace Content.Server.Morgue.Components public override Vector2 ContentsDumpPosition() { - if (_tray != null) return _tray.Transform.WorldPosition; + if (_tray != null) + return _tray.Transform.WorldPosition; return base.ContentsDumpPosition(); } protected override bool AddToContents(IEntity entity) { - if (entity.HasComponent() && !EntitySystem.Get().IsDown(entity)) return false; + if (entity.HasComponent() && !EntitySystem.Get().IsDown(entity)) + return false; return base.AddToContents(entity); } @@ -73,7 +79,8 @@ namespace Content.Server.Morgue.Components collisionMask: CollisionGroup.Impassable | CollisionGroup.VaultImpassable )) { - if(!silent) Owner.PopupMessage(user, Loc.GetString("morgue-entity-storage-component-cannot-open-no-space")); + if (!silent) + Owner.PopupMessage(user, Loc.GetString("morgue-entity-storage-component-cannot-open-no-space")); return false; } @@ -112,8 +119,10 @@ namespace Content.Server.Morgue.Components foreach (var entity in Contents.ContainedEntities) { count++; - if (!hasMob && entity.HasComponent()) hasMob = true; - if (!hasSoul && entity.TryGetComponent(out var actor) && actor.PlayerSession != null) hasSoul = true; + if (!hasMob && entity.HasComponent()) + hasMob = true; + if (!hasSoul && entity.TryGetComponent(out var actor) && actor.PlayerSession != null) + hasSoul = true; } Appearance?.SetData(MorgueVisuals.HasContents, count > 0); Appearance?.SetData(MorgueVisuals.HasMob, hasMob); @@ -138,8 +147,11 @@ namespace Content.Server.Morgue.Components { CheckContents(); - if(DoSoulBeep && Appearance !=null && Appearance.TryGetData(MorgueVisuals.HasSoul, out bool hasSoul) && hasSoul) - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg", Owner); + if (DoSoulBeep && Appearance != null && Appearance.TryGetData(MorgueVisuals.HasSoul, out bool hasSoul) && hasSoul && + _occupantHasSoulAlarmSound.TryGetSound(out var occupantHasSoulAlarmSound)) + { + SoundSystem.Play(Filter.Pvs(Owner), occupantHasSoulAlarmSound, Owner); + } } void IExamine.Examine(FormattedMessage message, bool inDetailsRange) @@ -159,7 +171,8 @@ namespace Content.Server.Morgue.Components else if (Appearance.TryGetData(MorgueVisuals.HasContents, out bool hasContents) && hasContents) { message.AddMarkup(Loc.GetString("morgue-entity-storage-component-on-examine-details-has-contents")); - } else + } + else { message.AddMarkup(Loc.GetString("morgue-entity-storage-component-on-examine-details-empty")); } diff --git a/Content.Server/Movement/Components/FootstepModifierComponent.cs b/Content.Server/Movement/Components/FootstepModifierComponent.cs index 10453c8f13..c61ec76cc3 100644 --- a/Content.Server/Movement/Components/FootstepModifierComponent.cs +++ b/Content.Server/Movement/Components/FootstepModifierComponent.cs @@ -1,10 +1,7 @@ -using Content.Shared.Audio; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Movement.Components @@ -15,23 +12,16 @@ namespace Content.Server.Movement.Components [RegisterComponent] public class FootstepModifierComponent : Component { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _footstepRandom = default!; - /// public override string Name => "FootstepModifier"; [DataField("footstepSoundCollection")] - public string? _soundCollectionName; + public SoundSpecifier _soundCollection = default!; public void PlayFootstep() { - if (!string.IsNullOrWhiteSpace(_soundCollectionName)) - { - var soundCollection = _prototypeManager.Index(_soundCollectionName); - var file = _footstepRandom.Pick(soundCollection.PickFiles); - SoundSystem.Play(Filter.Pvs(Owner), file, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2f)); - } + if (_soundCollection.TryGetSound(out var footstepSound)) + SoundSystem.Play(Filter.Pvs(Owner), footstepSound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2f)); } } } diff --git a/Content.Server/Nutrition/Components/CreamPieComponent.cs b/Content.Server/Nutrition/Components/CreamPieComponent.cs index 8d4c7ef9c5..e59a084fe5 100644 --- a/Content.Server/Nutrition/Components/CreamPieComponent.cs +++ b/Content.Server/Nutrition/Components/CreamPieComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Chemistry.Components; using Content.Server.Fluids.Components; using Content.Shared.Audio; +using Content.Shared.Sound; using Content.Shared.Throwing; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -19,10 +20,13 @@ namespace Content.Server.Nutrition.Components [DataField("paralyzeTime")] public float ParalyzeTime { get; set; } = 1f; + [DataField("sound")] + private SoundSpecifier _sound = new SoundCollectionSpecifier("desacration"); + public void PlaySound() { - SoundSystem.Play(Filter.Pvs(Owner), AudioHelpers.GetRandomFileFromSoundCollection("desecration"), Owner, - AudioHelpers.WithVariation(0.125f)); + if(_sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioHelpers.WithVariation(0.125f)); } void IThrowCollide.DoHit(ThrowCollideEventArgs eventArgs) diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index 62a05b7703..b659cbb30e 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Content.Shared.Nutrition.Components; +using Content.Shared.Sound; using Content.Shared.Throwing; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -46,7 +47,7 @@ namespace Content.Server.Nutrition.Components [ViewVariables] [DataField("useSound")] - private string _useSound = "/Audio/Items/drink.ogg"; + private SoundSpecifier _useSound = new SoundPathSpecifier("/Audio/Items/drink.ogg"); [ViewVariables] [DataField("isOpen")] @@ -75,11 +76,11 @@ namespace Content.Server.Nutrition.Components public bool Empty => Owner.GetComponentOrNull()?.DrainAvailable <= 0; [DataField("openSounds")] - private string _soundCollection = "canOpenSounds"; + private SoundSpecifier _openSounds = new SoundCollectionSpecifier("canOpenSounds"); [DataField("pressurized")] private bool _pressurized = default; [DataField("burstSound")] - private string _burstSound = "/Audio/Effects/flash_bang.ogg"; + private SoundSpecifier _burstSound = new SoundPathSpecifier("/Audio/Effects/flash_bang.ogg"); protected override void Initialize() { @@ -127,10 +128,9 @@ namespace Content.Server.Nutrition.Components if (!Opened) { //Do the opening stuff like playing the sounds. - var soundCollection = _prototypeManager.Index(_soundCollection); - var file = _random.Pick(soundCollection.PickFiles); + if(_openSounds.TryGetSound(out var openSound)) + SoundSystem.Play(Filter.Pvs(args.User), openSound, args.User, AudioParams.Default); - SoundSystem.Play(Filter.Pvs(args.User), file, args.User, AudioParams.Default); Opened = true; return false; } @@ -220,9 +220,9 @@ namespace Content.Server.Nutrition.Components return false; } - if (!string.IsNullOrEmpty(_useSound)) + if (_useSound.TryGetSound(out var useSound)) { - SoundSystem.Play(Filter.Pvs(target), _useSound, target, AudioParams.Default.WithVolume(-2f)); + SoundSystem.Play(Filter.Pvs(target), useSound, target, AudioParams.Default.WithVolume(-2f)); } target.PopupMessage(Loc.GetString("drink-component-try-use-drink-success-slurp")); @@ -254,8 +254,8 @@ namespace Content.Server.Nutrition.Components var solution = interactions.Drain(interactions.DrainAvailable); solution.SpillAt(Owner, "PuddleSmear"); - SoundSystem.Play(Filter.Pvs(Owner), _burstSound, Owner, - AudioParams.Default.WithVolume(-4)); + if(_burstSound.TryGetSound(out var burstSound)) + SoundSystem.Play(Filter.Pvs(Owner), burstSound, Owner, AudioParams.Default.WithVolume(-4)); } } } diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 161e9e426e..00f0fd3fe5 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -30,7 +31,7 @@ namespace Content.Server.Nutrition.Components { public override string Name => "Food"; - [ViewVariables] [DataField("useSound")] protected virtual string? UseSound { get; set; } = "/Audio/Items/eatfood.ogg"; + [ViewVariables] [DataField("useSound")] protected virtual SoundSpecifier UseSound { get; set; } = new SoundPathSpecifier("/Audio/Items/eatfood.ogg"); [ViewVariables] [DataField("trash", customTypeSerializer: typeof(PrototypeIdSerializer))] protected virtual string? TrashPrototype { get; set; } @@ -160,9 +161,9 @@ namespace Content.Server.Nutrition.Components firstStomach.TryTransferSolution(split); - if (UseSound != null) + if (UseSound.TryGetSound(out var useSound)) { - SoundSystem.Play(Filter.Pvs(trueTarget), UseSound, trueTarget, AudioParams.Default.WithVolume(-1f)); + SoundSystem.Play(Filter.Pvs(trueTarget), useSound, trueTarget, AudioParams.Default.WithVolume(-1f)); } trueTarget.PopupMessage(user, Loc.GetString("food-nom")); diff --git a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs index 32733e65c1..cc1f4502e2 100644 --- a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs +++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Items; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; @@ -27,7 +28,7 @@ namespace Content.Server.Nutrition.Components private string _slice = string.Empty; [DataField("sound")] [ViewVariables(VVAccess.ReadWrite)] - private string _sound = "/Audio/Items/Culinary/chop.ogg"; + private SoundSpecifier _sound = new SoundPathSpecifier("/Audio/Items/Culinary/chop.ogg"); [DataField("count")] [ViewVariables(VVAccess.ReadWrite)] private ushort _totalCount = 5; @@ -66,8 +67,9 @@ namespace Content.Server.Nutrition.Components } } - SoundSystem.Play(Filter.Pvs(Owner), _sound, Owner.Transform.Coordinates, - AudioParams.Default.WithVolume(-2)); + if(_sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, + AudioParams.Default.WithVolume(-2)); Count--; if (Count < 1) diff --git a/Content.Server/Nutrition/Components/UtensilComponent.cs b/Content.Server/Nutrition/Components/UtensilComponent.cs index ca243f04af..e705e1231a 100644 --- a/Content.Server/Nutrition/Components/UtensilComponent.cs +++ b/Content.Server/Nutrition/Components/UtensilComponent.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -47,7 +48,7 @@ namespace Content.Server.Nutrition.Components /// [ViewVariables] [DataField("breakSound")] - private string? _breakSound = "/Audio/Items/snap.ogg"; + private SoundSpecifier _breakSound = new SoundPathSpecifier("/Audio/Items/snap.ogg"); public void AddType(UtensilType type) { @@ -71,9 +72,9 @@ namespace Content.Server.Nutrition.Components internal void TryBreak(IEntity user) { - if (_breakSound != null && IoCManager.Resolve().Prob(_breakChance)) + if (_breakSound.TryGetSound(out var breakSound) && IoCManager.Resolve().Prob(_breakChance)) { - SoundSystem.Play(Filter.Pvs(user), _breakSound, user, AudioParams.Default.WithVolume(-2f)); + SoundSystem.Play(Filter.Pvs(user), breakSound, user, AudioParams.Default.WithVolume(-2f)); Owner.Delete(); } } diff --git a/Content.Server/PDA/PDAComponent.cs b/Content.Server/PDA/PDAComponent.cs index 0b01d5ed7d..fd3b6864ee 100644 --- a/Content.Server/PDA/PDAComponent.cs +++ b/Content.Server/PDA/PDAComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; using Content.Shared.PDA; +using Content.Shared.Sound; using Content.Shared.Tag; using Content.Shared.Verbs; using Robust.Server.GameObjects; @@ -59,6 +60,10 @@ namespace Content.Server.PDA [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(PDAUiKey.Key); + [DataField("insertIdSound")] private SoundSpecifier _insertIdSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg"); + [DataField("toggleFlashlightSound")] private SoundSpecifier _toggleFlashlightSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg"); + [DataField("ejectIdSound")] private SoundSpecifier _ejectIdSound = new SoundPathSpecifier("/Audio/Machines/id_swipe.ogg"); + public PDAComponent() { _accessSet = new PdaAccessSet(this); @@ -301,7 +306,8 @@ namespace Content.Server.PDA { _idSlot.Insert(card.Owner); ContainedID = card; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg", Owner); + if(_insertIdSound.TryGetSound(out var insertIdSound)) + SoundSystem.Play(Filter.Pvs(Owner), insertIdSound, Owner); } /// @@ -330,7 +336,8 @@ namespace Content.Server.PDA _lightOn = !_lightOn; light.Enabled = _lightOn; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Items/flashlight_toggle.ogg", Owner); + if(_toggleFlashlightSound.TryGetSound(out var toggleFlashlightSound)) + SoundSystem.Play(Filter.Pvs(Owner), toggleFlashlightSound, Owner); UpdatePDAUserInterface(); } @@ -349,7 +356,8 @@ namespace Content.Server.PDA hands.PutInHandOrDrop(cardItemComponent); ContainedID = null; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/id_swipe.ogg", Owner); + if(_ejectIdSound.TryGetSound(out var ejectIdSound)) + SoundSystem.Play(Filter.Pvs(Owner), ejectIdSound, Owner); UpdatePDAUserInterface(); } diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index e3f24a800f..0ec5a812fe 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -9,6 +9,7 @@ using Content.Shared.Inventory; using Content.Shared.Maps; using Content.Shared.Movement; using Content.Shared.Movement.Components; +using Content.Shared.Sound; using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -154,38 +155,37 @@ namespace Content.Server.Physics.Controllers // If the coordinates have a FootstepModifier component // i.e. component that emit sound on footsteps emit that sound - string? soundCollectionName = null; + string? soundToPlay = null; foreach (var maybeFootstep in grid.GetAnchoredEntities(tile.GridIndices)) { - if (EntityManager.ComponentManager.TryGetComponent(maybeFootstep, out FootstepModifierComponent? footstep)) + if (EntityManager.ComponentManager.TryGetComponent(maybeFootstep, out FootstepModifierComponent? footstep) && + footstep._soundCollection.TryGetSound(out var footstepSound)) { - soundCollectionName = footstep._soundCollectionName; + soundToPlay = footstepSound; break; } } // if there is no FootstepModifierComponent, determine sound based on tiles - if (soundCollectionName == null) + if (soundToPlay == null) { // Walking on a tile. var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId]; - if (string.IsNullOrEmpty(def.FootstepSounds)) + if (def.FootstepSounds.TryGetSound(out var footstepSound)) { - // Nothing to play, oh well. + soundToPlay = footstepSound; return; - } - - soundCollectionName = def.FootstepSounds; + } } - if (!_prototypeManager.TryIndex(soundCollectionName, out SoundCollectionPrototype? soundCollection)) + if (string.IsNullOrWhiteSpace(soundToPlay)) { - Logger.ErrorS("sound", $"Unable to find sound collection for {soundCollectionName}"); + Logger.ErrorS("sound", $"Unable to find sound in {nameof(PlayFootstepSound)}"); return; } SoundSystem.Play( Filter.Pvs(coordinates), - _robustRandom.Pick(soundCollection.PickFiles), + soundToPlay, mover.Transform.Coordinates, sprinting ? AudioParams.Default.WithVolume(0.75f) : null); } diff --git a/Content.Server/Plants/Components/PottedPlantHideComponent.cs b/Content.Server/Plants/Components/PottedPlantHideComponent.cs index 13efc18346..2a64e494c4 100644 --- a/Content.Server/Plants/Components/PottedPlantHideComponent.cs +++ b/Content.Server/Plants/Components/PottedPlantHideComponent.cs @@ -4,10 +4,12 @@ using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.Plants.Components @@ -18,6 +20,7 @@ namespace Content.Server.Plants.Components public override string Name => "PottedPlantHide"; [ViewVariables] private SecretStashComponent _secretStash = default!; + [DataField("rustleSound")] private SoundSpecifier _rustleSound = new SoundPathSpecifier("/Audio/Effects/plant_rustle.ogg"); protected override void Initialize() { @@ -46,7 +49,8 @@ namespace Content.Server.Plants.Components private void Rustle() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f)); + if(_rustleSound.TryGetSound(out var rustleSound)) + SoundSystem.Play(Filter.Pvs(Owner), rustleSound, Owner, AudioHelpers.WithVariation(0.25f)); } } } diff --git a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs index 7ce21d39ea..d065e65db6 100644 --- a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs +++ b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs @@ -2,6 +2,7 @@ using System.Linq; using Content.Server.Explosion; using Content.Shared.Pointing.Components; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Audio; @@ -41,6 +42,9 @@ namespace Content.Server.Pointing.Components [DataField("chasingTime")] private float _chasingTime = 1; + [DataField("explosionSound")] + private SoundSpecifier _explosionSound = new SoundPathSpecifier("/Audio/Effects/explosion.ogg"); + private IEntity? RandomNearbyPlayer() { var players = _playerManager @@ -120,7 +124,8 @@ namespace Content.Server.Pointing.Components } Owner.SpawnExplosion(0, 2, 1, 1); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/explosion.ogg", Owner); + if(_explosionSound.TryGetSound(out var explosionSound)) + SoundSystem.Play(Filter.Pvs(Owner), explosionSound, Owner); Owner.Delete(); } diff --git a/Content.Server/Portal/Components/PortalComponent.cs b/Content.Server/Portal/Components/PortalComponent.cs index ada1fa19ce..a4581eda43 100644 --- a/Content.Server/Portal/Components/PortalComponent.cs +++ b/Content.Server/Portal/Components/PortalComponent.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using Content.Shared.Portal.Components; +using Content.Shared.Sound; using Content.Shared.Tag; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -28,8 +29,8 @@ namespace Content.Server.Portal.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("individual_cooldown")] private float _individualPortalCooldown = 2.1f; [ViewVariables] [DataField("overall_cooldown")] private float _overallPortalCooldown = 2.0f; [ViewVariables] private bool _onCooldown; - [ViewVariables] [DataField("departure_sound")] private string _departureSound = "/Audio/Effects/teleport_departure.ogg"; - [ViewVariables] [DataField("arrival_sound")] private string _arrivalSound = "/Audio/Effects/teleport_arrival.ogg"; + [ViewVariables] [DataField("departure_sound")] private SoundSpecifier _departureSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg"); + [ViewVariables] [DataField("arrival_sound")] private SoundSpecifier _arrivalSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg"); public readonly List ImmuneEntities = new(); // K [ViewVariables(VVAccess.ReadWrite)] [DataField("alive_time")] private float _aliveTime = 10f; @@ -143,9 +144,11 @@ namespace Content.Server.Portal.Components // Departure // Do we need to rate-limit sounds to stop ear BLAST? - SoundSystem.Play(Filter.Pvs(entity), _departureSound, entity.Transform.Coordinates); + if(_departureSound.TryGetSound(out var departureSound)) + SoundSystem.Play(Filter.Pvs(entity), departureSound, entity.Transform.Coordinates); entity.Transform.Coordinates = position; - SoundSystem.Play(Filter.Pvs(entity), _arrivalSound, entity.Transform.Coordinates); + if(_arrivalSound.TryGetSound(out var arrivalSound)) + SoundSystem.Play(Filter.Pvs(entity), arrivalSound, entity.Transform.Coordinates); TryChangeState(PortalState.RecentlyTeleported); // To stop spam teleporting. Could potentially look at adding a timer to flush this from the portal diff --git a/Content.Server/Portal/Components/TeleporterComponent.cs b/Content.Server/Portal/Components/TeleporterComponent.cs index b066c2cd22..7d945943e7 100644 --- a/Content.Server/Portal/Components/TeleporterComponent.cs +++ b/Content.Server/Portal/Components/TeleporterComponent.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Content.Shared.Interaction; using Content.Shared.Portal.Components; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -38,9 +39,9 @@ namespace Content.Server.Portal.Components [ViewVariables] private ItemTeleporterState _state; [DataField("teleporter_type")] [ViewVariables] private TeleporterType _teleporterType = TeleporterType.Random; - [ViewVariables] [DataField("departure_sound")] private string _departureSound = "/Audio/Effects/teleport_departure.ogg"; - [ViewVariables] [DataField("arrival_sound")] private string _arrivalSound = "/Audio/Effects/teleport_arrival.ogg"; - [ViewVariables] [DataField("cooldown_sound")] private string? _cooldownSound = default; + [ViewVariables] [DataField("departure_sound")] private SoundSpecifier _departureSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg"); + [ViewVariables] [DataField("arrival_sound")] private SoundSpecifier _arrivalSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg"); + [ViewVariables] [DataField("cooldown_sound")] private SoundSpecifier _cooldownSound = default!; // If the direct OR random teleport will try to avoid hitting collidables [DataField("avoid_walls")] [ViewVariables] private bool _avoidCollidable = true; @@ -124,9 +125,9 @@ namespace Content.Server.Portal.Components { SetState(ItemTeleporterState.Cooldown); Owner.SpawnTimer(TimeSpan.FromSeconds(_chargeTime + _cooldown), () => SetState(ItemTeleporterState.Off)); - if (_cooldownSound != null) + if (_cooldownSound.TryGetSound(out var cooldownSound)) { - SoundSystem.Play(Filter.Pvs(Owner), _cooldownSound, Owner); + SoundSystem.Play(Filter.Pvs(Owner), cooldownSound, Owner); } } @@ -229,12 +230,14 @@ namespace Content.Server.Portal.Components else { // Departure - SoundSystem.Play(Filter.Pvs(user), _departureSound, user.Transform.Coordinates); + if(_departureSound.TryGetSound(out var departureSound)) + SoundSystem.Play(Filter.Pvs(user), departureSound, user.Transform.Coordinates); // Arrival user.Transform.AttachToGridOrMap(); user.Transform.WorldPosition = vector; - SoundSystem.Play(Filter.Pvs(user), _arrivalSound, user.Transform.Coordinates); + if(_arrivalSound.TryGetSound(out var arrivalSound)) + SoundSystem.Play(Filter.Pvs(user), arrivalSound, user.Transform.Coordinates); } } } diff --git a/Content.Server/Power/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs index 5182551775..22a997a8ba 100644 --- a/Content.Server/Power/Components/ApcComponent.cs +++ b/Content.Server/Power/Components/ApcComponent.cs @@ -6,6 +6,7 @@ using Content.Server.UserInterface; using Content.Shared.APC; using Content.Shared.Interaction; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -13,6 +14,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Player; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; @@ -28,6 +30,8 @@ namespace Content.Server.Power.Components public bool MainBreakerEnabled { get; private set; } = true; + [DataField("onReceiveMessageSound")] private SoundSpecifier _onReceiveMessageSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + private ApcChargeState _lastChargeState; private TimeSpan _lastChargeStateChange; @@ -90,7 +94,8 @@ namespace Content.Server.Power.Components Owner.GetComponent().CanDischarge = MainBreakerEnabled; _uiDirty = true; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + if(_onReceiveMessageSound.TryGetSound(out var onReceiveMessageSound)) + SoundSystem.Play(Filter.Pvs(Owner), onReceiveMessageSound, Owner, AudioParams.Default.WithVolume(-2f)); } else { diff --git a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs index 5423f01441..990ffd3695 100644 --- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Audio; using Content.Shared.Examine; using Content.Shared.Interaction.Events; +using Content.Shared.Sound; using Content.Shared.Verbs; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -63,7 +64,7 @@ namespace Content.Server.PowerCell.Components /// "/Audio/Items/pistol_magout.ogg" [ViewVariables(VVAccess.ReadWrite)] [DataField("cellRemoveSound")] - public string? CellRemoveSound { get; set; } = "/Audio/Items/pistol_magin.ogg"; + public SoundSpecifier CellRemoveSound { get; set; } = new SoundPathSpecifier("/Audio/Items/pistol_magin.ogg"); /// /// File path to a sound file that should be played when a cell is inserted. @@ -71,7 +72,7 @@ namespace Content.Server.PowerCell.Components /// "/Audio/Items/pistol_magin.ogg" [ViewVariables(VVAccess.ReadWrite)] [DataField("cellInsertSound")] - public string? CellInsertSound { get; set; } = "/Audio/Items/pistol_magout.ogg"; + public SoundSpecifier CellInsertSound { get; set; } = new SoundPathSpecifier("/Audio/Items/pistol_magout.ogg"); [ViewVariables] private ContainerSlot _cellContainer = default!; @@ -144,9 +145,9 @@ namespace Content.Server.PowerCell.Components cell.Owner.Transform.Coordinates = Owner.Transform.Coordinates; } - if (playSound && CellRemoveSound != null) + if (playSound && CellRemoveSound.TryGetSound(out var cellRemoveSound)) { - SoundSystem.Play(Filter.Pvs(Owner), CellRemoveSound, Owner, AudioHelpers.WithVariation(0.125f)); + SoundSystem.Play(Filter.Pvs(Owner), cellRemoveSound, Owner, AudioHelpers.WithVariation(0.125f)); } Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerCellChangedEvent(true), false); @@ -167,9 +168,9 @@ namespace Content.Server.PowerCell.Components if (cellComponent.CellSize != SlotSize) return false; if (!_cellContainer.Insert(cell)) return false; //Dirty(); - if (playSound && CellInsertSound != null) + if (playSound && CellInsertSound.TryGetSound(out var cellInsertSound)) { - SoundSystem.Play(Filter.Pvs(Owner), CellInsertSound, Owner, AudioHelpers.WithVariation(0.125f)); + SoundSystem.Play(Filter.Pvs(Owner), cellInsertSound, Owner, AudioHelpers.WithVariation(0.125f)); } Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerCellChangedEvent(false), false); diff --git a/Content.Server/Projectiles/Components/HitscanComponent.cs b/Content.Server/Projectiles/Components/HitscanComponent.cs index e4ebd554e6..073ed091e6 100644 --- a/Content.Server/Projectiles/Components/HitscanComponent.cs +++ b/Content.Server/Projectiles/Components/HitscanComponent.cs @@ -1,6 +1,7 @@ using System; using Content.Shared.Damage; using Content.Shared.Physics; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -50,7 +51,7 @@ namespace Content.Server.Projectiles.Components [DataField("impactFlash")] private string? _impactFlash; [DataField("soundHitWall")] - private string _soundHitWall = "/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg"; + private SoundSpecifier _soundHitWall = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg"); public void FireEffects(IEntity user, float distance, Angle angle, IEntity? hitEntity = null) { @@ -85,7 +86,8 @@ namespace Content.Server.Projectiles.Components // TODO: No wall component so ? var offset = angle.ToVec().Normalized / 2; var coordinates = user.Transform.Coordinates.Offset(offset); - SoundSystem.Play(Filter.Pvs(coordinates), _soundHitWall, coordinates); + if(_soundHitWall.TryGetSound(out var soundHitWall)) + SoundSystem.Play(Filter.Pvs(coordinates), soundHitWall, coordinates); } Owner.SpawnTimer((int) _deathTime.TotalMilliseconds, () => diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs index ef41b8b735..d5bef34248 100644 --- a/Content.Server/Projectiles/Components/ProjectileComponent.cs +++ b/Content.Server/Projectiles/Components/ProjectileComponent.cs @@ -1,8 +1,9 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Camera; using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.Projectiles; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Physics.Collision; @@ -33,9 +34,7 @@ namespace Content.Server.Projectiles.Components // Get that juicy FPS hit sound [DataField("soundHit")] - private string? _soundHit = default; - [DataField("soundHitSpecies")] - private string? _soundHitSpecies = default; + private SoundSpecifier _soundHit = default!; private bool _damagedEntity; @@ -64,13 +63,9 @@ namespace Content.Server.Projectiles.Components var coordinates = otherFixture.Body.Owner.Transform.Coordinates; var playerFilter = Filter.Pvs(coordinates); - if (otherFixture.Body.Owner.TryGetComponent(out IDamageableComponent? damage) && _soundHitSpecies != null) + if (otherFixture.Body.Owner.TryGetComponent(out IDamageableComponent? damage) && _soundHit.TryGetSound(out var soundHit)) { - SoundSystem.Play(playerFilter, _soundHitSpecies, coordinates); - } - else if (_soundHit != null) - { - SoundSystem.Play(playerFilter, _soundHit, coordinates); + SoundSystem.Play(playerFilter, soundHit, coordinates); } if (damage != null) diff --git a/Content.Server/RCD/Components/RCDComponent.cs b/Content.Server/RCD/Components/RCDComponent.cs index 1f6f229023..bde50fec51 100644 --- a/Content.Server/RCD/Components/RCDComponent.cs +++ b/Content.Server/RCD/Components/RCDComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Interaction.Helpers; using Content.Shared.Maps; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -38,6 +39,12 @@ namespace Content.Server.RCD.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("delay")] private float _delay = 2f; private DoAfterSystem _doAfterSystem = default!; + [DataField("swapModeSound")] + private SoundSpecifier _swapModeSound = new SoundPathSpecifier("/Audio/Items/genhit.ogg"); + + [DataField("successSound")] + private SoundSpecifier _successSound = new SoundPathSpecifier("/Audio/Items/deconstruct.ogg"); + ///Enum to store the different mode states for clarity. private enum RcdMode { @@ -70,8 +77,9 @@ namespace Content.Server.RCD.Components public void SwapMode(UseEntityEventArgs eventArgs) { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Items/genhit.ogg", Owner); - int mode = (int) _mode; //Firstly, cast our RCDmode mode to an int (enums are backed by ints anyway by default) + if(_swapModeSound.TryGetSound(out var swapModeSound)) + SoundSystem.Play(Filter.Pvs(Owner), swapModeSound, Owner); + var mode = (int) _mode; //Firstly, cast our RCDmode mode to an int (enums are backed by ints anyway by default) mode = (++mode) % _modes.Length; //Then, do a rollover on the value so it doesnt hit an invalid state _mode = (RcdMode) mode; //Finally, cast the newly acquired int mode to an RCDmode so we can use it. Owner.PopupMessage(eventArgs.User, @@ -155,7 +163,8 @@ namespace Content.Server.RCD.Components return true; //I don't know why this would happen, but sure I guess. Get out of here invalid state! } - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Items/deconstruct.ogg", Owner); + if(_successSound.TryGetSound(out var successSound)) + SoundSystem.Play(Filter.Pvs(Owner), successSound, Owner); _ammo--; return true; } diff --git a/Content.Server/Radiation/RadiationPulseComponent.cs b/Content.Server/Radiation/RadiationPulseComponent.cs index 5101397ee2..e5851f600e 100644 --- a/Content.Server/Radiation/RadiationPulseComponent.cs +++ b/Content.Server/Radiation/RadiationPulseComponent.cs @@ -1,5 +1,6 @@ using System; using Content.Shared.Radiation; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -57,7 +58,7 @@ namespace Content.Server.Radiation } } - [DataField("sound")] public string? Sound { get; set; } = "/Audio/Weapons/Guns/Gunshots/laser3.ogg"; + [DataField("sound")] public SoundSpecifier Sound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/laser3.ogg"); [DataField("range")] public override float Range @@ -92,8 +93,8 @@ namespace Content.Server.Radiation _endTime = currentTime + TimeSpan.FromSeconds(_duration); } - if(!string.IsNullOrEmpty(Sound)) - SoundSystem.Play(Filter.Pvs(Owner), Sound, Owner.Transform.Coordinates); + if(Sound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates); Dirty(); } diff --git a/Content.Server/Radiation/RadiationPulseSystem.cs b/Content.Server/Radiation/RadiationPulseSystem.cs index 96b14b5db1..b00939b334 100644 --- a/Content.Server/Radiation/RadiationPulseSystem.cs +++ b/Content.Server/Radiation/RadiationPulseSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Shared.Radiation; +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -19,7 +20,7 @@ namespace Content.Server.Radiation bool decay = true, float minPulseLifespan = 0.8f, float maxPulseLifespan = 2.5f, - string? sound = null) + SoundSpecifier sound = default!) { var radiationEntity = EntityManager.SpawnEntity(RadiationPrototype, coordinates); var radiation = radiationEntity.GetComponent(); diff --git a/Content.Server/Research/Components/ResearchConsoleComponent.cs b/Content.Server/Research/Components/ResearchConsoleComponent.cs index da1dea4ff9..5952c07dba 100644 --- a/Content.Server/Research/Components/ResearchConsoleComponent.cs +++ b/Content.Server/Research/Components/ResearchConsoleComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Research.Components; using Content.Shared.Research.Prototypes; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Audio; @@ -13,6 +14,7 @@ using Robust.Shared.IoC; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.Research.Components @@ -24,7 +26,8 @@ namespace Content.Server.Research.Components [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; - private const string SoundCollectionName = "keyboard"; + [DataField("sound")] + private SoundSpecifier _soundCollectionName = new SoundCollectionSpecifier("keyboard"); [ViewVariables] private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; @@ -123,9 +126,8 @@ namespace Content.Server.Research.Components private void PlayKeyboardSound() { - var soundCollection = _prototypeManager.Index(SoundCollectionName); - var file = _random.Pick(soundCollection.PickFiles); - SoundSystem.Play(Filter.Pvs(Owner), file,Owner,AudioParams.Default); + if (_soundCollectionName.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default); } } } diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index 2e52ae73f8..87a6c96c9d 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -127,7 +127,7 @@ namespace Content.Server.RoundEnd private void EndRound() { OnRoundEndCountdownFinished?.Invoke(); - var gameTicker = EntitySystem.Get(); + var gameTicker = Get(); gameTicker.EndRound(); _chatManager.DispatchServerAnnouncement(Loc.GetString("round-end-system-round-restart-eta-announcement", ("seconds", RestartRoundTime))); diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs index cf87e7955c..a6867aa84c 100644 --- a/Content.Server/Singularity/Components/EmitterComponent.cs +++ b/Content.Server/Singularity/Components/EmitterComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Interaction; using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Content.Shared.Singularity.Components; +using Content.Shared.Sound; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -56,7 +57,7 @@ namespace Content.Server.Singularity.Components [ViewVariables(VVAccess.ReadWrite)] private int _fireShotCounter; - [ViewVariables(VVAccess.ReadWrite)] [DataField("fireSound")] private string _fireSound = "/Audio/Weapons/emitter.ogg"; + [ViewVariables(VVAccess.ReadWrite)] [DataField("fireSound")] private SoundSpecifier _fireSound = new SoundPathSpecifier("/Audio/Weapons/emitter.ogg"); [ViewVariables(VVAccess.ReadWrite)] [DataField("boltType")] private string _boltType = "EmitterBolt"; [ViewVariables(VVAccess.ReadWrite)] [DataField("powerUseActive")] private int _powerUseActive = 500; [ViewVariables(VVAccess.ReadWrite)] [DataField("fireBurstSize")] private int _fireBurstSize = 3; @@ -227,8 +228,9 @@ namespace Content.Server.Singularity.Components // TODO: Move to projectile's code. Timer.Spawn(3000, () => projectile.Delete()); - SoundSystem.Play(Filter.Pvs(Owner), _fireSound, Owner, - AudioHelpers.WithVariation(Variation).WithVolume(Volume).WithMaxDistance(Distance)); + if(_fireSound.TryGetSound(out var fireSound)) + SoundSystem.Play(Filter.Pvs(Owner), fireSound, Owner, + AudioHelpers.WithVariation(Variation).WithVolume(Volume).WithMaxDistance(Distance)); } private void UpdateAppearance() diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs index 2588e68c1e..3cc65e74e7 100644 --- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs +++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs @@ -1,6 +1,7 @@ #nullable enable using Content.Shared.Singularity; using Content.Shared.Singularity.Components; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; @@ -8,6 +9,7 @@ using Robust.Shared.Physics.Collision; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Player; using Robust.Shared.Players; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; @@ -69,6 +71,10 @@ namespace Content.Server.Singularity.Components private IPlayingAudioStream? _playingSound; + [DataField("singularityFormingSound")] private SoundSpecifier _singularityFormingSound = new SoundPathSpecifier("/Audio/Effects/singularity_form.ogg"); + [DataField("singularitySound")] private SoundSpecifier _singularitySound = new SoundPathSpecifier("/Audio/Effects/singularity.ogg"); + [DataField("singularityCollapsingSound")] private SoundSpecifier _singularityCollapsingSound = new SoundPathSpecifier("/Audio/Effects/singularity_collapse.ogg"); + public override ComponentState GetComponentState(ICommonSession player) { return new SingularityComponentState(Level); @@ -84,8 +90,9 @@ namespace Content.Server.Singularity.Components audioParams.Loop = true; audioParams.MaxDistance = 20f; audioParams.Volume = 5; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/singularity_form.ogg", Owner); - Timer.Spawn(5200,() => _playingSound = SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/singularity.ogg", Owner, audioParams)); + if(_singularityFormingSound.TryGetSound(out var singuloFormingSound)) + SoundSystem.Play(Filter.Pvs(Owner), singuloFormingSound, Owner); + Timer.Spawn(5200,() => _playingSound = SoundSystem.Play(Filter.Pvs(Owner), _singularitySound.GetSound(), Owner, audioParams)); _singularitySystem.ChangeSingularityLevel(this, 1); } @@ -138,7 +145,8 @@ namespace Content.Server.Singularity.Components protected override void OnRemove() { _playingSound?.Stop(); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/singularity_collapse.ogg", Owner.Transform.Coordinates); + if(_singularityCollapsingSound.TryGetSound(out var singuloCollapseSound)) + SoundSystem.Play(Filter.Pvs(Owner), singuloCollapseSound, Owner.Transform.Coordinates); base.OnRemove(); } } diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index af8efc8213..c579fa54e1 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -30,22 +30,15 @@ namespace Content.Server.Sound private void HandleEmitSoundOn(BaseEmitSoundComponent component) { - var soundName = component.Sound.GetSound(); - - if (!string.IsNullOrWhiteSpace(soundName)) - { - PlaySingleSound(soundName, component); + if (component.Sound.TryGetSound(out var soundName)) + { + SoundSystem.Play(Filter.Pvs(component.Owner), soundName, component.Owner, AudioHelpers.WithVariation(component.PitchVariation).WithVolume(-2f)); } else { Logger.Warning($"{nameof(component)} Uid:{component.Owner.Uid} has no {nameof(component.Sound)} to play."); } } - - private static void PlaySingleSound(string soundName, BaseEmitSoundComponent component) - { - SoundSystem.Play(Filter.Pvs(component.Owner), soundName, component.Owner, AudioHelpers.WithVariation(component.PitchVariation).WithVolume(-2f)); - } } } diff --git a/Content.Server/StationEvents/Events/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs index 1b1a759993..f72ee6d5b3 100644 --- a/Content.Server/StationEvents/Events/GasLeak.cs +++ b/Content.Server/StationEvents/Events/GasLeak.cs @@ -1,6 +1,7 @@ using Content.Server.Atmos.Components; using Content.Server.GameTicking; using Content.Shared.Atmos; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs index 6bceb104c4..5b943e5f77 100644 --- a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs +++ b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs @@ -1,11 +1,13 @@ -using System.Linq; using Content.Shared.Audio; using Content.Shared.Interaction; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Player; using Robust.Shared.Random; +using Robust.Shared.Serialization.Manager.Attributes; +using System.Linq; namespace Content.Server.Storage.Components { @@ -19,6 +21,9 @@ namespace Content.Server.Storage.Components public override string Name => "CursedEntityStorage"; + [DataField("cursedSound")] private SoundSpecifier _cursedSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg"); + [DataField("cursedLockerSound")] private SoundSpecifier _cursedLockerSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg"); + protected override void CloseStorage() { base.CloseStorage(); @@ -46,8 +51,10 @@ namespace Content.Server.Storage.Components locker.Insert(entity); } - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/teleport_departure.ogg", Owner, AudioHelpers.WithVariation(0.125f)); - SoundSystem.Play(Filter.Pvs(lockerEnt), "/Audio/Effects/teleport_arrival.ogg", lockerEnt, AudioHelpers.WithVariation(0.125f)); + if(_cursedSound.TryGetSound(out var cursedSound)) + SoundSystem.Play(Filter.Pvs(Owner), cursedSound, Owner, AudioHelpers.WithVariation(0.125f)); + if(_cursedLockerSound.TryGetSound(out var cursedLockerSound)) + SoundSystem.Play(Filter.Pvs(lockerEnt), cursedLockerSound, lockerEnt, AudioHelpers.WithVariation(0.125f)); } } } diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index 44993c0c19..ccdce8d8a8 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Item; using Content.Shared.Movement; using Content.Shared.Notification.Managers; using Content.Shared.Physics; +using Content.Shared.Sound; using Content.Shared.Storage; using Content.Shared.Tool; using Content.Shared.Verbs; @@ -76,10 +77,10 @@ namespace Content.Server.Storage.Components private bool _isWeldedShut; [DataField("closeSound")] - private string _closeSound = "/Audio/Machines/closetclose.ogg"; + private SoundSpecifier _closeSound = new SoundPathSpecifier("/Audio/Machines/closetclose.ogg"); [DataField("openSound")] - private string _openSound = "/Audio/Machines/closetopen.ogg"; + private SoundSpecifier _openSound = new SoundPathSpecifier("/Audio/Machines/closetopen.ogg"); [ViewVariables] protected Container Contents = default!; @@ -219,7 +220,8 @@ namespace Content.Server.Storage.Components } ModifyComponents(); - SoundSystem.Play(Filter.Pvs(Owner), _closeSound, Owner); + if(_closeSound.TryGetSound(out var closeSound)) + SoundSystem.Play(Filter.Pvs(Owner), closeSound, Owner); _lastInternalOpenAttempt = default; } @@ -228,7 +230,8 @@ namespace Content.Server.Storage.Components Open = true; EmptyContents(); ModifyComponents(); - SoundSystem.Play(Filter.Pvs(Owner), _openSound, Owner); + if(_openSound.TryGetSound(out var openSound)) + SoundSystem.Play(Filter.Pvs(Owner), openSound, Owner); } private void UpdateAppearance() diff --git a/Content.Server/Storage/Components/SecureEntityStorageComponent.cs b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs index 5dcaf78cf4..8c3df45b4a 100644 --- a/Content.Server/Storage/Components/SecureEntityStorageComponent.cs +++ b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs @@ -1,8 +1,8 @@ using Content.Server.Access.Components; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Storage; using Content.Shared.Verbs; using Robust.Server.GameObjects; @@ -25,6 +25,9 @@ namespace Content.Server.Storage.Components [DataField("locked")] private bool _locked = true; + [DataField("unlockSound")] private SoundSpecifier _unlockSound = new SoundPathSpecifier("/Audio/Machines/door_lock_off.ogg"); + [DataField("lockSound")] private SoundSpecifier _lockSound = new SoundPathSpecifier("/Audio/Machines/door_lock_on.ogg"); + [ViewVariables(VVAccess.ReadWrite)] public bool Locked { @@ -100,7 +103,8 @@ namespace Content.Server.Storage.Components if (!CheckAccess(user)) return; Locked = false; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5)); + if(_unlockSound.TryGetSound(out var unlockSound)) + SoundSystem.Play(Filter.Pvs(Owner), unlockSound, Owner, AudioParams.Default.WithVolume(-5)); } private void DoLock(IEntity user) @@ -108,7 +112,8 @@ namespace Content.Server.Storage.Components if (!CheckAccess(user)) return; Locked = true; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5)); + if(_lockSound.TryGetSound(out var lockSound)) + SoundSystem.Play(Filter.Pvs(Owner), lockSound, Owner, AudioParams.Default.WithVolume(-5)); } private bool CheckAccess(IEntity user) diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 41def850b7..df6994069f 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Interaction.Helpers; using Content.Shared.Item; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Storage; using Robust.Server.GameObjects; using Robust.Server.Player; @@ -59,7 +60,7 @@ namespace Content.Server.Storage.Components public readonly HashSet SubscribedSessions = new(); [DataField("storageSoundCollection")] - public string? StorageSoundCollection { get; set; } + public SoundSpecifier StorageSoundCollection { get; set; } = default!; [ViewVariables] public override IReadOnlyList? StoredEntities => _storage?.ContainedEntities; @@ -150,7 +151,7 @@ namespace Content.Server.Storage.Components return; } - PlaySoundCollection(StorageSoundCollection); + PlaySoundCollection(); EnsureInitialCalculated(); Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) had entity (UID {message.Entity.Uid}) inserted into it."); @@ -246,7 +247,7 @@ namespace Content.Server.Storage.Components /// The entity to open the UI for public void OpenStorageUI(IEntity entity) { - PlaySoundCollection(StorageSoundCollection); + PlaySoundCollection(); EnsureInitialCalculated(); var userSession = entity.GetComponent().PlayerSession; @@ -546,7 +547,7 @@ namespace Content.Server.Storage.Components // If we picked up atleast one thing, play a sound and do a cool animation! if (successfullyInserted.Count>0) { - PlaySoundCollection(StorageSoundCollection); + PlaySoundCollection(); SendNetworkMessage( new AnimateInsertingEntitiesMessage( successfullyInserted, @@ -617,15 +618,10 @@ namespace Content.Server.Storage.Components } } - protected void PlaySoundCollection(string? name) + private void PlaySoundCollection() { - if (string.IsNullOrEmpty(name)) - { - return; - } - - var file = AudioHelpers.GetRandomFileFromSoundCollection(name); - SoundSystem.Play(Filter.Pvs(Owner), file, Owner, AudioParams.Default); + if(StorageSoundCollection.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioParams.Default); } } } diff --git a/Content.Server/Stunnable/Components/StunbatonComponent.cs b/Content.Server/Stunnable/Components/StunbatonComponent.cs index 1c1a754948..46b5baa913 100644 --- a/Content.Server/Stunnable/Components/StunbatonComponent.cs +++ b/Content.Server/Stunnable/Components/StunbatonComponent.cs @@ -1,4 +1,5 @@ #nullable enable +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -31,5 +32,14 @@ namespace Content.Server.Stunnable.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("energyPerUse")] public float EnergyPerUse { get; set; } = 50; + + [DataField("stunSound")] + public SoundSpecifier StunSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/egloves.ogg"); + + [DataField("sparksSound")] + public SoundSpecifier SparksSound { get; set; } = new SoundCollectionSpecifier("sparks"); + + [DataField("turnOnFailSound")] + public SoundSpecifier TurnOnFailSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/button.ogg"); } } diff --git a/Content.Server/Stunnable/Components/StunnableComponent.cs b/Content.Server/Stunnable/Components/StunnableComponent.cs index 1fec345fdb..9cd866f68a 100644 --- a/Content.Server/Stunnable/Components/StunnableComponent.cs +++ b/Content.Server/Stunnable/Components/StunnableComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Notification; using Content.Shared.Audio; using Content.Shared.MobState; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Standing; using Content.Shared.Stunnable; using Robust.Shared.Audio; @@ -12,6 +13,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; using Robust.Shared.Random; +using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Stunnable.Components { @@ -19,6 +21,8 @@ namespace Content.Server.Stunnable.Components [ComponentReference(typeof(SharedStunnableComponent))] public class StunnableComponent : SharedStunnableComponent, IDisarmedAct { + [DataField("stunAttemptSound")] private SoundSpecifier _stunAttemptSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg"); + protected override void OnKnockdown() { EntitySystem.Get().Down(Owner); @@ -54,7 +58,8 @@ namespace Content.Server.Stunnable.Components protected override void OnInteractHand() { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.05f)); + if(_stunAttemptSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioHelpers.WithVariation(0.05f)); } bool IDisarmedAct.Disarmed(DisarmedActEventArgs eventArgs) @@ -69,8 +74,8 @@ namespace Content.Server.Stunnable.Components if (source != null) { - SoundSystem.Play(Filter.Pvs(source), "/Audio/Effects/thudswoosh.ogg", source, - AudioHelpers.WithVariation(0.025f)); + if (_stunAttemptSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(source), sound, source, AudioHelpers.WithVariation(0.025f)); if (target != null) { source.PopupMessageOtherClients(Loc.GetString("stunnable-component-disarm-success-others", ("source", source.Name),("target", target.Name))); diff --git a/Content.Server/Stunnable/StunbatonSystem.cs b/Content.Server/Stunnable/StunbatonSystem.cs index 683d44ebfb..fc705d77a0 100644 --- a/Content.Server/Stunnable/StunbatonSystem.cs +++ b/Content.Server/Stunnable/StunbatonSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server.Items; using Content.Server.PowerCell.Components; using Content.Server.Stunnable.Components; @@ -119,7 +119,8 @@ namespace Content.Server.Stunnable { if (!entity.TryGetComponent(out StunnableComponent? stunnable) || !comp.Activated) return; - SoundSystem.Play(Filter.Pvs(comp.Owner), "/Audio/Weapons/egloves.ogg", comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); + if(comp.StunSound.TryGetSound(out var stunSound)) + SoundSystem.Play(Filter.Pvs(comp.Owner), stunSound, comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); if(!stunnable.SlowedDown) { if(_robustRandom.Prob(comp.ParalyzeChanceNoSlowdown)) @@ -136,9 +137,11 @@ namespace Content.Server.Stunnable } - if (!comp.Owner.TryGetComponent(out var slot) || slot.Cell == null || !(slot.Cell.CurrentCharge < comp.EnergyPerUse)) return; + if (!comp.Owner.TryGetComponent(out var slot) || slot.Cell == null || !(slot.Cell.CurrentCharge < comp.EnergyPerUse)) + return; - SoundSystem.Play(Filter.Pvs(comp.Owner), AudioHelpers.GetRandomFileFromSoundCollection("sparks"), comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); + if(comp.SparksSound.TryGetSound(out var sparksSound)) + SoundSystem.Play(Filter.Pvs(comp.Owner), sparksSound, comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); TurnOff(comp); } @@ -152,7 +155,8 @@ namespace Content.Server.Stunnable if (!comp.Owner.TryGetComponent(out var sprite) || !comp.Owner.TryGetComponent(out var item)) return; - SoundSystem.Play(Filter.Pvs(comp.Owner), AudioHelpers.GetRandomFileFromSoundCollection("sparks"), comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); + if(comp.SparksSound.TryGetSound(out var sparksSound)) + SoundSystem.Play(Filter.Pvs(comp.Owner), sparksSound, comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); item.EquippedPrefix = "off"; // TODO stunbaton visualizer sprite.LayerSetState(0, "stunbaton_off"); @@ -167,7 +171,8 @@ namespace Content.Server.Stunnable } if (!comp.Owner.TryGetComponent(out var sprite) || - !comp.Owner.TryGetComponent(out var item)) return; + !comp.Owner.TryGetComponent(out var item)) + return; var playerFilter = Filter.Pvs(comp.Owner); if (!comp.Owner.TryGetComponent(out var slot)) @@ -175,19 +180,22 @@ namespace Content.Server.Stunnable if (slot.Cell == null) { - SoundSystem.Play(playerFilter, "/Audio/Machines/button.ogg", comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); + if(comp.TurnOnFailSound.TryGetSound(out var turnOnFailSound)) + SoundSystem.Play(playerFilter, turnOnFailSound, comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); user.PopupMessage(Loc.GetString("comp-stunbaton-activated-missing-cell")); return; } if (slot.Cell != null && slot.Cell.CurrentCharge < comp.EnergyPerUse) { - SoundSystem.Play(playerFilter, "/Audio/Machines/button.ogg", comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); + if(comp.TurnOnFailSound.TryGetSound(out var turnOnFailSound)) + SoundSystem.Play(playerFilter, turnOnFailSound, comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); user.PopupMessage(Loc.GetString("comp-stunbaton-activated-dead-cell")); return; } - SoundSystem.Play(playerFilter, AudioHelpers.GetRandomFileFromSoundCollection("sparks"), comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); + if(comp.SparksSound.TryGetSound(out var sparksSound)) + SoundSystem.Play(playerFilter, sparksSound, comp.Owner.Transform.Coordinates, AudioHelpers.WithVariation(0.25f)); item.EquippedPrefix = "on"; sprite.LayerSetState(0, "stunbaton_on"); diff --git a/Content.Server/Tiles/FloorTileItemComponent.cs b/Content.Server/Tiles/FloorTileItemComponent.cs index ff9f224162..6399fadc63 100644 --- a/Content.Server/Tiles/FloorTileItemComponent.cs +++ b/Content.Server/Tiles/FloorTileItemComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Maps; +using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -25,6 +26,8 @@ namespace Content.Server.Tiles [DataField("outputs", customTypeSerializer:typeof(PrototypeIdListSerializer))] private List? _outputTiles; + [DataField("placeTileSound")] SoundSpecifier _placeTileSound = new SoundPathSpecifier("/Audio/Items/genhit.ogg"); + protected override void Initialize() { base.Initialize(); @@ -46,8 +49,9 @@ namespace Content.Server.Tiles private void PlaceAt(IMapGrid mapGrid, EntityCoordinates location, ushort tileId, float offset = 0) { - mapGrid.SetTile(location.Offset(new Vector2(offset, offset)), new Robust.Shared.Map.Tile(tileId)); - SoundSystem.Play(Filter.Pvs(location), "/Audio/Items/genhit.ogg", location, AudioHelpers.WithVariation(0.125f)); + mapGrid.SetTile(location.Offset(new Vector2(offset, offset)), new Tile(tileId)); + if(_placeTileSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(location), sound, location, AudioHelpers.WithVariation(0.125f)); } async Task IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs index be6f3b6e4e..ad51e85d56 100644 --- a/Content.Server/Toilet/ToiletComponent.cs +++ b/Content.Server/Toilet/ToiletComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Toilet; using Content.Shared.Tool; using Robust.Server.GameObjects; @@ -22,6 +23,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; using Robust.Shared.Random; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -42,6 +44,8 @@ namespace Content.Server.Toilet [ViewVariables] private SecretStashComponent _secretStash = default!; + [DataField("toggleSound")] SoundSpecifier _toggleSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg"); + protected override void Initialize() { base.Initialize(); @@ -127,7 +131,8 @@ namespace Content.Server.Toilet public void ToggleToiletSeat() { IsSeatUp = !IsSeatUp; - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/toilet_seat_down.ogg", Owner, AudioHelpers.WithVariation(0.05f)); + if(_toggleSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner, AudioHelpers.WithVariation(0.05f)); UpdateSprite(); } diff --git a/Content.Server/Tools/Components/MultitoolComponent.cs b/Content.Server/Tools/Components/MultitoolComponent.cs index bc7508f373..267438618d 100644 --- a/Content.Server/Tools/Components/MultitoolComponent.cs +++ b/Content.Server/Tools/Components/MultitoolComponent.cs @@ -1,6 +1,7 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Interaction; using Content.Shared.NetIDs; +using Content.Shared.Sound; using Content.Shared.Tool; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -32,13 +33,10 @@ namespace Content.Server.Tools.Components public string Sprite { get; } = string.Empty; [DataField("useSound")] - public string Sound { get; } = string.Empty; - - [DataField("useSoundCollection")] - public string SoundCollection { get; } = string.Empty; + public SoundSpecifier Sound { get; } = default!; [DataField("changeSound")] - public string ChangeSound { get; } = string.Empty; + public SoundSpecifier ChangeSound { get; } = default!; } public override string Name => "MultiTool"; @@ -62,8 +60,8 @@ namespace Content.Server.Tools.Components _currentTool = (_currentTool + 1) % _tools.Count; SetTool(); var current = _tools[_currentTool]; - if(!string.IsNullOrEmpty(current.ChangeSound)) - SoundSystem.Play(Filter.Pvs(Owner), current.ChangeSound, Owner); + if(current.ChangeSound.TryGetSound(out var changeSound)) + SoundSystem.Play(Filter.Pvs(Owner), changeSound, Owner); } private void SetTool() @@ -73,7 +71,6 @@ namespace Content.Server.Tools.Components var current = _tools[_currentTool]; _tool.UseSound = current.Sound; - _tool.UseSoundCollection = current.SoundCollection; _tool.Qualities = current.Behavior; if (_sprite == null) return; diff --git a/Content.Server/Tools/Components/ToolComponent.cs b/Content.Server/Tools/Components/ToolComponent.cs index 8eff4dd539..9213c1877c 100644 --- a/Content.Server/Tools/Components/ToolComponent.cs +++ b/Content.Server/Tools/Components/ToolComponent.cs @@ -4,6 +4,7 @@ using Content.Server.DoAfter; using Content.Shared.ActionBlocker; using Content.Shared.Audio; using Content.Shared.Interaction.Events; +using Content.Shared.Sound; using Content.Shared.Tool; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -44,10 +45,7 @@ namespace Content.Server.Tools.Components public float SpeedModifier { get; set; } = 1; [DataField("useSound")] - public string? UseSound { get; set; } - - [DataField("useSoundCollection")] - public string? UseSoundCollection { get; set; } + public SoundSpecifier UseSound { get; set; } = default!; public void AddQuality(ToolQuality quality) { @@ -96,30 +94,10 @@ namespace Content.Server.Tools.Components return true; } - protected void PlaySoundCollection(string? name, float volume = -5f) + public void PlayUseSound(float volume = -5f) { - if (string.IsNullOrEmpty(name)) - { - return; - } - - var file = AudioHelpers.GetRandomFileFromSoundCollection(name); - SoundSystem.Play(Filter.Pvs(Owner), file, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); - } - - public void PlayUseSound(float volume=-5f) - { - if (string.IsNullOrEmpty(UseSoundCollection)) - { - if (!string.IsNullOrEmpty(UseSound)) - { - SoundSystem.Play(Filter.Pvs(Owner), UseSound, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); - } - } - else - { - PlaySoundCollection(UseSoundCollection, volume); - } + if(UseSound.TryGetSound(out var useSound)) + SoundSystem.Play(Filter.Pvs(Owner), useSound, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); } } } diff --git a/Content.Server/Tools/Components/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs index 2394ea0e39..d7c29b6f82 100644 --- a/Content.Server/Tools/Components/WelderComponent.cs +++ b/Content.Server/Tools/Components/WelderComponent.cs @@ -8,6 +8,7 @@ using Content.Server.Chemistry.Components; using Content.Server.Explosion; using Content.Server.Items; using Content.Server.Notification; +using Content.Shared.Audio; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution.Components; @@ -16,6 +17,7 @@ using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Temperature; using Content.Shared.Tool; using Robust.Server.GameObjects; @@ -58,8 +60,17 @@ namespace Content.Server.Tools.Components private SolutionContainerComponent? _solutionComponent; private PointLightComponent? _pointLightComponent; - [DataField("weldSoundCollection")] - public string? WeldSoundCollection { get; set; } + [DataField("weldSounds")] + private SoundSpecifier WeldSounds { get; set; } = default!; + + [DataField("welderOffSounds")] + private SoundSpecifier WelderOffSounds { get; set; } = new SoundCollectionSpecifier("WelderOff"); + + [DataField("welderOnSounds")] + private SoundSpecifier WelderOnSounds { get; set; } = new SoundCollectionSpecifier("WelderOn"); + + [DataField("welderRefill")] + private SoundSpecifier WelderRefill { get; set; } = new SoundPathSpecifier("/Audio/Effects/refill.ogg"); [ViewVariables] public float Fuel => _solutionComponent?.Solution?.GetReagentQuantity("WeldingFuel").Float() ?? 0f; @@ -160,9 +171,9 @@ namespace Content.Server.Tools.Components var succeeded = _solutionComponent.TryRemoveReagent("WeldingFuel", ReagentUnit.New(value)); - if (succeeded && !silent) + if (succeeded && !silent && WeldSounds.TryGetSound(out var weldSounds)) { - PlaySoundCollection(WeldSoundCollection); + PlaySound(weldSounds); } return succeeded; } @@ -193,7 +204,8 @@ namespace Content.Server.Tools.Components if (_pointLightComponent != null) _pointLightComponent.Enabled = false; - PlaySoundCollection("WelderOff", -5); + if(WelderOffSounds.TryGetSound(out var welderOffSOunds)) + PlaySound(welderOffSOunds, -5); _welderSystem.Unsubscribe(this); return true; } @@ -210,7 +222,8 @@ namespace Content.Server.Tools.Components if (_pointLightComponent != null) _pointLightComponent.Enabled = true; - PlaySoundCollection("WelderOn", -5); + if (WelderOnSounds.TryGetSound(out var welderOnSOunds)) + PlaySound(welderOnSOunds, -5); _welderSystem.Subscribe(this); Owner.Transform.Coordinates @@ -272,7 +285,8 @@ namespace Content.Server.Tools.Components if (TryWeld(5, victim, silent: true)) { - PlaySoundCollection(WeldSoundCollection); + if(WeldSounds.TryGetSound(out var weldSound)) + PlaySound(weldSound); othersMessage = Loc.GetString("welder-component-suicide-lit-others-message", @@ -325,13 +339,18 @@ namespace Content.Server.Tools.Components { var drained = targetSolution.Drain(trans); _solutionComponent.TryAddSolution(drained); - - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/refill.ogg", Owner); + if(WelderRefill.TryGetSound(out var welderRefillSound)) + SoundSystem.Play(Filter.Pvs(Owner), welderRefillSound, Owner); eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("welder-component-after-interact-refueled-message")); } } return true; } + + private void PlaySound(string soundName, float volume = -5f) + { + SoundSystem.Play(Filter.Pvs(Owner), soundName, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); + } } } diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index 4b4bd3bca6..409a59dcb7 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -11,6 +11,7 @@ using Content.Server.WireHacking; using Content.Shared.Acts; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Sound; using Content.Shared.VendingMachines; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -46,10 +47,10 @@ namespace Content.Server.VendingMachines [DataField("soundVend")] // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg - private string _soundVend = "/Audio/Machines/machine_vend.ogg"; + private SoundSpecifier _soundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg"); [DataField("soundDeny")] // Yoinked from: https://github.com/discordia-space/CEV-Eris/blob/35bbad6764b14e15c03a816e3e89aa1751660ba9/sound/machines/Custom_deny.ogg - private string _soundDeny = "/Audio/Machines/custom_deny.ogg"; + private SoundSpecifier _soundDeny = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg"); [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(VendingMachineUiKey.Key); @@ -202,7 +203,8 @@ namespace Content.Server.VendingMachines Owner.EntityManager.SpawnEntity(id, Owner.Transform.Coordinates); }); - SoundSystem.Play(Filter.Pvs(Owner), _soundVend, Owner, AudioParams.Default.WithVolume(-2f)); + if(_soundVend.TryGetSound(out var soundVend)) + SoundSystem.Play(Filter.Pvs(Owner), soundVend, Owner, AudioParams.Default.WithVolume(-2f)); } private void TryEject(string id, IEntity? sender) @@ -221,7 +223,8 @@ namespace Content.Server.VendingMachines private void Deny() { - SoundSystem.Play(Filter.Pvs(Owner), _soundDeny, Owner, AudioParams.Default.WithVolume(-2f)); + if(_soundDeny.TryGetSound(out var soundDeny)) + SoundSystem.Play(Filter.Pvs(Owner), soundDeny, Owner, AudioParams.Default.WithVolume(-2f)); // Play the Deny animation TrySetVisualState(VendingMachineVisualState.Deny); diff --git a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs index fcf2719638..23c2a45a3d 100644 --- a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs +++ b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs @@ -1,5 +1,6 @@ using System; using Content.Shared.Damage; +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -13,11 +14,11 @@ namespace Content.Server.Weapon.Melee.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("hitSound")] - public string HitSound { get; set; } = "/Audio/Weapons/genhit1.ogg"; + public SoundSpecifier HitSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/genhit1.ogg"); [ViewVariables(VVAccess.ReadWrite)] [DataField("missSound")] - public string MissSound { get; set; } = "/Audio/Weapons/punchmiss.ogg"; + public SoundSpecifier MissSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/punchmiss.ogg"); [ViewVariables] [DataField("arcCooldownTime")] diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 0c7a42785c..5d8541fe48 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -91,12 +91,14 @@ namespace Content.Server.Weapon.Melee damageableComponent.ChangeDamage(comp.DamageType, comp.Damage, false, owner); } - SoundSystem.Play(Filter.Pvs(owner), comp.HitSound, target); + if(comp.HitSound.TryGetSound(out var hitSound)) + SoundSystem.Play(Filter.Pvs(owner), hitSound, target); } } else { - SoundSystem.Play(Filter.Pvs(owner), comp.MissSound, args.User); + if(comp.MissSound.TryGetSound(out var missSound)) + SoundSystem.Play(Filter.Pvs(owner), missSound, args.User); return; } @@ -146,11 +148,13 @@ namespace Content.Server.Weapon.Melee { if (entities.Count != 0) { - SoundSystem.Play(Filter.Pvs(owner), comp.HitSound, entities.First().Transform.Coordinates); + if(comp.HitSound.TryGetSound(out var hitSound)) + SoundSystem.Play(Filter.Pvs(owner), hitSound, entities.First().Transform.Coordinates); } else { - SoundSystem.Play(Filter.Pvs(owner), comp.MissSound, args.User.Transform.Coordinates); + if(comp.MissSound.TryGetSound(out var missSound)) + SoundSystem.Play(Filter.Pvs(owner), missSound, args.User.Transform.Coordinates); } foreach (var entity in hitEntities) diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs index e4605731c8..2d6ab30457 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs @@ -1,5 +1,6 @@ using System; using Content.Shared.Examine; +using Content.Shared.Sound; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; @@ -82,7 +83,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components private string _muzzleFlashSprite = "Objects/Weapons/Guns/Projectiles/bullet_muzzle.png"; [DataField("soundCollectionEject")] - public string? SoundCollectionEject { get; } = "CasingEject"; + public SoundSpecifier SoundCollectionEject { get; } = new SoundCollectionSpecifier("CasingEject"); void ISerializationHooks.AfterDeserialization() { diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index 55a74605eb..1d3a93a5c0 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.NetIDs; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; @@ -74,17 +75,17 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (value) { TryEjectChamber(); - if (_soundBoltOpen != null) + if (_soundBoltOpen.TryGetSound(out var soundBoltOpen)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltOpen, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundBoltOpen, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } else { TryFeedChamber(); - if (_soundBoltClosed != null) + if (_soundBoltClosed.TryGetSound(out var soundBoltClosed)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } @@ -101,13 +102,13 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // Sounds [DataField("soundCycle")] - private string _soundCycle = "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"; + private SoundSpecifier _soundCycle = new SoundPathSpecifier( "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"); [DataField("soundBoltOpen")] - private string _soundBoltOpen = "/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg"; + private SoundSpecifier _soundBoltOpen = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg"); [DataField("soundBoltClosed")] - private string _soundBoltClosed = "/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg"; + private SoundSpecifier _soundBoltClosed = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg"); [DataField("soundInsert")] - private string _soundInsert = "/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"; + private SoundSpecifier _soundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); void IMapInit.MapInit() { @@ -140,7 +141,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components chamber, FireRateSelector, count, - SoundGunshot); + SoundGunshot.GetSound()); } protected override void Initialize() @@ -224,9 +225,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components } else { - if (!string.IsNullOrEmpty(_soundCycle)) + if (_soundCycle.TryGetSound(out var soundCycle)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundCycle, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundCycle, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } @@ -256,9 +257,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_chamberContainer.ContainedEntity == null) { _chamberContainer.Insert(ammo); - if (_soundInsert != null) + if (_soundInsert.TryGetSound(out var soundInsert)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } Dirty(); UpdateAppearance(); @@ -269,9 +270,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components { _ammoContainer.Insert(ammo); _spawnedAmmo.Push(ammo); - if (_soundInsert != null) + if (_soundInsert.TryGetSound(out var soundInsert)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } Dirty(); UpdateAppearance(); diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs index df514a4417..ab3424102c 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -65,10 +66,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // Sounds [DataField("soundCycle")] - private string _soundCycle = "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"; + private SoundSpecifier _soundCycle = new SoundPathSpecifier("/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"); [DataField("soundInsert")] - private string _soundInsert = "/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"; + private SoundSpecifier _soundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); void IMapInit.MapInit() { @@ -94,7 +95,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components chamber, FireRateSelector, count, - SoundGunshot); + SoundGunshot.GetSound()); } void ISerializationHooks.AfterDeserialization() @@ -189,9 +190,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (manual) { - if (!string.IsNullOrEmpty(_soundCycle)) + if (_soundCycle.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundCycle, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } @@ -218,9 +219,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components _spawnedAmmo.Push(eventArgs.Using); Dirty(); UpdateAppearance(); - if (_soundInsert != null) + if (_soundInsert.TryGetSound(out var soundInsert)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } return true; } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs index 4ec03a3b28..ee82935f3f 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.NetIDs; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; @@ -60,13 +61,13 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // Sounds [DataField("soundEject")] - private string _soundEject = "/Audio/Weapons/Guns/MagOut/revolver_magout.ogg"; + private SoundSpecifier _soundEject = new SoundPathSpecifier("/Audio/Weapons/Guns/MagOut/revolver_magout.ogg"); [DataField("soundInsert")] - private string _soundInsert = "/Audio/Weapons/Guns/MagIn/revolver_magin.ogg"; + private SoundSpecifier _soundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/revolver_magin.ogg"); [DataField("soundSpin")] - private string _soundSpin = "/Audio/Weapons/Guns/Misc/revolver_spin.ogg"; + private SoundSpecifier _soundSpin = new SoundPathSpecifier("/Audio/Weapons/Guns/Misc/revolver_spin.ogg"); void ISerializationHooks.BeforeSerialization() { @@ -96,7 +97,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components _currentSlot, FireRateSelector, slotsSpent, - SoundGunshot); + SoundGunshot.GetSound()); } protected override void Initialize() @@ -164,9 +165,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components _currentSlot = i; _ammoSlots[i] = entity; _ammoContainer.Insert(entity); - if (_soundInsert != null) + if (_soundInsert.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } Dirty(); @@ -194,9 +195,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components { var random = _random.Next(_ammoSlots.Length - 1); _currentSlot = random; - if (!string.IsNullOrEmpty(_soundSpin)) + if (_soundSpin.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundSpin, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } Dirty(); } @@ -248,9 +249,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_ammoContainer.ContainedEntities.Count > 0) { - if (_soundEject != null) + if (_soundEject.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundEject, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-1)); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-1)); } } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs index 9909470dac..25a91c47eb 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Damage; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.NetIDs; +using Content.Shared.Sound; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; @@ -83,9 +84,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // Sounds [DataField("soundPowerCellInsert")] - private string? _soundPowerCellInsert = default; + private SoundSpecifier _soundPowerCellInsert = default!; [DataField("soundPowerCellEject")] - private string? _soundPowerCellEject = default; + private SoundSpecifier _soundPowerCellEject = default!; public override ComponentState GetComponentState(ICommonSession player) { @@ -222,9 +223,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components return false; } - if (_soundPowerCellInsert != null) + if (_soundPowerCellInsert.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundPowerCellInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } _powerCellContainer.Insert(entity); @@ -275,9 +276,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components cell.Owner.Transform.Coordinates = user.Transform.Coordinates; } - if (_soundPowerCellEject != null) + if (_soundPowerCellEject.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundPowerCellEject, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), sound, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } return true; } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index 15916e16bd..75a3eb3b43 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.NetIDs; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Barrels.Components; @@ -97,17 +98,17 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (value) { TryEjectChamber(); - if (_soundBoltOpen != null) + if (_soundBoltOpen.TryGetSound(out var soundBoltOpen)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltOpen, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundBoltOpen, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } else { TryFeedChamber(); - if (_soundBoltClosed != null) + if (_soundBoltClosed.TryGetSound(out var soundBoltClosed)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } @@ -129,17 +130,17 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // Sounds [DataField("soundBoltOpen")] - private string? _soundBoltOpen = default; + private SoundSpecifier _soundBoltOpen = default!; [DataField("soundBoltClosed")] - private string? _soundBoltClosed = default; + private SoundSpecifier _soundBoltClosed = default!; [DataField("soundRack")] - private string? _soundRack = default; + private SoundSpecifier _soundRack = default!; [DataField("soundMagInsert")] - private string? _soundMagInsert = default; + private SoundSpecifier _soundMagInsert = default!; [DataField("soundMagEject")] - private string? _soundMagEject = default; + private SoundSpecifier _soundMagEject = default!; [DataField("soundAutoEject")] - private string _soundAutoEject = "/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"; + private SoundSpecifier _soundAutoEject = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); private List GetMagazineTypes() { @@ -169,7 +170,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components _chamberContainer.ContainedEntity != null, FireRateSelector, count, - SoundGunshot); + SoundGunshot.GetSound()); } protected override void Initialize() @@ -228,9 +229,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_chamberContainer.ContainedEntity == null && !BoltOpen) { - if (_soundBoltOpen != null) + if (_soundBoltOpen.TryGetSound(out var soundBoltOpen)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltOpen, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-5)); + SoundSystem.Play(Filter.Pvs(Owner), soundBoltOpen, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-5)); } if (Owner.TryGetContainer(out var container)) @@ -243,9 +244,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (manual) { - if (_soundRack != null) + if (_soundRack.TryGetSound(out var soundRack)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundRack, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundRack, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } } @@ -271,9 +272,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (BoltOpen) { - if (_soundBoltClosed != null) + if (_soundBoltClosed.TryGetSound(out var soundBoltClosed)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-5)); + SoundSystem.Play(Filter.Pvs(Owner), soundBoltClosed, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-5)); } Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-use-entity-bolt-closed")); BoltOpen = false; @@ -325,9 +326,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_autoEjectMag && magazine != null && magazine.GetComponent().ShotsLeft == 0) { - if (_soundAutoEject != null) + if (_soundAutoEject.TryGetSound(out var soundAutoEject)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundAutoEject, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundAutoEject, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } _magazineContainer.Remove(magazine); @@ -352,9 +353,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components } _magazineContainer.Remove(mag); - if (_soundMagEject != null) + if (_soundMagEject.TryGetSound(out var soundMagEject)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundMagEject, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundMagEject, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } if (user.TryGetComponent(out HandsComponent? handsComponent)) @@ -391,9 +392,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_magazineContainer.ContainedEntity == null) { - if (_soundMagInsert != null) + if (_soundMagInsert.TryGetSound(out var soundMagInsert)) { - SoundSystem.Play(Filter.Pvs(Owner), _soundMagInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); + SoundSystem.Play(Filter.Pvs(Owner), soundMagInsert, Owner.Transform.Coordinates, AudioParams.Default.WithVolume(-2)); } Owner.PopupMessage(eventArgs.User, Loc.GetString("server-magazine-barrel-component-interact-using-success")); _magazineContainer.Insert(eventArgs.Using); diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs index 754757d7e9..4946167267 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Audio; using Content.Shared.Damage.Components; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Sound; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -97,10 +98,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components // Sounds [DataField("soundGunshot")] - public string? SoundGunshot { get; set; } + public SoundSpecifier SoundGunshot { get; set; } = default!; [DataField("soundEmpty")] - public string SoundEmpty { get; } = "/Audio/Weapons/Guns/Empty/empty.ogg"; + public SoundSpecifier SoundEmpty { get; } = new SoundPathSpecifier("/Audio/Weapons/Guns/Empty/empty.ogg"); void ISerializationHooks.BeforeSerialization() { @@ -196,9 +197,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components { if (ShotsLeft == 0) { - if (SoundEmpty != null) + if (SoundEmpty.TryGetSound(out var sound)) { - SoundSystem.Play(Filter.Broadcast(), SoundEmpty, Owner.Transform.Coordinates); + SoundSystem.Play(Filter.Broadcast(), sound, Owner.Transform.Coordinates); } return; } @@ -207,7 +208,8 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components var projectile = TakeProjectile(shooter.Transform.Coordinates); if (projectile == null) { - SoundSystem.Play(Filter.Broadcast(), SoundEmpty, Owner.Transform.Coordinates); + if(SoundEmpty.TryGetSound(out var soundEmpty)) + SoundSystem.Play(Filter.Broadcast(), soundEmpty, Owner.Transform.Coordinates); return; } @@ -220,7 +222,6 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components recoilComponent.Kick(-angle.ToVec() * 0.15f); } - // This section probably needs tweaking so there can be caseless hitscan etc. if (projectile.TryGetComponent(out HitscanComponent? hitscan)) { @@ -248,9 +249,9 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components throw new InvalidOperationException(); } - if (!string.IsNullOrEmpty(SoundGunshot)) + if (SoundGunshot.TryGetSound(out var soundGunshot)) { - SoundSystem.Play(Filter.Broadcast(), SoundGunshot, Owner.Transform.Coordinates); + SoundSystem.Play(Filter.Broadcast(), soundGunshot, Owner.Transform.Coordinates); } _lastFire = _gameTiming.CurTime; @@ -282,16 +283,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components entity.Transform.Coordinates = entity.Transform.Coordinates.Offset(offsetPos); entity.Transform.LocalRotation = robustRandom.Pick(ejectDirections).ToAngle(); - if (ammo.SoundCollectionEject == null || !playSound) + if (ammo.SoundCollectionEject.TryGetSound(out var ejectSounds) && playSound) { - return; - } - - prototypeManager ??= IoCManager.Resolve(); - - var soundCollection = prototypeManager.Index(ammo.SoundCollectionEject); - var randomFile = robustRandom.Pick(soundCollection.PickFiles); - SoundSystem.Play(Filter.Broadcast(), randomFile, entity.Transform.Coordinates, AudioParams.Default.WithVolume(-1)); + SoundSystem.Play(Filter.Broadcast(), ejectSounds, entity.Transform.Coordinates, AudioParams.Default.WithVolume(-1)); + } } /// diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs index 360786624d..a95ccc86f3 100644 --- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Damage.Components; using Content.Shared.Hands; using Content.Shared.Interaction.Events; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Audio; using Robust.Shared.GameObjects; @@ -48,6 +49,12 @@ namespace Content.Server.Weapon.Ranged [DataField("canHotspot")] private bool _canHotspot = true; + [DataField("clumsyWeaponHandlingSound")] + private SoundSpecifier _clumsyWeaponHandlingSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg"); + + [DataField("clumsyWeaponShotSound")] + private SoundSpecifier _clumsyWeaponShotSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg"); + public Func? WeaponCanFireHandler; public Func? UserCanFireHandler; public Action? FireHandler; @@ -159,11 +166,13 @@ namespace Content.Server.Weapon.Ranged if (ClumsyCheck && ClumsyComponent.TryRollClumsy(user, ClumsyExplodeChance)) { - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Items/bikehorn.ogg", - Owner.Transform.Coordinates, AudioParams.Default.WithMaxDistance(5)); + if(_clumsyWeaponHandlingSound.TryGetSound(out var clumsyWeaponHandlingSound)) + SoundSystem.Play(Filter.Pvs(Owner), clumsyWeaponHandlingSound, + Owner.Transform.Coordinates, AudioParams.Default.WithMaxDistance(5)); - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Weapons/Guns/Gunshots/bang.ogg", - Owner.Transform.Coordinates, AudioParams.Default.WithMaxDistance(5)); + if(_clumsyWeaponShotSound.TryGetSound(out var clumsyWeaponShotSound)) + SoundSystem.Play(Filter.Pvs(Owner), clumsyWeaponShotSound, + Owner.Transform.Coordinates, AudioParams.Default.WithMaxDistance(5)); if (user.TryGetComponent(out IDamageableComponent? health)) { diff --git a/Content.Server/Window/WindowComponent.cs b/Content.Server/Window/WindowComponent.cs index 1a200d65e7..8e7d3cf2e3 100644 --- a/Content.Server/Window/WindowComponent.cs +++ b/Content.Server/Window/WindowComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Damage.Components; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Rounding; +using Content.Shared.Sound; using Content.Shared.Window; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -37,6 +38,9 @@ namespace Content.Server.Window [DataField("rateLimitedKnocking")] [ViewVariables(VVAccess.ReadWrite)] private bool _rateLimitedKnocking = true; + [DataField("knockSound")] + private SoundSpecifier _knockSound = new SoundPathSpecifier("/Audio/Effects/glass_knock.ogg"); + public override void HandleMessage(ComponentMessage message, IComponent? component) { base.HandleMessage(message, component); @@ -130,8 +134,9 @@ namespace Content.Server.Window return false; } - SoundSystem.Play(Filter.Pvs(eventArgs.Target), "/Audio/Effects/glass_knock.ogg", - eventArgs.Target.Transform.Coordinates, AudioHelpers.WithVariation(0.05f)); + if(_knockSound.TryGetSound(out var sound)) + SoundSystem.Play(Filter.Pvs(eventArgs.Target), sound, + eventArgs.Target.Transform.Coordinates, AudioHelpers.WithVariation(0.05f)); eventArgs.Target.PopupMessageEveryone(Loc.GetString("comp-window-knock")); _lastKnockTime = _gameTiming.CurTime; diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs index e48b1959dc..22051ab1e6 100644 --- a/Content.Server/WireHacking/WiresComponent.cs +++ b/Content.Server/WireHacking/WiresComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification.Managers; +using Content.Shared.Sound; using Content.Shared.Tool; using Content.Shared.Wires; using JetBrains.Annotations; @@ -146,6 +147,15 @@ namespace Content.Server.WireHacking [DataField("LayoutId")] private string? _layoutId = default; + [DataField("pulseSound")] + private SoundSpecifier _pulseSound = new SoundPathSpecifier("/Audio/Effects/multitool_pulse.ogg"); + + [DataField("screwdriverOpenSound")] + private SoundSpecifier _screwdriverOpenSound = new SoundPathSpecifier("/Audio/Machines/screwdriveropen.ogg"); + + [DataField("screwdriverCloseSound")] + private SoundSpecifier _screwdriverCloseSound = new SoundPathSpecifier("/Audio/Machines/screwdriverclose.ogg"); + [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(WiresUiKey.Key); protected override void Initialize() @@ -447,7 +457,8 @@ namespace Content.Server.WireHacking return; } - SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/multitool_pulse.ogg", Owner); + if(_pulseSound.TryGetSound(out var pulseSound)) + SoundSystem.Play(Filter.Pvs(Owner), pulseSound, Owner); break; } @@ -497,8 +508,21 @@ namespace Content.Server.WireHacking else if (await tool.UseTool(eventArgs.User, Owner, 0.5f, ToolQuality.Screwing)) { IsPanelOpen = !IsPanelOpen; - SoundSystem.Play(Filter.Pvs(Owner), IsPanelOpen ? "/Audio/Machines/screwdriveropen.ogg" : "/Audio/Machines/screwdriverclose.ogg", - Owner); + if (IsPanelOpen) + { + if(_screwdriverOpenSound.TryGetSound(out var openSound)) + { + SoundSystem.Play(Filter.Pvs(Owner), openSound, Owner); + } + } + else + { + if (_screwdriverCloseSound.TryGetSound(out var closeSound)) + { + SoundSystem.Play(Filter.Pvs(Owner), closeSound, Owner); + } + } + return true; } diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs index c538ba8339..7e091ff651 100644 --- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs +++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs @@ -1,6 +1,7 @@ #nullable enable using System.Collections.Generic; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Sound; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -38,7 +39,7 @@ namespace Content.Shared.Chemistry.Reaction public IReadOnlyList Effects => _effects; // TODO SERV3: Empty on the client, (de)serialize on the server with module manager is server module - [DataField("sound", serverOnly: true)] public string? Sound { get; private set; } = "/Audio/Effects/Chemistry/bubbles.ogg"; + [DataField("sound", serverOnly: true)] public SoundSpecifier Sound { get; private set; } = new SoundPathSpecifier("/Audio/Effects/Chemistry/bubbles.ogg"); } /// diff --git a/Content.Shared/Gravity/GravityComponent.cs b/Content.Shared/Gravity/GravityComponent.cs index 3dae237516..7050f236ca 100644 --- a/Content.Shared/Gravity/GravityComponent.cs +++ b/Content.Shared/Gravity/GravityComponent.cs @@ -1,9 +1,11 @@ using System; using Content.Shared.NetIDs; +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Players; using Robust.Shared.Serialization; +using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Shared.Gravity @@ -14,6 +16,9 @@ namespace Content.Shared.Gravity public override string Name => "Gravity"; public override uint? NetID => ContentNetIDs.GRAVITY; + [DataField("gravityShakeSound")] + public SoundSpecifier GravityShakeSound { get; set; } = new SoundPathSpecifier("/Audio/Effects/alert.ogg"); + [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { diff --git a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs index 020d4b23a5..6ac9122c65 100644 --- a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs @@ -1,6 +1,7 @@ #nullable enable using Content.Shared.DragDrop; using Content.Shared.Nutrition.Components; +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -17,7 +18,7 @@ namespace Content.Shared.Kitchen.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("sound")] - protected string? SpikeSound = "/Audio/Effects/Fluids/splat.ogg"; + protected SoundSpecifier SpikeSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg"); bool IDragDropOn.CanDragDropOn(DragDropEvent eventArgs) { diff --git a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs index 618b0edfc1..2898549e92 100644 --- a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs +++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs @@ -1,5 +1,6 @@ -#nullable enable +#nullable enable using System; +using Content.Shared.Sound; using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -62,14 +63,14 @@ namespace Content.Shared.Light.Component [ViewVariables] [DataField("litSound")] - protected string LitSound { get; set; } = string.Empty; + protected SoundSpecifier LitSound { get; set; } = default!; [ViewVariables] [DataField("loopedSound")] - protected string LoopedSound { get; set; } = string.Empty; + protected string LoopedSound { get; set; } = default!; [ViewVariables] [DataField("dieSound")] - protected string DieSound { get; set; } = string.Empty; + protected SoundSpecifier DieSound { get; set; } = default!; } } diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 7e9849502e..bfff430f8b 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -1,11 +1,12 @@ -#nullable enable -using System.Collections.Generic; +#nullable enable +using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.ViewVariables; +using System.Collections.Generic; namespace Content.Shared.Maps { @@ -30,7 +31,7 @@ namespace Content.Shared.Maps [DataField("can_crowbar")] public bool CanCrowbar { get; private set; } - [DataField("footstep_sounds")] public string FootstepSounds { get; } = string.Empty; + [DataField("footstep_sounds")] public SoundSpecifier FootstepSounds { get; } = default!; [DataField("friction")] public float Friction { get; set; } diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index 12053612ae..d06a108383 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.Audio; using Content.Shared.EffectBlocker; using Content.Shared.Module; using Content.Shared.NetIDs; +using Content.Shared.Sound; using Content.Shared.Stunnable; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -36,7 +37,7 @@ namespace Content.Shared.Slippery private float _requiredSlipSpeed = 0.1f; private float _launchForwardsMultiplier = 1f; private bool _slippery = true; - private string _slipSound = "/Audio/Effects/slip.ogg"; + private SoundSpecifier _slipSound = new SoundPathSpecifier("/Audio/Effects/slip.ogg"); /// /// List of entities that are currently colliding with the entity. @@ -53,7 +54,7 @@ namespace Content.Shared.Slippery /// [ViewVariables] [DataField("slipSound")] - public string SlipSound + public SoundSpecifier SlipSound { get => _slipSound; set @@ -184,9 +185,9 @@ namespace Content.Shared.Slippery _slipped.Add(otherBody.Owner.Uid); Dirty(); - if (!string.IsNullOrEmpty(SlipSound) && _moduleManager.IsServerModule) + if (SlipSound.TryGetSound(out var slipSound) && _moduleManager.IsServerModule) { - SoundSystem.Play(Filter.Broadcast(), SlipSound, Owner, AudioHelpers.WithVariation(0.2f)); + SoundSystem.Play(Filter.Broadcast(), slipSound, Owner, AudioHelpers.WithVariation(0.2f)); } return true; @@ -232,7 +233,7 @@ namespace Content.Shared.Slippery public override ComponentState GetComponentState(ICommonSession player) { - return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound, _slipped.ToArray()); + return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound.GetSound(), _slipped.ToArray()); } public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) @@ -244,7 +245,7 @@ namespace Content.Shared.Slippery _paralyzeTime = state.ParalyzeTime; _requiredSlipSpeed = state.RequiredSlipSpeed; _launchForwardsMultiplier = state.LaunchForwardsMultiplier; - _slipSound = state.SlipSound; + _slipSound = new SoundPathSpecifier(state.SlipSound); _slipped.Clear(); foreach (var slipped in state.Slipped) diff --git a/Content.Shared/Sound/SoundSpecifier.cs b/Content.Shared/Sound/SoundSpecifier.cs index 616ccf9551..dff9987880 100644 --- a/Content.Shared/Sound/SoundSpecifier.cs +++ b/Content.Shared/Sound/SoundSpecifier.cs @@ -1,10 +1,9 @@ -using System; using Content.Shared.Audio; -using Robust.Shared; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.TypeSerializers.Implementations; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Utility; +using System.Diagnostics.CodeAnalysis; namespace Content.Shared.Sound { @@ -12,6 +11,8 @@ namespace Content.Shared.Sound public abstract class SoundSpecifier { public abstract string GetSound(); + + public abstract bool TryGetSound([NotNullWhen(true)] out string? sound); } [DataDefinition] @@ -19,7 +20,7 @@ namespace Content.Shared.Sound { public const string Node = "path"; - [DataField(Node, customTypeSerializer:typeof(ResourcePathSerializer), required:true)] + [DataField(Node, customTypeSerializer: typeof(ResourcePathSerializer), required: true)] public ResourcePath? Path { get; } public SoundPathSpecifier() @@ -40,6 +41,12 @@ namespace Content.Shared.Sound { return Path == null ? string.Empty : Path.ToString(); } + + public override bool TryGetSound([NotNullWhen(true)] out string? sound) + { + sound = GetSound(); + return !string.IsNullOrWhiteSpace(sound); + } } [DataDefinition] @@ -47,7 +54,7 @@ namespace Content.Shared.Sound { public const string Node = "collection"; - [DataField(Node, customTypeSerializer:typeof(PrototypeIdSerializer), required:true)] + [DataField(Node, customTypeSerializer: typeof(PrototypeIdSerializer), required: true)] public string? Collection { get; } public SoundCollectionSpecifier() @@ -63,5 +70,11 @@ namespace Content.Shared.Sound { return Collection == null ? string.Empty : AudioHelpers.GetRandomFileFromSoundCollection(Collection); } + + public override bool TryGetSound([NotNullWhen(true)] out string? sound) + { + sound = GetSound(); + return !string.IsNullOrWhiteSpace(sound); + } } } diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs index 1ed4fcd8c0..dcba6f3490 100644 --- a/Content.Shared/Standing/StandingStateComponent.cs +++ b/Content.Shared/Standing/StandingStateComponent.cs @@ -1,6 +1,7 @@ using System; using Content.Shared.EffectBlocker; using Content.Shared.NetIDs; +using Content.Shared.Sound; using Robust.Shared.GameObjects; using Robust.Shared.Players; using Robust.Shared.Serialization; @@ -18,7 +19,7 @@ namespace Content.Shared.Standing [ViewVariables(VVAccess.ReadWrite)] [DataField("downSoundCollection")] - public string? DownSoundCollection { get; } = "BodyFall"; + public SoundSpecifier DownSoundCollection { get; } = new SoundCollectionSpecifier("BodyFall"); [ViewVariables] [DataField("standing")] diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs index 51b98b7070..3932e5d0f7 100644 --- a/Content.Shared/Standing/StandingStateSystem.cs +++ b/Content.Shared/Standing/StandingStateSystem.cs @@ -62,12 +62,9 @@ namespace Content.Shared.Standing } // Currently shit is only downed by server but when it's predicted we can probably only play this on server / client - var sound = component.DownSoundCollection; - - if (playSound && !string.IsNullOrEmpty(sound)) + if (playSound && component.DownSoundCollection.TryGetSound(out var sound)) { - var file = AudioHelpers.GetRandomFileFromSoundCollection(sound); - SoundSystem.Play(Filter.Pvs(entity), file, entity, AudioHelpers.WithVariation(0.25f)); + SoundSystem.Play(Filter.Pvs(entity), sound, entity, AudioHelpers.WithVariation(0.25f)); } } diff --git a/Resources/Prototypes/Actions/actions.yml b/Resources/Prototypes/Actions/actions.yml index 12cd4632c6..bfa19e8785 100644 --- a/Resources/Prototypes/Actions/actions.yml +++ b/Resources/Prototypes/Actions/actions.yml @@ -29,19 +29,11 @@ behavior: !type:ScreamAction cooldown: 10 male: - - /Audio/Voice/Human/malescream_1.ogg - - /Audio/Voice/Human/malescream_2.ogg - - /Audio/Voice/Human/malescream_3.ogg - - /Audio/Voice/Human/malescream_4.ogg - - /Audio/Voice/Human/malescream_5.ogg - - /Audio/Voice/Human/malescream_6.ogg + collection: MaleScreams female: - - /Audio/Voice/Human/femalescream_1.ogg - - /Audio/Voice/Human/femalescream_2.ogg - - /Audio/Voice/Human/femalescream_3.ogg - - /Audio/Voice/Human/femalescream_4.ogg - - /Audio/Voice/Human/femalescream_5.ogg - wilhelm: /Audio/Voice/Human/wilhelm_scream.ogg + collection: FemaleScreams + wilhelm: + path: /Audio/Voice/Human/wilhelm_scream.ogg - type: action actionType: VoxScream @@ -53,10 +45,11 @@ behavior: !type:ScreamAction cooldown: 10 male: - - /Audio/Voice/Vox/shriek1.ogg + path: /Audio/Voice/Vox/shriek1.ogg female: - - /Audio/Voice/Vox/shriek1.ogg - wilhelm: /Audio/Voice/Human/wilhelm_scream.ogg + path: /Audio/Voice/Vox/shriek1.ogg + wilhelm: + path: /Audio/Voice/Human/wilhelm_scream.ogg - type: action actionType: GhostBoo diff --git a/Resources/Prototypes/Actions/spells.yml b/Resources/Prototypes/Actions/spells.yml index cfcb1709ce..f7a93149b8 100644 --- a/Resources/Prototypes/Actions/spells.yml +++ b/Resources/Prototypes/Actions/spells.yml @@ -10,4 +10,5 @@ spellItem: FoodPieBananaCream castMessage: I NEED A PIE! cooldown: 15 - castSound: /Audio/Items/bikehorn.ogg + castSound: + path: /Audio/Items/bikehorn.ogg diff --git a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml index d4b64963df..f4e7e8ce3d 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml @@ -10,7 +10,8 @@ netsync: false state: extinguisher_closed - type: ItemCabinet - doorSound: /Audio/Machines/machine_switch.ogg + doorSound: + path: /Audio/Machines/machine_switch.ogg whitelist: components: - FireExtinguisher diff --git a/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml index 1d5e811f09..1eff1df28e 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml @@ -10,7 +10,8 @@ netsync: false state: cabinet-filled-closed - type: ItemCabinet - doorSound: /Audio/Machines/machine_switch.ogg + doorSound: + path: /Audio/Machines/machine_switch.ogg whitelist: tags: - FireAxe diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index a024fba25d..40fffbd0a8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -21,7 +21,8 @@ Quantity: 100 - type: ItemCooldown - type: Spray - spraySound: /Audio/Effects/extinguish.ogg + spraySound: + path: /Audio/Effects/extinguish.ogg sprayedPrototype: ExtinguisherSpray hasSafety: true vaporAmount: 3 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index 0bae25cef0..bd7595458f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -21,7 +21,8 @@ - type: Spray transferAmount: 10 sprayVelocity: 2 - spraySound: /Audio/Effects/spray2.ogg + spraySound: + path: /Audio/Effects/spray2.ogg - type: entity name: spray bottle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 8237a11655..b59bb177f8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -102,7 +102,8 @@ ammoVelocity: 20 caliber: Energy - type: Projectile - soundHitSpecies: "/Audio/Weapons/Guns/Hits/taser_hit.ogg" + soundHit: + path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg" damages: Heat: 5 - type: StunnableProjectile diff --git a/Resources/Prototypes/SoundCollections/screams.yml b/Resources/Prototypes/SoundCollections/screams.yml new file mode 100644 index 0000000000..5f8b9690ba --- /dev/null +++ b/Resources/Prototypes/SoundCollections/screams.yml @@ -0,0 +1,18 @@ +- type: soundCollection + id: MaleScreams + files: + - /Audio/Voice/Human/malescream_1.ogg + - /Audio/Voice/Human/malescream_2.ogg + - /Audio/Voice/Human/malescream_3.ogg + - /Audio/Voice/Human/malescream_4.ogg + - /Audio/Voice/Human/malescream_5.ogg + - /Audio/Voice/Human/malescream_6.ogg + +- type: soundCollection + id: FemaleScreams + files: + - /Audio/Voice/Human/femalescream_1.ogg + - /Audio/Voice/Human/femalescream_2.ogg + - /Audio/Voice/Human/femalescream_3.ogg + - /Audio/Voice/Human/femalescream_4.ogg + - /Audio/Voice/Human/femalescream_5.ogg