diff --git a/mods/cnc/maps/gdi04a/gdi04a.lua b/mods/cnc/maps/gdi04a/gdi04a.lua index 8de8688be0..637150af1a 100644 --- a/mods/cnc/maps/gdi04a/gdi04a.lua +++ b/mods/cnc/maps/gdi04a/gdi04a.lua @@ -133,9 +133,14 @@ WorldLoaded = function() 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.") + + 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) BuildNod1() Utils.Do(NodHelis, function(heli) @@ -161,6 +166,4 @@ WorldLoaded = function() end) Camera.Position = Actor56.CenterPosition - - Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end) end diff --git a/mods/cnc/maps/gdi04b/gdi04b.lua b/mods/cnc/maps/gdi04b/gdi04b.lua index 86f6d67458..96501f0d5e 100644 --- a/mods/cnc/maps/gdi04b/gdi04b.lua +++ b/mods/cnc/maps/gdi04b/gdi04b.lua @@ -138,9 +138,13 @@ WorldLoaded = function() 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.") + 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) SetupWorld() @@ -193,6 +197,4 @@ WorldLoaded = function() end) Camera.Position = GDIReinforcementsWP1.CenterPosition - - Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end) end diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index df7692bed7..32f098899a 100644 --- a/mods/cnc/maps/gdi04c/gdi04c.lua +++ b/mods/cnc/maps/gdi04c/gdi04c.lua @@ -93,9 +93,13 @@ WorldLoaded = function() 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") + 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) townAttackTrigger = false Trigger.OnExitedFootprint(TownAttackTrigger, function(a, id) @@ -125,8 +129,6 @@ WorldLoaded = function() end) Camera.Position = Actor141.CenterPosition - - Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nodsweep.vqa") end) end Tick = function() diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index f0fa1f1d93..d1c1bb9909 100644 --- a/mods/cnc/maps/nod03a/nod03a.lua +++ b/mods/cnc/maps/nod03a/nod03a.lua @@ -43,9 +43,11 @@ WorldLoaded = function() end) end) - gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area") - nodObjective1 = player.AddPrimaryObjective("Capture the prison") - nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces") + 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) Trigger.OnCapture(TechCenter, function() Trigger.AfterDelay(DateTime.Seconds(2), function() diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index 3a92617799..a8c5609ab9 100644 --- a/mods/cnc/maps/nod03b/nod03b.lua +++ b/mods/cnc/maps/nod03b/nod03b.lua @@ -59,9 +59,11 @@ WorldLoaded = function() end) end) - gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area") - nodObjective1 = player.AddPrimaryObjective("Capture the prison") - nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces") + 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) Trigger.OnKilled(TechCenter, function() player.MarkFailedObjective(nodObjective1) end) Trigger.OnCapture(TechCenter, function() @@ -74,7 +76,6 @@ WorldLoaded = function() Trigger.AfterDelay(DateTime.Seconds(40), function() SendAttackWave(FirstAttackWaveUnits, FirstAttackWave) end) Trigger.AfterDelay(DateTime.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end) Trigger.AfterDelay(DateTime.Seconds(140), function() SendAttackWave(ThirdAttackWaveUnits, FirstAttackWave) end) - end Tick = function() diff --git a/mods/ra/maps/allies-01/allies01.lua b/mods/ra/maps/allies-01/allies01.lua index 9a1317f814..230d436c4b 100644 --- a/mods/ra/maps/allies-01/allies01.lua +++ b/mods/ra/maps/allies-01/allies01.lua @@ -175,11 +175,15 @@ WorldLoaded = function() Trigger.OnPlayerLost(player, MissionFailed) Trigger.OnPlayerWon(player, MissionAccomplished) - FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.") - SurviveObjective = player.AddPrimaryObjective("Tanya and Einstein must survive.") - england.AddPrimaryObjective("Destroy the soviet base after a successful rescue.") - CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.") - DefendObjective = ussr.AddPrimaryObjective("Kill Tanya and keep Einstein hostage.") + Media.PlayMovieFullscreen("landing.vqa", function() + FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.") + SurviveObjective = player.AddPrimaryObjective("Tanya and Einstein must survive.") + england.AddPrimaryObjective("Destroy the soviet base after a successful rescue.") + CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.") + DefendObjective = ussr.AddPrimaryObjective("Kill Tanya and keep Einstein hostage.") + + RunInitialActivities() + end) Trigger.OnKilled(Lab, LabDestroyed) Trigger.OnKilled(OilPump, OilPumpDestroyed) @@ -193,13 +197,9 @@ WorldLoaded = function() civilianTeam = { Civilian1, Civilian2 } Trigger.OnAnyKilled(civilianTeam, CiviliansKilled) - RunInitialActivities() - SetUnitStances() Trigger.AfterDelay(DateTime.Seconds(5), function() Actor.Create("camera", true, { Owner = player, Location = BaseCameraPoint.Location }) end) Camera.Position = InsertionLZ.CenterPosition - - Media.PlayMovieFullscreen("landing.vqa") end diff --git a/mods/ra/maps/allies-02/allies02.lua b/mods/ra/maps/allies-02/allies02.lua index 2dbb12ff0d..ab0808283e 100644 --- a/mods/ra/maps/allies-02/allies02.lua +++ b/mods/ra/maps/allies-02/allies02.lua @@ -109,9 +109,11 @@ WorldLoaded = function() Trigger.OnPlayerLost(player, MissionFailed) Trigger.OnPlayerWon(player, MissionAccomplished) - ConquestObjective = player.AddPrimaryObjective("Secure the area.") - ussr.AddPrimaryObjective("Defend your base.") - ukraine.AddPrimaryObjective("Destroy the convoy.") + Media.PlayMovieFullscreen("mcv.vqa", function() + ConquestObjective = player.AddPrimaryObjective("Secure the area.") + ussr.AddPrimaryObjective("Defend your base.") + ukraine.AddPrimaryObjective("Destroy the convoy.") + end) RunInitialActivities() @@ -123,8 +125,6 @@ WorldLoaded = function() Camera.Position = ReinforcementsEntryPoint.CenterPosition - Media.PlayMovieFullscreen("mcv.vqa") - ConvoyTimer(DateTime.Seconds(3), "TenMinutesRemaining") ConvoyTimer(DateTime.Minutes(5), "WarningFiveMinutesRemaining") ConvoyTimer(DateTime.Minutes(6), "WarningFourMinutesRemaining") diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua index 52a322de74..d914365daa 100644 --- a/mods/ra/maps/allies-03a/allies03a.lua +++ b/mods/ra/maps/allies-03a/allies03a.lua @@ -100,8 +100,6 @@ InitPlayers = function() ussr = Player.GetPlayer("USSR") ussr.Cash = 10000 - - Media.PlayMovieFullscreen("brdgtilt.vqa") end InitObjectives = function() @@ -263,8 +261,10 @@ end WorldLoaded = function() InitPlayers() - InitObjectives() - InitTriggers() - SendAlliedUnits() + Media.PlayMovieFullscreen("brdgtilt.vqa", function() + InitObjectives() + InitTriggers() + SendAlliedUnits() + end) end