Prune lobby music slightly (#24480)

diff --git a/Resources/Audio/Lobby/Monument.ogg b/Resources/Audio/Lobby/Monument.ogg
deleted file mode 100644 (file)
index f27554f..0000000
Binary files a/Resources/Audio/Lobby/Monument.ogg and /dev/null differ

diff --git a/Resources/Audio/Lobby/atomicamnesiammx.ogg b/Resources/Audio/Lobby/atomicamnesiammx.ogg
deleted file mode 100644 (file)
index 09957d5..0000000
Binary files a/Resources/Audio/Lobby/atomicamnesiammx.ogg and /dev/null differ

diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
index c2dbd80d731f2e1acc3f88b44ca16ad4ef5f88dc..f3f0456d54f39eab67aad7ca2473f6119f369014 100644 (file)
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@@ -19,21 +19,11 @@
   copyright: "Absconditus by ZhayTee. Converted from MP3 to OGG."
   source: "https://bandcamp.zhaytee.net/track/absconditus"
 
-- files: ["atomicamnesiammx.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Atomic Amnesia MMX by Phillip Dyer. Converted from MP3 to OGG."
-  source: "https://soundcloud.com/3kliksphilip/atomic-amnesia-mmx-1"
-
 - files: ["singuloose.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Singuloose by Janis Schiedková. Converted from MP3 to OGG."
   source: "https://soundcloud.com/js_m/singuloose"
 
-- files: ["vibe_ace.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Vibe Ace by Kevin MacLeod. Converted from MP3 to OGG."
-  source: "https://freemusicarchive.org/music/Kevin_MacLeod/Jazz_Sampler/Vibe_Ace"
-
 - files: ["title2.ogg"]
   license: "Custom"
   copyright: "Originally composed by Jonathan Dunn for Robocop 2 Gameboy published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects."
@@ -44,11 +34,6 @@
   copyright: "Title3 by Cuboos. It is a remix of the song 'Tintin on the Moon'. Converted from MP3 to OGG."
   source: "https://www.youtube.com/watch?v=YKVmXn-Gv0M"
 
-- files: ["marhaba.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG."
-  source: "https://freemusicarchive.org/music/Ian_Alex_Mac/Cues/Marhaba"
-
 - files: ["comet_haley.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG."
@@ -59,11 +44,6 @@
   copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in this directory) and is free for non-commercial use. It was converted from MOD to WAV using Schism Tracker, in 16 Bit, Non-Interpolated mode, no output equalizer settings, Ramp volume at start of sample enabled. From there it was converted to OGG Vorbis with `ffmpeg -i flip-flap.wav -q 2.9 flip-flap-renc.ogg` (quality scale chosen to match size of the OGG file being replaced). Non-interpolated mode was chosen as the module has a high enough sample rate to balance it out, but seems muffled in other interpolation modes. If 'Ramp volume at start of sample' is not enabled, a clicking phenomenon results."
   source: "http://aminet.net/package/mods/xceed/Flipflap"
 
-- files: ["Monument.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Monument by Six Umbrellas."
-  source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"
-
 - files: ["Spac_Stac.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Spac Stac by Hayabusa. Converted from MP3 to OGG."

diff --git a/Resources/Audio/Lobby/marhaba.ogg b/Resources/Audio/Lobby/marhaba.ogg
deleted file mode 100644 (file)
index 7aa5902..0000000
Binary files a/Resources/Audio/Lobby/marhaba.ogg and /dev/null differ

diff --git a/Resources/Audio/Lobby/vibe_ace.ogg b/Resources/Audio/Lobby/vibe_ace.ogg
deleted file mode 100644 (file)
index b159019..0000000
Binary files a/Resources/Audio/Lobby/vibe_ace.ogg and /dev/null differ

diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
index 56cad93ef2c68617efd11da308fe1a8250f9b165..9b703af0d8c2e87238e87a73cb485b54260b3ae2 100644 (file)
--- a/Resources/Prototypes/SoundCollections/lobby.yml
+++ b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -5,16 +5,12 @@
     - /Audio/Lobby/absconditus.ogg
     - /Audio/Lobby/space_asshole.ogg
     - /Audio/Lobby/endless_space.ogg
-    - /Audio/Lobby/atomicamnesiammx.ogg
     - /Audio/Lobby/singuloose.ogg
     - /Audio/Lobby/comet_haley.ogg
-    - /Audio/Lobby/marhaba.ogg
     - /Audio/Lobby/title2.ogg
     - /Audio/Lobby/title3.ogg
     - /Audio/Lobby/mod.flip-flap.ogg
-    - /Audio/Lobby/Monument.ogg
     - /Audio/Lobby/Spac_Stac.ogg
     - /Audio/Lobby/pwmur.ogg
     - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
     - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/Lobby/vibe_ace.ogg