New Expedition Countdown Music (#213)

# Changelog :cl: - add: Added a second music called Deadline that plays when 2 minutes remain on a salvage expedition. --------- Co-authored-by: Pspritechologist <[email protected]>
Simple-Station · Oct 11, 2023 · 4a5e85d · 4a5e85d
1 parent b7ddf15
commit 4a5e85d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
@@ -4,6 +4,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.Salvage.Expeditions;
@@ -44,11 +45,8 @@ public sealed class SalvageExpeditionComponent : SharedSalvageExpeditionComponen
     /// <summary>
     /// Sound that plays when the mission end is imminent.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("sound")]
-    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Misc/tension_session.ogg")
-    {
-        Params = AudioParams.Default.WithVolume(-5),
-    };
+    [ViewVariables(VVAccess.ReadWrite), DataField("sound", customTypeSerializer: typeof(PrototypeIdSerializer<SoundCollectionPrototype>))] // Parkstation-ExpeditionMusic
+    public string Sound = "ExpeditionCountdownDefault"; // Parkstation-ExpeditionMusic
 
     /// <summary>
     /// The difficulty this mission had or, in the future, was selected.

diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -10,8 +10,10 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Salvage.Expeditions;
+using Robust.Shared.Audio;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Salvage;
@@ -164,7 +166,11 @@ private void UpdateRunner()
             else if (comp.Stage < ExpeditionStage.MusicCountdown && remaining < TimeSpan.FromMinutes(2))
             {
                 // TODO: Some way to play audio attached to a map for players.
-                comp.Stream = _audio.PlayGlobal(comp.Sound, Filter.BroadcastMap(Comp<MapComponent>(uid).MapId), true);
+                // Parkstation-ExpeditionMusic Start
+                if (_prototypeManager.TryIndex<SoundCollectionPrototype>(comp.Sound, out var sound))
+                    comp.Stream = _audio.PlayGlobal(new SoundPathSpecifier(_random.Pick(sound.PickFiles), AudioParams.Default.WithVolume(-6)),
+                        Filter.BroadcastMap(Comp<MapComponent>(uid).MapId), true);
+                // Parkstation-ExpeditionMusic End
                 comp.Stage = ExpeditionStage.MusicCountdown;
                 Dirty(comp);
                 Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", TimeSpan.FromMinutes(2).Minutes)));

diff --git a/Resources/Audio/Corvax/Announcements/epsilon_music.ogg b/Resources/Audio/Corvax/Announcements/epsilon_music.ogg
diff --git a/Resources/Audio/SimpleStation14/Music/attributions.yml b/Resources/Audio/SimpleStation14/Music/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["deadling.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by Bolgarich"
+  source: "https://youtu.be/q7_NFEeeEac"
diff --git a/Resources/Audio/SimpleStation14/Music/deadline.ogg b/Resources/Audio/SimpleStation14/Music/deadline.ogg
diff --git a/Resources/Prototypes/SimpleStation14/SoundCollections/Music/events.yml b/Resources/Prototypes/SimpleStation14/SoundCollections/Music/events.yml
@@ -0,0 +1,5 @@
+- type: soundCollection
+  id: ExpeditionCountdownDefault
+  files:
+    - /Audio/Misc/tension_session.ogg
+    - /Audio/SimpleStation14/Music/deadline.ogg