diff --git a/mods/cnc/audio/music.yaml b/mods/cnc/audio/music.yaml index 08bf4facc5..aca9f24d8f 100644 --- a/mods/cnc/audio/music.yaml +++ b/mods/cnc/audio/music.yaml @@ -37,9 +37,15 @@ trouble2: In Trouble (Voiced) Filename: trouble Extension: var justdoit: Just Do it Up +justdoit2: Just Do it Up (Voiced) + Filename: justdoit + Extension: var map1: Map Theme march: March to Doom nomercy: No Mercy +nomercy2: No Mercy (Voiced) + Filename: nomercy + Extension: var otp: On the Prowl prp: Prepare for Battle radio: Radio @@ -52,3 +58,6 @@ target: Target (Mechanical Man) j1: Untamed Land valkyrie: Ride of the Valkyries voic226m: Voice Rhythm +outtakes: Outtakes +nod_map1: Nod Map Theme +nod_win1: Nod Win Theme \ No newline at end of file diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 85d17c774d..2cef08fad9 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -291,6 +291,7 @@ Rules: PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: nomercy + VictoryMusic: nod_win1 C10: Tooltip: Name: Nikoomba diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml index bf42e40551..e4ad3d67c0 100644 --- a/mods/cnc/maps/nod02a/map.yaml +++ b/mods/cnc/maps/nod02a/map.yaml @@ -228,6 +228,7 @@ Rules: Scripts: nod02a.lua MusicPlaylist: StartingMusic: ind2 + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml index a2e61a2735..0a1fe599aa 100644 --- a/mods/cnc/maps/nod02b/map.yaml +++ b/mods/cnc/maps/nod02b/map.yaml @@ -270,6 +270,7 @@ Rules: Scripts: nod02b.lua MusicPlaylist: StartingMusic: ind2 + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index cbc36d8d04..0d7f550c0e 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -469,6 +469,7 @@ Rules: PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: chrg226m + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 527c88c00d..502dce0af4 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -513,6 +513,7 @@ Rules: PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: chrg226m + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml index c8fc9ab427..0f49bf9141 100644 --- a/mods/cnc/maps/nod04a/map.yaml +++ b/mods/cnc/maps/nod04a/map.yaml @@ -570,6 +570,7 @@ Rules: PanelName: MISSION_OBJECTIVES MusicPlaylist: StartingMusic: valkyrie + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml index 616d2df796..88b788e9de 100644 --- a/mods/cnc/maps/nod04b/map.yaml +++ b/mods/cnc/maps/nod04b/map.yaml @@ -509,6 +509,7 @@ Rules: Scripts: nod04b.lua MusicPlaylist: StartingMusic: warfare + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml index e5ec9568cd..348a4d1058 100644 --- a/mods/cnc/maps/nod05/map.yaml +++ b/mods/cnc/maps/nod05/map.yaml @@ -404,6 +404,7 @@ Rules: Scripts: nod05.lua MusicPlaylist: StartingMusic: airstrik + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml index dcf76654f8..3b7e726ffa 100644 --- a/mods/cnc/maps/nod06a/map.yaml +++ b/mods/cnc/maps/nod06a/map.yaml @@ -677,6 +677,7 @@ Rules: Scripts: nod06a.lua MusicPlaylist: StartingMusic: rout + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml index 630c6548fd..74d7601728 100644 --- a/mods/cnc/maps/nod06b/map.yaml +++ b/mods/cnc/maps/nod06b/map.yaml @@ -619,6 +619,7 @@ Rules: Scripts: nod06b.lua MusicPlaylist: StartingMusic: rout + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml index 9bf7c2d860..99ead3f91d 100644 --- a/mods/cnc/maps/nod06c/map.yaml +++ b/mods/cnc/maps/nod06c/map.yaml @@ -505,6 +505,7 @@ Rules: Scripts: nod06c.lua MusicPlaylist: StartingMusic: rout + VictoryMusic: nod_win1 ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index 2c961f6314..3cd793916c 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -5,7 +5,7 @@ ActorMap: MusicPlaylist: VictoryMusic: win1 - DefeatMusic: heart + DefeatMusic: nod_map1 TerrainGeometryOverlay: ShroudRenderer: ShroudVariants: typea, typeb, typec, typed