From 21c41f28ed0ca193b74bfc963ab8a78162333969 Mon Sep 17 00:00:00 2001 From: Memory <58238103+FL-OZ@users.noreply.github.com> Date: Sun, 7 Jun 2020 08:55:15 -0500 Subject: [PATCH] Refactor all references to AudioSystem functions now that the old ones are obsolete. (#1081) Co-authored-by: FL-OZ --- Content.Server/Explosions/ExplosionHelper.cs | 2 +- .../Chemistry/ReagentDispenserComponent.cs | 2 +- .../Components/Chemistry/SolutionComponent.cs | 4 ++-- .../Construction/ConstructionComponent.cs | 4 ++-- .../Construction/ConstructorComponent.cs | 2 +- .../Components/Damage/DestructibleComponent.cs | 2 +- .../Components/Fluids/BucketComponent.cs | 4 ++-- .../Components/Fluids/MopComponent.cs | 2 +- .../Components/Fluids/PuddleComponent.cs | 2 +- .../Interactable/HandheldLightComponent.cs | 12 ++++++------ .../Interactable/MultitoolComponent.cs | 2 +- .../Components/Interactable/ToolComponent.cs | 4 ++-- .../Components/Items/DiceComponent.cs | 2 +- .../Components/Items/FloorTileItemComponent.cs | 2 +- .../Items/Storage/EntityStorageComponent.cs | 4 ++-- .../Storage/SecureEntityStorageComponent.cs | 4 ++-- .../Components/Kitchen/MicrowaveComponent.cs | 10 +++++----- .../Components/Mining/AsteroidRockComponent.cs | 2 +- .../Components/Mobs/StunnableComponent.cs | 2 +- .../Components/Movement/ServerPortalComponent.cs | 4 ++-- .../Movement/ServerTeleporterComponent.cs | 6 +++--- .../Components/Nutrition/DrinkComponent.cs | 4 ++-- .../Components/Nutrition/FoodComponent.cs | 2 +- .../Components/PottedPlantHideComponent.cs | 2 +- .../GameObjects/Components/Power/ApcComponent.cs | 2 +- .../Components/Power/LightBulbComponent.cs | 2 +- .../Components/Power/PoweredLightComponent.cs | 4 ++-- .../Research/ResearchConsoleComponent.cs | 2 +- .../Components/Sound/EmitSoundOnUseComponent.cs | 4 ++-- .../Sound/FootstepModifierComponent.cs | 2 +- .../Weapon/Melee/MeleeWeaponComponent.cs | 2 +- .../Weapon/Melee/StunbatonComponent.cs | 16 ++++++++-------- .../Ranged/Hitscan/HitscanWeaponComponent.cs | 2 +- .../BallisticMagazineWeaponComponent.cs | 8 ++++---- .../Weapon/Ranged/Projectile/BallisticWeapon.cs | 2 +- .../Projectile/BaseProjectileWeaponComponent.cs | 2 +- .../GameObjects/Components/WiresComponent.cs | 4 ++-- .../GameObjects/EntitySystems/GravitySystem.cs | 2 +- .../GameObjects/EntitySystems/MoverSystem.cs | 2 +- Content.Server/Mobs/StandingStateHelper.cs | 2 +- 40 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosions/ExplosionHelper.cs index 2028661f73..a7a61a6396 100644 --- a/Content.Server/Explosions/ExplosionHelper.cs +++ b/Content.Server/Explosions/ExplosionHelper.cs @@ -128,7 +128,7 @@ namespace Content.Server.Explosions Shaded = false }; entitySystemManager.GetEntitySystem().CreateParticle(message); - entitySystemManager.GetEntitySystem().Play("/Audio/effects/explosion.ogg", coords); + entitySystemManager.GetEntitySystem().PlayAtCoords("/Audio/effects/explosion.ogg", coords); // Knock back cameras of all players in the area. diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs index 1c40410ae0..63261077ae 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs @@ -323,7 +323,7 @@ namespace Content.Server.GameObjects.Components.Chemistry private void ClickSound() { - EntitySystem.Get().Play("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); } diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index 3dc50085b7..cd75c9aaac 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -288,7 +288,7 @@ namespace Content.Server.GameObjects.Components.Chemistry } else { - //This is trash but it shows the general idea + //This is trash but it shows the general idea var color = proto.SubstanceColor; var colorIsh = "Red"; if (color.G > color.R) @@ -492,7 +492,7 @@ namespace Content.Server.GameObjects.Components.Chemistry } //Play reaction sound client-side - _audioSystem.Play("/Audio/effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition); + _audioSystem.PlayAtCoords("/Audio/effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition); } /// diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index 65089adac6..f55f32cd75 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -130,9 +130,9 @@ namespace Content.Server.GameObjects.Components.Construction return false; } if (matStep.Material == MaterialType.Cable) - sound.Play("/Audio/items/zip.ogg", Transform.GridPosition); + sound.PlayAtCoords("/Audio/items/zip.ogg", Transform.GridPosition); else - sound.Play("/Audio/items/deconstruct.ogg", Transform.GridPosition); + sound.PlayAtCoords("/Audio/items/deconstruct.ogg", Transform.GridPosition); return true; case ConstructionStepTool toolStep: if (!slapped.TryGetComponent(out var tool)) diff --git a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs index 81ed05c74e..cfc98d3ddb 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs @@ -84,7 +84,7 @@ namespace Content.Server.GameObjects.Components.Construction } // OK WE'RE GOOD CONSTRUCTION STARTED. - EntitySystem.Get().Play("/Audio/items/deconstruct.ogg", loc); + EntitySystem.Get().PlayAtCoords("/Audio/items/deconstruct.ogg", loc); if (prototype.Stages.Count == 2) { // Exactly 2 stages, so don't make an intermediate frame. diff --git a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs index f66046a0d8..ed72c17540 100644 --- a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs @@ -76,7 +76,7 @@ namespace Content.Server.GameObjects.Components.Destructible _actSystem.HandleDestruction(Owner, true); if(destroySound != string.Empty) { - EntitySystem.Get().Play(destroySound, pos); + EntitySystem.Get().PlayAtCoords(destroySound, pos); } diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs index 7a6362cb59..9eb7c71ad0 100644 --- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs @@ -68,7 +68,7 @@ namespace Content.Server.GameObjects.Components.Fluids return true; } - EntitySystem.Get().Play(_sound, Owner); + EntitySystem.Get().PlayFromEntity(_sound, Owner); return true; } @@ -113,7 +113,7 @@ namespace Content.Server.GameObjects.Components.Fluids return true; } - EntitySystem.Get().Play(_sound, Owner); + EntitySystem.Get().PlayFromEntity(_sound, Owner); return true; diff --git a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs index da1fe70e05..3cab561acb 100644 --- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs @@ -110,7 +110,7 @@ namespace Content.Server.GameObjects.Components.Fluids return; } - EntitySystem.Get().Play(_pickupSound, Owner); + EntitySystem.Get().PlayFromEntity(_pickupSound, Owner); } } diff --git a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs index 1c11d44b02..f927117413 100644 --- a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs @@ -138,7 +138,7 @@ namespace Content.Server.GameObjects.Components.Fluids return true; } - EntitySystem.Get().Play(_spillSound); + EntitySystem.Get().PlayAtCoords(_spillSound, Owner.Transform.GridPosition); return true; } diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 8fb40fabe1..71d920d5fb 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -68,7 +68,7 @@ namespace Content.Server.GameObjects.Components.Interactable return false; } - EntitySystem.Get().Play("/Audio/items/weapons/pistol_magin.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner); Dirty(); @@ -132,7 +132,7 @@ namespace Content.Server.GameObjects.Components.Interactable SetState(false); Activated = false; - EntitySystem.Get().Play("/Audio/items/flashlight_toggle.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner); } @@ -147,7 +147,7 @@ namespace Content.Server.GameObjects.Components.Interactable if (cell == null) { - EntitySystem.Get().Play("/Audio/machines/button.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/machines/button.ogg", Owner); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing...")); return; @@ -158,7 +158,7 @@ namespace Content.Server.GameObjects.Components.Interactable // Simple enough. if (cell.AvailableCharge(1) < Wattage) { - EntitySystem.Get().Play("/Audio/machines/button.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/machines/button.ogg", Owner); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell...")); return; } @@ -166,7 +166,7 @@ namespace Content.Server.GameObjects.Components.Interactable Activated = true; SetState(true); - EntitySystem.Get().Play("/Audio/items/flashlight_toggle.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner); } @@ -214,7 +214,7 @@ namespace Content.Server.GameObjects.Components.Interactable cell.Owner.Transform.GridPosition = user.Transform.GridPosition; } - EntitySystem.Get().Play("/Audio/items/weapons/pistol_magout.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/items/weapons/pistol_magout.ogg", Owner); } diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs index 5dfc8514b8..e548f6e957 100644 --- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs @@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.Interactable SetTool(); var current = _tools[_currentTool]; if(!string.IsNullOrEmpty(current.ChangeSound)) - _audioSystem.Play(current.ChangeSound, Owner); + _audioSystem.PlayFromEntity(current.ChangeSound, Owner); } private void SetTool() diff --git a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs index 47efb47998..54e64c90e1 100644 --- a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs @@ -127,13 +127,13 @@ namespace Content.Server.GameObjects.Components.Interactable var soundCollection = _prototypeManager.Index(name); var file = _robustRandom.Pick(soundCollection.PickFiles); EntitySystem.Get() - .Play(file, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); + .PlayFromEntity(file, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); } public void PlayUseSound(float volume=-5f) { if(string.IsNullOrEmpty(UseSoundCollection)) - _audioSystem.Play(UseSound, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); + _audioSystem.PlayFromEntity(UseSound, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume)); else PlaySoundCollection(UseSoundCollection, volume); } diff --git a/Content.Server/GameObjects/Components/Items/DiceComponent.cs b/Content.Server/GameObjects/Components/Items/DiceComponent.cs index f1da53d8f9..9620c8bbd5 100644 --- a/Content.Server/GameObjects/Components/Items/DiceComponent.cs +++ b/Content.Server/GameObjects/Components/Items/DiceComponent.cs @@ -64,7 +64,7 @@ namespace Content.Server.GameObjects.Components.Items { var soundCollection = _prototypeManager.Index(_soundCollectionName); var file = _random.Pick(soundCollection.PickFiles); - EntitySystem.Get().Play(file, Owner, AudioParams.Default); + EntitySystem.Get().PlayFromEntity(file, Owner, AudioParams.Default); } } diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index d2ce9b31ae..cc1ce34725 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -53,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Items { var desiredTile = _tileDefinitionManager[_outputTile]; mapGrid.SetTile(eventArgs.ClickLocation, new Tile(desiredTile.TileId)); - EntitySystem.Get().Play("/Audio/items/genhit.ogg", eventArgs.ClickLocation); + EntitySystem.Get().PlayAtCoords("/Audio/items/genhit.ogg", eventArgs.ClickLocation); if(_stack.Count < 1){ Owner.Delete(); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index fcd72fdbf5..0b94299c7c 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -166,7 +166,7 @@ namespace Content.Server.GameObjects.Components } ModifyComponents(); - EntitySystem.Get().Play("/Audio/machines/closetclose.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/machines/closetclose.ogg", Owner); _lastInternalOpenAttempt = default; } @@ -175,7 +175,7 @@ namespace Content.Server.GameObjects.Components Open = true; EmptyContents(); ModifyComponents(); - EntitySystem.Get().Play("/Audio/machines/closetopen.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/machines/closetopen.ogg", Owner); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index 374b85050c..34ab66e526 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage if (CheckAccess(user)) return; Locked = false; - EntitySystem.Get().Play("/Audio/machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5)); + EntitySystem.Get().PlayFromEntity("/Audio/machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5)); } private void DoLock(IEntity user) @@ -116,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage if (CheckAccess(user)) return; Locked = true; - EntitySystem.Get().Play("/Audio/machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5)); + EntitySystem.Get().PlayFromEntity("/Audio/machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5)); } private bool CheckAccess(IEntity user) diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index 1c22da42b9..664b14c58d 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -301,8 +301,8 @@ namespace Content.Server.GameObjects.Components.Kitchen && (_currentCookTimerTime == (uint)recipeToCook.CookTime); SetAppearance(MicrowaveVisualState.Cooking); - _audioSystem.Play(_startCookingSound, Owner, AudioParams.Default); - Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), () => + _audioSystem.PlayFromEntity(_startCookingSound, Owner, AudioParams.Default); + Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), (System.Action)(() => { if (_lostPower) { @@ -332,13 +332,13 @@ namespace Content.Server.GameObjects.Components.Kitchen _entityManager.SpawnEntity(entityToSpawn, Owner.Transform.GridPosition); } } + _audioSystem.PlayFromEntity(_cookingCompleteSound, Owner, AudioParams.Default.WithVolume(-1f)); - _audioSystem.Play(_cookingCompleteSound, Owner, AudioParams.Default.WithVolume(-1f)); SetAppearance(MicrowaveVisualState.Idle); _busy = false; _uiDirty = true; - }); + })); _lostPower = false; _uiDirty = true; } @@ -440,7 +440,7 @@ namespace Content.Server.GameObjects.Components.Kitchen private void ClickSound() { - _audioSystem.Play("/Audio/machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f)); + _audioSystem.PlayFromEntity("/Audio/machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f)); } public SuicideKind Suicide(IEntity victim, IChatManager chat) diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs index 3b268ab71a..ef85c5eb4b 100644 --- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs @@ -42,7 +42,7 @@ namespace Content.Server.GameObjects.Components.Mining if (!item.TryGetComponent(out PickaxeComponent pickaxeComponent)) return true; if (!string.IsNullOrWhiteSpace(pickaxeComponent.MiningSound)) { - EntitySystem.Get().Play(pickaxeComponent.MiningSound, Owner, AudioParams.Default); + EntitySystem.Get().PlayFromEntity(pickaxeComponent.MiningSound, Owner, AudioParams.Default); } return true; } diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 43f0fb4abb..a4536c1c9d 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -170,7 +170,7 @@ namespace Content.Server.GameObjects.Components.Mobs Timer.Spawn(((int)_helpInterval*1000), () => _canHelp = true); EntitySystem.Get() - .Play("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f)); + .PlayFromEntity("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f)); _knockdownTimer -= _helpKnockdownRemove; diff --git a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs index 4426355aee..bc14e3e0ac 100644 --- a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs @@ -203,10 +203,10 @@ namespace Content.Server.GameObjects.Components.Movement // Departure // Do we need to rate-limit sounds to stop ear BLAST? - soundPlayer.Play(_departureSound, entity.Transform.GridPosition); + soundPlayer.PlayAtCoords(_departureSound, entity.Transform.GridPosition); entity.Transform.DetachParent(); entity.Transform.GridPosition = position; - soundPlayer.Play(_arrivalSound, entity.Transform.GridPosition); + soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.GridPosition); TryChangeState(PortalState.RecentlyTeleported); // To stop spam teleporting. Could potentially look at adding a timer to flush this from the portal immuneEntities.Add(entity); diff --git a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs index 3c1dffb2c2..f6aaaf46da 100644 --- a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs @@ -144,7 +144,7 @@ namespace Content.Server.GameObjects.Components.Movement if (_cooldownSound != null) { var soundPlayer = EntitySystem.Get(); - soundPlayer.Play(_cooldownSound, Owner); + soundPlayer.PlayFromEntity(_cooldownSound, Owner); } } @@ -249,12 +249,12 @@ namespace Content.Server.GameObjects.Components.Movement else { // Departure - soundPlayer.Play(_departureSound, user.Transform.GridPosition); + soundPlayer.PlayAtCoords(_departureSound, user.Transform.GridPosition); // Arrival user.Transform.DetachParent(); user.Transform.WorldPosition = vector; - soundPlayer.Play(_arrivalSound, user.Transform.GridPosition); + soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.GridPosition); } } diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 96cc82c607..79081b27db 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs @@ -93,7 +93,7 @@ namespace Content.Server.GameObjects.Components.Nutrition var soundCollection = _prototypeManager.Index(_soundCollection); var file = _random.Pick(soundCollection.PickFiles); - EntitySystem.Get().Play(file, args.User, AudioParams.Default); + EntitySystem.Get().PlayFromEntity(file, args.User, AudioParams.Default); _opened = true; return false; } @@ -146,7 +146,7 @@ namespace Content.Server.GameObjects.Components.Nutrition if (stomachComponent.TryTransferSolution(split)) { if (_useSound == null) return false; - EntitySystem.Get().Play(_useSound, target, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity(_useSound, target, AudioParams.Default.WithVolume(-2f)); target.PopupMessage(target, Loc.GetString("Slurp")); UpdateAppearance(); return true; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index 927b4873df..242efc0d0b 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -85,7 +85,7 @@ namespace Content.Server.GameObjects.Components.Nutrition if (stomachComponent.TryTransferSolution(split)) { _entitySystem.GetEntitySystem() - .Play(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f)); + .PlayFromEntity(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f)); trueTarget.PopupMessage(user, Loc.GetString("Nom")); } else diff --git a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs index 545a6e5fa4..5093ac5b01 100644 --- a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs +++ b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs @@ -87,7 +87,7 @@ namespace Content.Server.GameObjects.Components private void Rustle() { EntitySystem.Get() - .Play("/Audio/effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f)); + .PlayFromEntity("/Audio/effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f)); } } } diff --git a/Content.Server/GameObjects/Components/Power/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcComponent.cs index 41e577cc63..1af7714a77 100644 --- a/Content.Server/GameObjects/Components/Power/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcComponent.cs @@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.Components.Power private void _clickSound() { - EntitySystem.Get().Play("/Audio/machines/machine_switch.ogg", AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity("/Audio/machines/machine_switch.ogg", Owner,AudioParams.Default.WithVolume(-2f)); } } } diff --git a/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs b/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs index 4e61ede842..fd865a8b87 100644 --- a/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs +++ b/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs @@ -128,7 +128,7 @@ namespace Content.Server.GameObjects.Components.Power var soundCollection = _prototypeManager.Index("glassbreak"); var file = _random.Pick(soundCollection.PickFiles); - EntitySystem.Get().Play(file, Owner); + EntitySystem.Get().PlayFromEntity(file, Owner); State = LightBulbState.Broken; } diff --git a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs index d01520ec21..f0fcfbb807 100644 --- a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs @@ -79,7 +79,7 @@ namespace Content.Server.GameObjects.Components.Power { damageableComponent.TakeDamage(DamageType.Heat, 20, Owner); var audioSystem = EntitySystem.Get(); - audioSystem.Play("/Audio/effects/lightburn.ogg", Owner); + audioSystem.PlayFromEntity("/Audio/effects/lightburn.ogg", Owner); } void Eject() @@ -172,7 +172,7 @@ namespace Content.Server.GameObjects.Components.Power if (time > _lastThunk + _thunkDelay) { _lastThunk = time; - EntitySystem.Get().Play("/Audio/machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f)); + EntitySystem.Get().PlayFromEntity("/Audio/machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f)); } } else diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs index 6c74400096..c30d779ed4 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs @@ -122,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Research var soundCollection = _prototypeManager.Index(_soundCollectionName); var file = _random.Pick(soundCollection.PickFiles); var audioSystem = EntitySystem.Get(); - audioSystem.Play(file,Owner,AudioParams.Default); + audioSystem.PlayFromEntity(file,Owner,AudioParams.Default); } diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs index b1f466f136..e81c57a7df 100644 --- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs @@ -34,10 +34,10 @@ namespace Content.Server.GameObjects.Components.Sound { if (_pitchVariation > 0.0) { - EntitySystem.Get().Play(_soundName, Owner, AudioHelpers.WithVariation(_pitchVariation).WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity(_soundName, Owner, AudioHelpers.WithVariation(_pitchVariation).WithVolume(-2f)); return true; } - EntitySystem.Get().Play(_soundName, Owner, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity(_soundName, Owner, AudioParams.Default.WithVolume(-2f)); return true; } return false; diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs index 81f045259a..812a08fec5 100644 --- a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs @@ -41,7 +41,7 @@ namespace Content.Server.GameObjects.Components.Sound { var soundCollection = _prototypeManager.Index(_soundCollectionName); var file = _footstepRandom.Pick(soundCollection.PickFiles); - EntitySystem.Get().Play(file, Owner, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity(file, Owner, AudioParams.Default.WithVolume(-2f)); } } } diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index b0d3b84abb..6fc9d90f76 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -112,7 +112,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee var audioSystem = EntitySystem.Get(); var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0]; - audioSystem.Play(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg", emitter); + audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg", emitter); if (Arc != null) { diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 642cf54a1f..2c9985e99b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -86,7 +86,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee if (!Activated || entities.Count == 0 || cell == null || !cell.CanDeductCharge(EnergyPerUse)) return false; - EntitySystem.Get().Play("/Audio/weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); foreach (var entity in entities) { @@ -101,7 +101,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee cell.DeductCharge(EnergyPerUse); if(cell.Charge < EnergyPerUse) { - EntitySystem.Get().Play(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); TurnOff(); } @@ -132,7 +132,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee var sprite = Owner.GetComponent(); var item = Owner.GetComponent(); - EntitySystem.Get().Play(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); item.EquippedPrefix = "off"; sprite.LayerSetState(0, "stunbaton_off"); @@ -152,7 +152,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee if (cell == null) { - EntitySystem.Get().Play("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing...")); return; @@ -160,12 +160,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee if (cell.Charge < EnergyPerUse) { - EntitySystem.Get().Play("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell...")); return; } - EntitySystem.Get().Play(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); item.EquippedPrefix = "on"; sprite.LayerSetState(0, "stunbaton_on"); @@ -192,7 +192,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee return false; } - EntitySystem.Get().Play("/Audio/items/weapons/pistol_magin.ogg"); + EntitySystem.Get().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner); Dirty(); @@ -223,7 +223,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee cell.Owner.Transform.GridPosition = user.Transform.GridPosition; } - EntitySystem.Get().Play("/Audio/items/weapons/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/items/weapons/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); } public void Examine(FormattedMessage message, bool inDetailsRange) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 1fbdf0e5d6..f8f5444e2d 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -137,7 +137,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan Shaded = false }; EntitySystem.Get().CreateParticle(message); - EntitySystem.Get().Play(_fireSound, Owner, AudioParams.Default.WithVolume(-5)); + EntitySystem.Get().PlayFromEntity(_fireSound, Owner, AudioParams.Default.WithVolume(-5)); } } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index 42471b8191..b6e479cce2 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -107,7 +107,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile } if (_magInSound != null && playSound) { - EntitySystem.Get().Play(_magInSound, Owner); + EntitySystem.Get().PlayFromEntity(_magInSound, Owner); } magazinetype.OnAmmoCountChanged += MagazineAmmoCountChanged; if (GetChambered(0) == null) @@ -136,7 +136,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile entity.Transform.GridPosition = Owner.Transform.GridPosition; if (_magOutSound != null && playSound) { - EntitySystem.Get().Play(_magOutSound, Owner, AudioParams.Default.WithVolume(20)); + EntitySystem.Get().PlayFromEntity(_magOutSound, Owner, AudioParams.Default.WithVolume(20)); } UpdateAppearance(); Dirty(); @@ -162,7 +162,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile entity.Transform.GridPosition = Owner.Transform.GridPosition.Offset(offsetPos); entity.Transform.LocalRotation = _bulletDropRandom.Pick(RandomBulletDirs).ToAngle(); var effect = $"/Audio/Guns/Casings/casingfall{_bulletDropRandom.Next(1, 4)}.ogg"; - EntitySystem.Get().Play(effect, Owner, AudioParams.Default.WithVolume(-3)); + EntitySystem.Get().PlayFromEntity(effect, Owner, AudioParams.Default.WithVolume(-3)); if (Magazine != null) { @@ -193,7 +193,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile EjectMagazine(); if (_autoEjectSound != null) { - EntitySystem.Get().Play(_autoEjectSound, Owner, AudioParams.Default.WithVolume(-5)); + EntitySystem.Get().PlayFromEntity(_autoEjectSound, Owner, AudioParams.Default.WithVolume(-5)); } Dirty(); } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs index 6bfed83aa7..8b1f72da07 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs @@ -135,7 +135,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile return true; } - private void PlayEmptySound() => EntitySystem.Get().Play(_soundGunEmpty, Owner); + private void PlayEmptySound() => EntitySystem.Get().PlayFromEntity(_soundGunEmpty, Owner); protected sealed class Chamber { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs index 6bd4aec1e5..cbf2958c5b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs @@ -76,7 +76,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile } } - private void PlayFireSound() => EntitySystem.Get().Play(_soundGunshot, Owner); + private void PlayFireSound() => EntitySystem.Get().PlayFromEntity(_soundGunshot, Owner); /// /// Gets the angle from an entity to a coordinate. diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index 57b02423a4..312dcc3c87 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -428,7 +428,7 @@ namespace Content.Server.GameObjects.Components return; } - _audioSystem.Play("/Audio/effects/multitool_pulse.ogg", Owner); + _audioSystem.PlayFromEntity("/Audio/effects/multitool_pulse.ogg", Owner); break; } @@ -474,7 +474,7 @@ namespace Content.Server.GameObjects.Components IsPanelOpen = !IsPanelOpen; EntitySystem.Get() - .Play(IsPanelOpen ? "/Audio/machines/screwdriveropen.ogg" : "/Audio/machines/screwdriverclose.ogg", + .PlayFromEntity(IsPanelOpen ? "/Audio/machines/screwdriveropen.ogg" : "/Audio/machines/screwdriverclose.ogg", Owner); return true; } diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs index 5bfb57b4d8..d257bcec53 100644 --- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs @@ -93,7 +93,7 @@ namespace Content.Server.GameObjects.EntitySystems { if (player.AttachedEntity == null || player.AttachedEntity.Transform.GridID != gridId) continue; - EntitySystem.Get().Play("/Audio/effects/alert.ogg", player.AttachedEntity); + EntitySystem.Get().PlayFromEntity("/Audio/effects/alert.ogg", player.AttachedEntity); } } diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index 6e23b73861..125bafc35d 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -330,7 +330,7 @@ namespace Content.Server.GameObjects.EntitySystems { var soundCollection = _prototypeManager.Index(soundCollectionName); var file = _robustRandom.Pick(soundCollection.PickFiles); - _audioSystem.Play(file, coordinates); + _audioSystem.PlayAtCoords(file, coordinates); } catch (UnknownPrototypeException) { diff --git a/Content.Server/Mobs/StandingStateHelper.cs b/Content.Server/Mobs/StandingStateHelper.cs index 36e1c584c2..8fd677c66e 100644 --- a/Content.Server/Mobs/StandingStateHelper.cs +++ b/Content.Server/Mobs/StandingStateHelper.cs @@ -35,7 +35,7 @@ namespace Content.Server.Mobs if (playSound) IoCManager.Resolve().GetEntitySystem() - .Play(AudioHelpers.GetRandomFileFromSoundCollection("bodyfall"), entity, AudioHelpers.WithVariation(0.25f)); + .PlayFromEntity(AudioHelpers.GetRandomFileFromSoundCollection("bodyfall"), entity, AudioHelpers.WithVariation(0.25f)); if(dropItems) DropAllItemsInHands(entity);