Merge pull request #7072 from obrakmann/fmv-overhaul

Move FMV playback from Lua scripts to widgets
2014-12-19 17:43:07 +13:00
parent e3068a8032 e342619ac7
commit 5b011e6baf
32 changed files with 342 additions and 227 deletions
--- a/mods/cnc/maps/gdi01/gdi01.lua
+++ b/mods/cnc/maps/gdi01/gdi01.lua
@@ -83,26 +83,18 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(25, function()
-			Media.PlayMovieFullscreen("consyard.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(25, function()
-			Media.PlayMovieFullscreen("gameover.vqa")
-		end)
 	end)

-	Media.PlayMovieFullscreen("landing.vqa", function()
-		nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops")
-		gdiObjective1 = player.AddPrimaryObjective("Eliminate all Nod forces in the area")
-		gdiObjective2 = player.AddSecondaryObjective("Establish a beachhead")
-		
-		ReinforceWithLandingCraft(MCVReinforcements, lstStart.Location + CVec.New(2, 0), lstEnd.Location + CVec.New(2, 0), mcvTarget.Location)
-		Reinforce(InfantryReinforcements)
-	end)
+	nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops")
+	gdiObjective1 = player.AddPrimaryObjective("Eliminate all Nod forces in the area")
+	gdiObjective2 = player.AddSecondaryObjective("Establish a beachhead")
+
+	ReinforceWithLandingCraft(MCVReinforcements, lstStart.Location + CVec.New(2, 0), lstEnd.Location + CVec.New(2, 0), mcvTarget.Location)
+	Reinforce(InfantryReinforcements)

 	Trigger.OnIdle(Gunboat, function() SetGunboatPath(Gunboat) end)

--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -10,8 +10,6 @@ Description: Use the units provided to protect the Mobile Construction Vehicle.

 Author: Westwood Studios

-PreviewVideo: gdi1.vqa
-
 Tileset: TEMPERAT

 MapSize: 64,64
@@ -22,6 +20,12 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	Briefing: gdi1.vqa
+	GameStart: landing.vqa
+	GameWon: consyard.vqa
+	GameLost: gameover.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/gdi02/gdi02.lua
+++ b/mods/cnc/maps/gdi02/gdi02.lua
@@ -72,16 +72,10 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("flag.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("gameover.vqa")
-		end)
 	end)

 	nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops")
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -10,8 +10,6 @@ Description: Defend your position, deploy the MCV, then build a sizable force to

 Author: Westwood Studios

-PreviewVideo: gdi2.vqa
-
 Tileset: TEMPERAT

 MapSize: 64,64
@@ -22,6 +20,11 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	Briefing: gdi2.vqa
+	GameWon: flag.vqa
+	GameLost: gameover.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/gdi03/gdi03.lua
+++ b/mods/cnc/maps/gdi03/gdi03.lua
@@ -59,24 +59,16 @@ WorldLoaded = function()
 		Media.DisplayMessage(p.GetObjectiveDescription(id), "Objective failed")
 	end)

-	Media.PlayMovieFullscreen("samdie.vqa", function()
-		nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops")
-		gdiMainObjective = player.AddPrimaryObjective("Eliminate all Nod forces in the area")
-		gdiAirSupportObjective = player.AddSecondaryObjective("Destroy the SAM sites to receive air support")
-	end)
+	nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops")
+	gdiMainObjective = player.AddPrimaryObjective("Eliminate all Nod forces in the area")
+	gdiAirSupportObjective = player.AddSecondaryObjective("Destroy the SAM sites to receive air support")

 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("gameover.vqa")
-		end)
 	end)

 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("bombaway.vqa")
-		end)
 	end)

 	Trigger.OnAllKilled(SamSites, function()
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -10,8 +10,6 @@ Description: Build up forces to destroy Nod base.\n\nOnce all Nod SAM sites are

 Author: Westwood Studios

-PreviewVideo: gdi3.vqa
-
 Tileset: TEMPERAT

 MapSize: 64,64
@@ -22,6 +20,12 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	Briefing: gdi3.vqa
+	GameStart: samdie.vqa
+	GameWon: bombaway.vqa
+	GameLost: gameover.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/gdi04a/gdi04a.lua
+++ b/mods/cnc/maps/gdi04a/gdi04a.lua
@@ -121,26 +121,16 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(gdi, function()
 		Media.PlaySpeechNotification(gdi, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("burdet1.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(gdi, function()
 		Media.PlaySpeechNotification(gdi, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("gameover.vqa")
-		end)
 	end)


-	Media.PlayMovieFullscreen("bkground.vqa", function()
-		Media.PlayMovieFullscreen("nitejump.vqa", function()
-			gdiObjective = gdi.AddPrimaryObjective("Retrieve the crate with the stolen rods.")
-			reinforcementsObjective = gdi.AddSecondaryObjective("Eliminate " .. KillsUntilReinforcements .. " Nod units for reinforcements.")
-			nod.AddPrimaryObjective("Defend against the GDI forces.")
-		end)
-	end)
+	gdiObjective = gdi.AddPrimaryObjective("Retrieve the crate with the stolen rods.")
+	reinforcementsObjective = gdi.AddSecondaryObjective("Eliminate " .. KillsUntilReinforcements .. " Nod units for reinforcements.")
+	nod.AddPrimaryObjective("Defend against the GDI forces.")

 	BuildNod1()
 	Utils.Do(NodHelis, function(heli)
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -10,8 +10,6 @@ Description: Nod has captured classified GDI property.\n\nYou must find and retr

 Author: Westwood Studios

-PreviewVideo: gdi4b.vqa
-
 Tileset: TEMPERAT

 MapSize: 64,64
@@ -22,6 +20,13 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	BackgroundInfo: bkground.vqa
+	Briefing: gdi4b.vqa
+	GameStart: nitejump.vqa
+	GameWon: burdet1.vqa
+	GameLost: gameover.vqa
+
 Options:
 	ShortGame: False
 	Cheats: False
--- a/mods/cnc/maps/gdi04b/gdi04b.lua
+++ b/mods/cnc/maps/gdi04b/gdi04b.lua
@@ -126,25 +126,15 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(gdi, function()
 		Media.PlaySpeechNotification(gdi, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("burdet1.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(gdi, function()
 		Media.PlaySpeechNotification(gdi, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("gameover.vqa")
-		end)
 	end)

-	Media.PlayMovieFullscreen("bkground.vqa", function()
-		Media.PlayMovieFullscreen("nitejump.vqa", function()
-			gdiObjective = gdi.AddPrimaryObjective("Retrieve the crate with the stolen rods.")
-			reinforcementsObjective = gdi.AddSecondaryObjective("Eliminate " .. KillsUntilReinforcements .. " Nod units for reinforcements.")
-			nod.AddPrimaryObjective("Defend against the GDI forces.")
-		end)
-	end)
+	gdiObjective = gdi.AddPrimaryObjective("Retrieve the crate with the stolen rods.")
+	reinforcementsObjective = gdi.AddSecondaryObjective("Eliminate " .. KillsUntilReinforcements .. " Nod units for reinforcements.")
+	nod.AddPrimaryObjective("Defend against the GDI forces.")

 	SetupWorld()

--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -10,8 +10,6 @@ Description: Nod has captured classified GDI property.\n\nYou must find and retr

 Author: Westwood Studios

-PreviewVideo: gdi4b.vqa
-
 Tileset: TEMPERAT

 MapSize: 64,64
@@ -22,6 +20,13 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	BackgroundInfo: bkground.vqa
+	Briefing: gdi4b.vqa
+	GameStart: nitejump.vqa
+	GameWon: burdet1.vqa
+	GameLost: gameover.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/gdi04c/gdi04c.lua
+++ b/mods/cnc/maps/gdi04c/gdi04c.lua
@@ -81,25 +81,15 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("burdet1.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("gameover.vqa")
-		end)
 	end)

-	Media.PlayMovieFullscreen("bkground.vqa", function()
-		Media.PlayMovieFullscreen("nodsweep.vqa", function()
-			nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops")
-			gdiObjective1 = player.AddPrimaryObjective("Defend the town of Bialystok")
-			gdiObjective2 = player.AddPrimaryObjective("Eliminate all Nod forces in the area")
-		end)
-	end)
+	nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops")
+	gdiObjective1 = player.AddPrimaryObjective("Defend the town of Bialystok")
+	gdiObjective2 = player.AddPrimaryObjective("Eliminate all Nod forces in the area")

 	townAttackTrigger = false
 	Trigger.OnExitedFootprint(TownAttackTrigger, function(a, id)
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -10,8 +10,6 @@ Description: Nod is moving to capture and hold a civilian town.\n\nYour mission

 Author: Westwood Studios

-PreviewVideo: gdi4a.vqa
-
 Tileset: TEMPERAT

 MapSize: 64,64
@@ -22,6 +20,13 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	BackgroundInfo: bkground.vqa
+	Briefing: gdi4a.vqa
+	GameStart: nodsweep.vqa
+	GameWon: burdet1.vqa
+	GameLost: gameover.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -10,8 +10,6 @@ Description: In order for the Brotherhood to gain a foothold, we must begin by e

 Author: Westwood Studios

-PreviewVideo: nod1.vqa
-
 Tileset: DESERT

 MapSize: 64,64
@@ -22,6 +20,10 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	Briefing: nod1.vqa
+	GameLost: nodlose.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/nod01/nod01.lua
+++ b/mods/cnc/maps/nod01/nod01.lua
@@ -52,9 +52,6 @@ WorldLoaded = function()

 	Trigger.OnPlayerLost(nod, function()
 		Media.PlaySpeechNotification(nod, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("nodlose.vqa")
-		end)
 	end)

 	NodObjective1 = nod.AddPrimaryObjective("Kill Nikoomba")
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -22,6 +22,12 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	Briefing: nod3.vqa
+	GameStart: dessweep.vqa
+	GameWon: desflees.vqa
+	GameLost: flag.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/nod03a/nod03a.lua
+++ b/mods/cnc/maps/nod03a/nod03a.lua
@@ -31,23 +31,15 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("desflees.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("flag.vqa")
-		end)
 	end)

-	Media.PlayMovieFullscreen("dessweep.vqa", function()
-		gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area")
-		nodObjective1 = player.AddPrimaryObjective("Capture the prison")
-		nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces")
-	end)
+	gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area")
+	nodObjective1 = player.AddPrimaryObjective("Capture the prison")
+	nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces")

 	Trigger.OnCapture(TechCenter, function()
 		Trigger.AfterDelay(DateTime.Seconds(2), function()
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -22,6 +22,12 @@ UseAsShellmap: False

 Type: Campaign

+Videos:
+	Briefing: nod3.vqa
+	GameStart: dessweep.vqa
+	GameWon: desflees.vqa
+	GameLost: flag.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
--- a/mods/cnc/maps/nod03b/nod03b.lua
+++ b/mods/cnc/maps/nod03b/nod03b.lua
@@ -47,23 +47,15 @@ WorldLoaded = function()

 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("desflees.vqa")
-		end)
 	end)

 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("flag.vqa")
-		end)
 	end)

-	Media.PlayMovieFullscreen("dessweep.vqa", function()
-		gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area")
-		nodObjective1 = player.AddPrimaryObjective("Capture the prison")
-		nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces")
-	end)
+	gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area")
+	nodObjective1 = player.AddPrimaryObjective("Capture the prison")
+	nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces")

 	Trigger.OnKilled(TechCenter, function() player.MarkFailedObjective(nodObjective1) end)
 	Trigger.OnCapture(TechCenter, function()