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

removes ambience from the lobby (#3428)

Browse Source 
* removes ambience from the lobby

* calls EndAmbience in StartAmbience
This commit is contained in:
tmtmtl30
2021-03-02 19:47:01 -08:00
committed by GitHub
parent 06f549d282
commit 57616f6270
1 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Content.Client/GameObjects/EntitySystems/AmbienceSystem.cs
View File

@@ -9,6 +9,9 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Client;
using Robust.Client.State;
using Content.Client.State;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {
@@ -18,6 +21,7 @@ namespace Content.Client.GameObjects.EntitySystems
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] private readonly IConfigurationManager _configManager = default!;
[Dependency] private readonly IStateManager _stateManager = default!;
private AudioSystem _audioSystem = default!; private AudioSystem _audioSystem = default!;
@@ -33,22 +37,59 @@ namespace Content.Client.GameObjects.EntitySystems
_audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>(); _audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>();
_ambientCollection = _prototypeManager.Index<SoundCollectionPrototype>("AmbienceBase"); _ambientCollection = _prototypeManager.Index<SoundCollectionPrototype>("AmbienceBase");
_configManager.OnValueChanged(CCVars.AmbienceBasicEnabled, HandleAmbience, true);
_configManager.OnValueChanged(CCVars.AmbienceBasicEnabled, AmbienceCVarChanged);
_stateManager.OnStateChanged += StateManagerOnStateChanged;
} }
private void HandleAmbience(bool ambienceEnabled) public override void Shutdown()
{ {
if (ambienceEnabled) base.Shutdown();
_stateManager.OnStateChanged -= StateManagerOnStateChanged;
}
private void StateManagerOnStateChanged(StateChangedEventArgs args)
{
if (args.NewState is not GameScreen)
{ {
var file = _robustRandom.Pick(_ambientCollection.PickFiles); EndAmbience();
_ambientStream = _audioSystem.Play(file, _ambientParams);
} }
else if (_ambientStream != null) else if (_configManager.GetCVar(CCVars.AmbienceBasicEnabled))
{ {
_ambientStream.Stop(); StartAmbience();
_ambientStream = null;
} }
} }
private void AmbienceCVarChanged(bool ambienceEnabled)
{
if (!ambienceEnabled)
{
EndAmbience();
}
else if (_stateManager.CurrentState is GameScreen)
{
StartAmbience();
}
}
private void StartAmbience()
{
EndAmbience();
var file = _robustRandom.Pick(_ambientCollection.PickFiles);
_ambientStream = _audioSystem.Play(file, _ambientParams);
}
private void EndAmbience()
{
if (_ambientStream == null)
{
return;
}
_ambientStream.Stop();
_ambientStream = null;
}
} }
} }