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

Rename SoundComponent and refactor its wrong usages. (#1036)

Browse Source 
* Rename `SoundComponent` and refactor its wrong usages.

* Replace verbose IoC grabs with EntitySysetm.Get

* unused depend

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
FL-OZ
2020-05-31 12:40:36 -05:00
committed by GitHub
parent 8db5adb387
commit 53900b79e9
30 changed files with 137 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
View File

@@ -12,13 +12,13 @@ namespace Content.Client.GameObjects.Components.Kitchen
{
public sealed class MicrowaveVisualizer : AppearanceVisualizer
{
private SoundComponent _soundComponent;
private LoopingSoundComponent _loopingSoundComponent;
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var sprite = component.Owner.GetComponent<ISpriteComponent>();
_soundComponent ??= component.Owner.GetComponent<SoundComponent>();
_loopingSoundComponent ??= component.Owner.GetComponent<LoopingSoundComponent>();
if (!component.TryGetData(PowerDeviceVisuals.VisualState, out MicrowaveVisualState state))
{
state = MicrowaveVisualState.Idle;
@@ -28,7 +28,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
case MicrowaveVisualState.Idle:
sprite.LayerSetState(MicrowaveVisualizerLayers.Base, "mw");
sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mw_unlit");
_soundComponent.StopAllSounds();
_loopingSoundComponent.StopAllSounds();
break;
case MicrowaveVisualState.Cooking:
@@ -39,8 +39,8 @@ namespace Content.Client.GameObjects.Components.Kitchen
var schedSound = new ScheduledSound();
schedSound.Filename = "/Audio/machines/microwave_loop.ogg";
schedSound.AudioParams = audioParams;
_soundComponent.StopAllSounds();
_soundComponent.AddScheduledSound(schedSound);
_loopingSoundComponent.StopAllSounds();
_loopingSoundComponent.AddScheduledSound(schedSound);
break;
default: