Merge pull request #8876 from pchote/music

Refine the music playlist code.

mods/cnc/audio/music.yaml

@@ -24,6 +24,7 @@ fwp: Fight Win Prevail
 fist226m: Iron Fist
 warfare: Warfare (Full Stop)
 win1: Great Shot!
+	Hidden: true
 win2: Great Shot! (Voiced)
 	Filename: win2
 	Extension: var
@@ -41,6 +42,7 @@ justdoit2: Just Do it Up (Voiced)
 	Filename: justdoit
 	Extension: var
 map1: Map Theme
+	Hidden: true
 march: March to Doom
 nomercy: No Mercy
 nomercy2: No Mercy (Voiced)
@@ -58,5 +60,9 @@ target: Target (Mechanical Man)
 j1: Untamed Land
 valkyrie: Ride of the Valkyries
 voic226m: Voice Rhythm
+outtakes: Outtakes
+	Hidden: true
 nod_map1: Nod Map Theme
-nod_win1: Nod Win Theme
+	Hidden: true
+nod_win1: Nod Win Theme
+	Hidden: true

mods/cnc/maps/shellmap/map.yaml

@@ -995,8 +995,7 @@ Rules:
 		LuaScript:
 			Scripts: shellmap.lua
 		MusicPlaylist:
-			StartingMusic: map1
-			LoopStartingMusic: True
+			BackgroundMusic: map1
 	LST:
 		Mobile:
 			Speed: 42

mods/d2k/audio/music.yaml

@@ -17,6 +17,7 @@ LANDSAND: Land of Sand
 	Extension: AUD
 OPTIONS: Options
 	Extension: AUD
+	Hidden: true
 PLOTTING: Plotting
 	Extension: AUD
 RISEHARK: Rise of Harkonnen
@@ -25,6 +26,7 @@ ROBOTIX: Robotix
 	Extension: AUD
 SCORE: Score
 	Extension: AUD
+	Hidden: true
 SOLDAPPR: The Soldiers Approach
 	Extension: AUD
 SPICESCT: Spice Scouting

mods/d2k/maps/shellmap/map.yaml

@@ -124,8 +124,7 @@ Rules:
 			Minimum: 1
 			Maximum: 1
 		MusicPlaylist:
-			StartingMusic: options
-			LoopStartingMusic: True
+			BackgroundMusic: options
 	rockettower:
 		Power:
 			Amount: 100

mods/ra/audio/music.yaml

@@ -1,9 +1,12 @@
 intro: Intro
+	Hidden: true
 map: Map
+	Hidden: true
 score: Militant Force
+	Hidden: true
 await_r: Await
 bigf226m: Bigfoot
-credits: End Credits
+credits: Reload Fire
 crus226m: Crush
 dense_r: Dense
 fac1226m: Face to the Enemy 1

mods/ra/maps/desert-shellmap/map.yaml

@@ -1255,6 +1255,8 @@ Rules:
 		-CrateSpawner:
 		-SpawnMPUnits:
 		-MPStartLocations:
+		MusicPlaylist:
+			BackgroundMusic: intro
 		ResourceType@ore:
 			ValuePerUnit: 0
 		LuaScript:

mods/ts/audio/music.yaml

@@ -1,5 +1,6 @@
 #Tiberian Sun
 intro: Intro
+	Hidden: true
 approach: Approach
 defense: The Defense
 duskhour: Dusk Hour
@@ -14,12 +15,14 @@ nodcrush: Nod Crush
 pharotek: Pharotek
 redsky: Red Sky
 score: Score
+	Hidden: true
 scout: Scouting
 storm: Storm
 timebomb: Timebomb
 valves1b: Valves
 whatlurk: What Lurks
 maps: Map Selection
+	Hidden: true
 #Firestorm
 dmachine: Deploy Machines
 elusive: Elusive

mods/ts/maps/blank-shellmap/map.yaml

@@ -41,8 +41,7 @@ Rules:
 		-SpawnMPUnits:
 		-MPStartLocations:
 		MusicPlaylist:
-			StartingMusic: intro
-			LoopStartingMusic: True
+			BackgroundMusic: intro
 
 Sequences: