Fix Music Links / Add CA Sound Track to core game

+Added Missing RA tracks from Retaliation +Changed to Ogg format to save a little space
Inq8 · Jun 23, 2024 · 528687e · 528687e
1 parent c262a88
commit 528687e
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 24 deletions.
diff --git a/mods/ca/audio/music.yaml b/mods/ca/audio/music.yaml
@@ -77,6 +77,26 @@ search: The Search
 traction: Traction
 wastelnd: Wasteland
 
+# Retaliation tracks
+hell226m_retal: Hell March (Remix)
+	Extension: ogg
+	VolumeModifier: 0.7
+radio2_retal: Radio 2 (Remix)
+	Extension: ogg
+	VolumeModifier: 0.7
+crus226m_retal: Crush (Remix)
+	Extension: ogg
+	VolumeModifier: 0.7
+mud_remix: Mud (Remix)
+	Extension: ogg
+	VolumeModifier: 0.7
+work226m_retal: Workmen (Remix)
+	Extension: ogg
+	VolumeModifier: 0.7
+fac1226m_retal: Face to the Enemy 1 (Remix)
+	Extension: ogg
+	VolumeModifier: 0.85
+
 # C&C
 aoi: Act On Instinct
 	VolumeModifier: 0.65
@@ -230,6 +250,7 @@ fsmenu: Main (FS)
 	Hidden: true
 fsmap: Map (FS)
 	Hidden: true
+
 #Bonus tracks
 stomp: Stomp
 initiate: Initiate
@@ -287,6 +308,7 @@ mforce2: Militant Force 2
 	Extension: wav
 	Hidden: true
 	VolumeModifier: 0.6
+
 #YR themes
 brainfre: Brain Freeze
 	Extension: wav
@@ -319,28 +341,29 @@ scorex: Score YR
 	Extension: wav
 	Hidden: true
 	VolumeModifier: 0.6
+
 #Darkademic themes
 moi: March on Instinct
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
 drill: Drill (CA Remix)
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
 creep: Creeping Upon (CA Remix)
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
 radio2ca: Radio 2 (CA Remix)
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
 subvn: Subversion
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
 recon: Recon (CA Remix)
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
 moi2: March on Instinct 2
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.9
 gateway: Gateway
-	Extension: mp3
+	Extension: ogg
 	VolumeModifier: 0.7
diff --git a/mods/ca/bits/audio/moi2.mp3 b/mods/ca/bits/audio/moi2.mp3
diff --git a/mods/ca/bits/music/creep.ogg b/mods/ca/bits/music/creep.ogg
diff --git a/mods/ca/bits/music/crus226m_retal.ogg b/mods/ca/bits/music/crus226m_retal.ogg
diff --git a/mods/ca/bits/music/drill.ogg b/mods/ca/bits/music/drill.ogg
diff --git a/mods/ca/bits/music/fac1226m_retal.ogg b/mods/ca/bits/music/fac1226m_retal.ogg
diff --git a/mods/ca/bits/music/gateway.ogg b/mods/ca/bits/music/gateway.ogg
diff --git a/mods/ca/bits/music/hell226m_retal.ogg b/mods/ca/bits/music/hell226m_retal.ogg
diff --git a/mods/ca/bits/music/moi.ogg b/mods/ca/bits/music/moi.ogg
diff --git a/mods/ca/bits/music/moi2.ogg b/mods/ca/bits/music/moi2.ogg
diff --git a/mods/ca/bits/music/mud_remix.ogg b/mods/ca/bits/music/mud_remix.ogg
diff --git a/mods/ca/bits/music/radio2_retal.ogg b/mods/ca/bits/music/radio2_retal.ogg
diff --git a/mods/ca/bits/music/radio2ca.ogg b/mods/ca/bits/music/radio2ca.ogg
diff --git a/mods/ca/bits/music/recon.ogg b/mods/ca/bits/music/recon.ogg
diff --git a/mods/ca/bits/music/subvn.ogg b/mods/ca/bits/music/subvn.ogg
diff --git a/mods/ca/bits/music/work226m_retal.ogg b/mods/ca/bits/music/work226m_retal.ogg
diff --git a/mods/ca/installer/downloads.yaml b/mods/ca/installer/downloads.yaml
@@ -100,15 +100,36 @@ cncdesert: C&C Desert Tileset
 	Extract:
 		^SupportDir|Content/ca/cnc/desert.mix: cnc/desert.mix
 
-music-ca: CA Music
+music-cnc: C&C Music
 	Type: ZipFile
-	URL: http://www.darkademic.co.uk/ca/music.zip
+	URL: https://openra.baxxster.no/openra/cnc-music.zip
 	Extract:
-		^SupportDir|Content/ca/music/moi.mp3: moi.mp3
-		^SupportDir|Content/ca/music/drill.mp3: drill.mp3
-		^SupportDir|Content/ca/music/creep.mp3: creep.mp3
-		^SupportDir|Content/ca/music/radio2ca.mp3: radio2ca.mp3
-		^SupportDir|Content/ca/music/subvn.mp3: subvn.mp3
-		^SupportDir|Content/ca/music/recon.mp3: recon.mp3
-		^SupportDir|Content/ca/music/moi2.mp3: moi2.mp3
-		^SupportDir|Content/ca/music/gateway.mp3: gateway.mp3
+		^SupportDir|Content/ca/cnc/scores.mix: scores.mix
+
+music-ra: Red Alert Music
+	Type: ZipFile
+	URL: https://openra.baxxster.no/openra/ra-music.zip
+	Extract:
+		^SupportDir|Content/ca/ra/scores.mix: scores.mix
+
+music-ts: Tib Sun Music
+	Type: ZipFile
+	URL: https://openra.baxxster.no/openra/ts-music.zip
+	Extract:
+		^SupportDir|Content/ca/ts/scores.mix: scores.mix
+
+music-fs: Expansion Freeware Music
+	Type: ZipFile
+	SHA1: 74b1ec47ea8c9815fb85c998963229aa0a8f8619
+	URL: https://openra.baxxster.no/openra/ts-fsmusic.zip
+	Extract:
+		^SupportDir|Content/ca/firestorm/dmachine.aud: firestorm/dmachine.aud
+		^SupportDir|Content/ca/firestorm/elusive.aud: firestorm/elusive.aud
+		^SupportDir|Content/ca/firestorm/fsmap.aud: firestorm/fsmap.aud
+		^SupportDir|Content/ca/firestorm/fsmenu.aud: firestorm/fsmenu.aud
+		^SupportDir|Content/ca/firestorm/hacker.aud: firestorm/hacker.aud
+		^SupportDir|Content/ca/firestorm/infiltra.aud: firestorm/infiltra.aud
+		^SupportDir|Content/ca/firestorm/kmachine.aud: firestorm/kmachine.aud
+		^SupportDir|Content/ca/firestorm/linkup.aud: firestorm/linkup.aud
+		^SupportDir|Content/ca/firestorm/rainnite.aud: firestorm/rainnite.aud
+		^SupportDir|Content/ca/firestorm/slavesys.aud: firestorm/slavesys.aud
diff --git a/mods/ca/mod.yaml b/mods/ca/mod.yaml
@@ -50,6 +50,7 @@ Packages:
 	ca|bits/int
 	ca|bits/snow
 	ca|bits/audio
+	ca|bits/music
 	ca|uibits
 	ca|bits/scrin
 	ca|bits/scrin/audio
@@ -268,7 +269,7 @@ DefaultOrderGenerator: UnitOrderGenerator
 
 SupportsMapsFrom: ca, ra
 
-SoundFormats: Aud, Wav, Mp3
+SoundFormats: Aud, Wav, Mp3, Ogg
 
 SpriteFormats: ShpD2, R8, ShpTD, TmpRA, TmpTD, ShpTS
 
@@ -359,20 +360,17 @@ ModContent:
 			Sources: cnc95, tfd, cnc-steam, cncr-steam, cnc-origin, cncr-origin
 			Required: true
 			Download: cncdesert
-		ContentPackage@music-ca:
-			Title: Combined Arms Music
-			Identifier: music-ca
-			TestFiles: ^SupportDir|Content/ca/music/moi.mp3, ^SupportDir|Content/ca/music/drill.mp3, ^SupportDir|Content/ca/music/creep.mp3, ^SupportDir|Content/ca/music/radio2ca.mp3, ^SupportDir|Content/ca/music/subvn.mp3, ^SupportDir|Content/ca/music/recon.mp3, ^SupportDir|Content/ca/music/moi2.mp3, ^SupportDir|Content/ca/music/gateway.mp3
-			Download: music-ca
 		ContentPackage@music-cnc:
 			Title: Tiberian Dawn Music
 			Identifier: music-cnc
 			TestFiles: ^SupportDir|Content/ca/cnc/scores.mix
+			Download: music-cnc
 			Sources: covertops, cnc95, tfd, cnc-steam, cncr-steam, cnc-origin, cncr-origin
 		ContentPackage@music-ra:
 			Title: Red Alert Music
 			Identifier: music-ra
 			TestFiles: ^SupportDir|Content/ca/ra/scores.mix
+			Download: music-ra
 			Sources: allied, soviet, tfd, ra-steam, cncr-steam, ra-origin, cncr-origin
 		ContentPackage@music-counterstrike:
 			Title: Counterstrike Music
@@ -388,11 +386,13 @@ ModContent:
 			Title: Tiberian Sun Music
 			Identifier: music-ts
 			TestFiles: ^SupportDir|Content/ca/ts/scores.mix
+			Download: music-ts
 			Sources: tibsun, ts-steam, ts-origin
 		ContentPackage@music-firestorm:
 			Title: Firestorm Music
 			Identifier: music-firestorm
 			TestFiles: ^SupportDir|Content/ca/firestorm/dmachine.aud, ^SupportDir|Content/ca/firestorm/elusive.aud, ^SupportDir|Content/ca/firestorm/hacker.aud, ^SupportDir|Content/ca/firestorm/infiltra.aud, ^SupportDir|Content/ca/firestorm/kmachine.aud, ^SupportDir|Content/ca/firestorm/linkup.aud, ^SupportDir|Content/ca/firestorm/rainnite.aud, ^SupportDir|Content/ca/firestorm/slavesys.aud
+			Download: music-fs
 			Sources: firestorm, ts-steam, ts-origin
 		ContentPackage@music-ra2:
 			Title: Red Alert 2 Music