Fix power grid announcements overlapping power-down sounds (#2096)

Both announcements play 3s after startup / shutdown

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-09-21 09:14:40 +10:00
committed by GitHub
parent 1638c366cf
commit 685c7fadb2

View File

@@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Power.ApcNetComponents;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
@@ -7,6 +8,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Timer = Robust.Shared.Timers.Timer;
namespace Content.Server.StationEvents namespace Content.Server.StationEvents
{ {
@@ -28,6 +30,13 @@ namespace Content.Server.StationEvents
private float _elapsedTime; private float _elapsedTime;
private int _failDuration; private int _failDuration;
/// <summary>
/// So we don't overlap the announcement with power-down sounds we'll delay it a few seconds.
/// </summary>
private bool _announced;
private CancellationTokenSource _announceCancelToken;
private List<IEntity> _powered = new List<IEntity>(); private List<IEntity> _powered = new List<IEntity>();
@@ -35,8 +44,8 @@ namespace Content.Server.StationEvents
public override void Startup() public override void Startup()
{ {
base.Startup(); base.Startup();
EntitySystem.Get<AudioSystem>().PlayGlobal("/Audio/Announcements/power_off.ogg");
_announced = false;
_elapsedTime = 0.0f; _elapsedTime = 0.0f;
_failDuration = IoCManager.Resolve<IRobustRandom>().Next(30, 120); _failDuration = IoCManager.Resolve<IRobustRandom>().Next(30, 120);
var componentManager = IoCManager.Resolve<IComponentManager>(); var componentManager = IoCManager.Resolve<IComponentManager>();
@@ -51,7 +60,6 @@ namespace Content.Server.StationEvents
public override void Shutdown() public override void Shutdown()
{ {
base.Shutdown(); base.Shutdown();
EntitySystem.Get<AudioSystem>().PlayGlobal("/Audio/Announcements/power_on.ogg");
foreach (var entity in _powered) foreach (var entity in _powered)
{ {
@@ -63,6 +71,12 @@ namespace Content.Server.StationEvents
} }
} }
_announceCancelToken?.Cancel();
_announceCancelToken = new CancellationTokenSource();
Timer.Spawn(3000, () =>
{
EntitySystem.Get<AudioSystem>().PlayGlobal("/Audio/Announcements/power_on.ogg");
}, _announceCancelToken.Token);
_powered.Clear(); _powered.Clear();
} }
@@ -72,6 +86,12 @@ namespace Content.Server.StationEvents
{ {
return; return;
} }
if (!_announced && _elapsedTime > 3.0f)
{
EntitySystem.Get<AudioSystem>().PlayGlobal("/Audio/Announcements/power_off.ogg");
_announced = true;
}
_elapsedTime += frameTime; _elapsedTime += frameTime;