diff --git a/mods/cnc/maps/gdi01/gdi01.lua b/mods/cnc/maps/gdi01/gdi01.lua index a72f09d2d5..3b00bca278 100644 --- 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) diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 8fc60d9c8c..c83bae8e5f 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index dd58233f75..71b097169c 100644 --- 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") diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 62c348865f..833b87bb34 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/gdi03/gdi03.lua b/mods/cnc/maps/gdi03/gdi03.lua index 5dfb23f22c..cd2dc4aa28 100644 --- 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() diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 4ec7a782a9..d6844575a7 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/gdi04a/gdi04a.lua b/mods/cnc/maps/gdi04a/gdi04a.lua index 637150af1a..795380b4a1 100644 --- 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) diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index 205059de81..b2290cf9db 100644 --- 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: Cheats: False Crates: False diff --git a/mods/cnc/maps/gdi04b/gdi04b.lua b/mods/cnc/maps/gdi04b/gdi04b.lua index 96501f0d5e..c04c2c7844 100644 --- 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() diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 770e70ee99..079aace9ce 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index 32f098899a..fc9e3a9f73 100644 --- 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) diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 9aee35cbfd..0f902080a1 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index f400ea530b..5744194484 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index cd3dcf9ec5..8e5a80ab65 100644 --- 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") diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index d6541ae6ec..459fda5b22 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index d1c1bb9909..ca035ea648 100644 --- 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() diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index f704be7a0b..2e9d47b926 100644 --- 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: Crates: False Fog: True diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index a8c5609ab9..4f7e9842c0 100644 --- 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() diff --git a/mods/ra/maps/allies-01/allies01.lua b/mods/ra/maps/allies-01/allies01.lua index d20f14ca3b..a3557a9f6d 100644 --- a/mods/ra/maps/allies-01/allies01.lua +++ b/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) diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index 6d4fb202bc..194dca0b8c 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/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: diff --git a/mods/ra/maps/allies-02/allies02.lua b/mods/ra/maps/allies-02/allies02.lua index a332d67400..244586136f 100644 --- a/mods/ra/maps/allies-02/allies02.lua +++ b/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) diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 44b654d70c..8668f38ceb 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/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: Crates: False Fog: True @@ -881,7 +885,6 @@ Rules: Scripts: allies02.lua ObjectivesPanel: PanelName: MISSION_OBJECTIVES - -StartGameNotification: ^Vehicle: MustBeDestroyed: Tooltip: diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua index a230e87b20..31e35483cb 100644 --- a/mods/ra/maps/allies-03a/allies03a.lua +++ b/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 diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 4d4b84c40d..08d980944a 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/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: Crates: False Fog: True @@ -1379,7 +1384,6 @@ Rules: Scripts: allies03a.lua ObjectivesPanel: PanelName: MISSION_OBJECTIVES - -StartGameNotification: ^Infantry: MustBeDestroyed: Tooltip: diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 0aa80801f7..6281dfb4e5 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/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: Crates: False @@ -782,7 +786,6 @@ Rules: Scripts: soviet01.lua ObjectivesPanel: PanelName: MISSION_OBJECTIVES - -StartGameNotification: V01: LeavesHusk: HuskActor: healcrate diff --git a/mods/ra/maps/soviet-01/soviet01.lua b/mods/ra/maps/soviet-01/soviet01.lua index 60b8e60fd2..c135a5ec63 100644 --- a/mods/ra/maps/soviet-01/soviet01.lua +++ b/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)