Merge pull request #7072 from obrakmann/fmv-overhaul

Move FMV playback from Lua scripts to widgets

mods/ra/maps/allies-01/allies01.lua

@@ -142,14 +142,10 @@ end
 
 MissionAccomplished = function()
 	Media.PlaySpeechNotification(player, "Win")
-	Trigger.AfterDelay(DateTime.Seconds(1), function()
-		Media.PlayMovieFullscreen("snowbomb.vqa")
-	end)
 end
 
 MissionFailed = function()
 	Media.PlaySpeechNotification(player, "Lose")
-	Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("bmap.vqa") end)
 end
 
 SetUnitStances = function()
@@ -182,14 +178,12 @@ WorldLoaded = function()
 	Trigger.OnPlayerLost(player, MissionFailed)
 	Trigger.OnPlayerWon(player, MissionAccomplished)
 
-	Media.PlayMovieFullscreen("landing.vqa", function()
-		FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.")
-		TanyaSurviveObjective = player.AddPrimaryObjective("Tanya must survive.")
-		EinsteinSurviveObjective = player.AddPrimaryObjective("Einstein must survive.")
-		CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.")
+	FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.")
+	TanyaSurviveObjective = player.AddPrimaryObjective("Tanya must survive.")
+	EinsteinSurviveObjective = player.AddPrimaryObjective("Einstein must survive.")
+	CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.")
 
-		RunInitialActivities()
-	end)
+	RunInitialActivities()
 
 	Trigger.OnKilled(Lab, LabDestroyed)
 	Trigger.OnKilled(OilPump, OilPumpDestroyed)

mods/ra/maps/allies-01/map.yaml

@@ -10,8 +10,6 @@ Description: Rescue Einstein from the Headquarters inside this Soviet complex.\n
 
 Author: Westwood Studios
 
-PreviewVideo: ally1.vqa
-
 Tileset: SNOW
 
 MapSize: 128,128
@@ -22,6 +20,12 @@ UseAsShellmap: False
 
 Type: Campaign
 
+Videos:
+	Briefing: ally1.vqa
+	GameStart: landing.vqa
+	GameWon: snowbomb.vqa
+	GameLost: bmap.vqa
+
 Options:
 	Crates: False
 	Fog: True
@@ -586,7 +590,6 @@ Rules:
 			Scripts: allies01.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-		-StartGameNotification:
 	TRAN.Extraction:
 		Inherits: TRAN
 		RenderUnit:

mods/ra/maps/allies-02/allies02.lua

@@ -22,16 +22,10 @@ end
 
 MissionAccomplished = function()
 	Media.PlaySpeechNotification(player, "Win")
-	Trigger.AfterDelay(DateTime.Seconds(1), function()
-		Media.PlayMovieFullscreen("montpass.vqa")
-	end)
 end
 
 MissionFailed = function()
 	Media.PlaySpeechNotification(player, "Lose")
-	Trigger.AfterDelay(DateTime.Seconds(1), function()
-		Media.PlayMovieFullscreen("frozen.vqa")
-	end)
 end
 
 Tick = function()
@@ -109,9 +103,7 @@ WorldLoaded = function()
 	Trigger.OnPlayerLost(player, MissionFailed)
 	Trigger.OnPlayerWon(player, MissionAccomplished)
 
-	Media.PlayMovieFullscreen("mcv.vqa", function()
-		ConquestObjective = player.AddPrimaryObjective("Secure the area.")
-	end)
+	ConquestObjective = player.AddPrimaryObjective("Secure the area.")
 
 	Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlaySpeechNotification(allies, "MissionTimerInitialised") end)
 

mods/ra/maps/allies-02/map.yaml

@@ -10,8 +10,6 @@ Description: A critical supply convoy is due through this area in 10 minutes, bu
 
 Author: Westwood Studios
 
-PreviewVideo: ally2.vqa
-
 Tileset: SNOW
 
 MapSize: 128,128
@@ -22,6 +20,12 @@ UseAsShellmap: False
 
 Type: Campaign
 
+Videos:
+	Briefing: ally2.vqa
+	GameStart: mcv.vqa
+	GameWon: montpass.vqa
+	GameLost: frozen.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
@@ -882,7 +886,6 @@ Rules:
 			Scripts: allies02.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-		-StartGameNotification:
 	^Vehicle:
 		Tooltip:
 			GenericVisibility: Enemy

mods/ra/maps/allies-03a/allies03a.lua

@@ -114,13 +114,11 @@ InitObjectives = function()
 	Trigger.OnPlayerLost(player, function()
 		Trigger.AfterDelay(25, function()
 			Media.PlaySpeechNotification(player, "Lose")
-			Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("sovtstar.vqa") end)
 		end)
 	end)
 	Trigger.OnPlayerWon(player, function()
 		Trigger.AfterDelay(25, function()
 			Media.PlaySpeechNotification(player, "Win")
-			Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("toofar.vqa") end)
 		end)
 	end)
 end
@@ -250,9 +248,7 @@ WorldLoaded = function()
 
 	InitPlayers()
 
-	Media.PlayMovieFullscreen("brdgtilt.vqa", function()
-		InitObjectives()
-		InitTriggers()
-		SendAlliedUnits()
-	end)
+	InitObjectives()
+	InitTriggers()
+	SendAlliedUnits()
 end

mods/ra/maps/allies-03a/map.yaml

@@ -20,6 +20,11 @@ UseAsShellmap: False
 
 Type: Campaign
 
+Videos:
+	GameStart: brdgtilt.vqa
+	GameWon: toofar.vqa
+	GameLost: sovtstar.vqa
+
 Options:
 	ShortGame: False
 	Crates: False
@@ -1380,7 +1385,6 @@ Rules:
 			Scripts: allies03a.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-		-StartGameNotification:
 	^Infantry:
 		Tooltip:
 			GenericVisibility: Enemy

mods/ra/maps/soviet-01/map.yaml

@@ -20,7 +20,11 @@ UseAsShellmap: False
 
 Type: Campaign
 
-PreviewVideo: soviet1.vqa
+Videos:
+	Briefing: soviet1.vqa
+	GameStart: flare.vqa
+	GameWon: snstrafe.vqa
+	GameLost: sfrozen.vqa
 
 Options:
 	ShortGame: False
@@ -783,7 +787,6 @@ Rules:
 			Scripts: soviet01.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-		-StartGameNotification:
 	V01:
 		LeavesHusk:
 			HuskActor: healcrate

mods/ra/maps/soviet-01/soviet01.lua

@@ -46,27 +46,16 @@ WorldLoaded = function()
 		Media.DisplayMessage(p.GetObjectiveDescription(id), "Objective failed")
 	end)
 
-	Media.PlayMovieFullscreen("flare.vqa", function()
-		CivilProtectionObjective = france.AddPrimaryObjective("Protect the civilians.")
-		VillageRaidObjective = player.AddPrimaryObjective("Raze the village.")
-		JeepDemolishingBridge()
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlaySpeechNotification(player, "StartGame")
-		end)
-	end)
+	CivilProtectionObjective = france.AddPrimaryObjective("Protect the civilians.")
+	VillageRaidObjective = player.AddPrimaryObjective("Raze the village.")
+	JeepDemolishingBridge()
 
 	Trigger.OnPlayerWon(player, function()
 		Media.PlaySpeechNotification(player, "Win")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("snstrafe.vqa")
-		end)
 	end)
 
 	Trigger.OnPlayerLost(player, function()
 		Media.PlaySpeechNotification(player, "Lose")
-		Trigger.AfterDelay(DateTime.Seconds(1), function()
-			Media.PlayMovieFullscreen("sfrozen.vqa")
-		end)
 	end)
 
 	Trigger.AfterDelay(DateTime.Seconds(2), InsertYaks)