Skip to content

Commit 1a63a0a

Browse files
committed
Fix chat sounds overlapping with playing FMV in missions
1 parent 90d517a commit 1a63a0a

File tree

8 files changed

+51
-41
lines changed

8 files changed

+51
-41
lines changed

mods/cnc/maps/gdi04a/gdi04a.lua

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,14 @@ WorldLoaded = function()
133133
end)
134134
end)
135135

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

140145
BuildNod1()
141146
Utils.Do(NodHelis, function(heli)
@@ -161,6 +166,4 @@ WorldLoaded = function()
161166
end)
162167

163168
Camera.Position = Actor56.CenterPosition
164-
165-
Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end)
166169
end

mods/cnc/maps/gdi04b/gdi04b.lua

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,13 @@ WorldLoaded = function()
138138
end)
139139
end)
140140

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

145149
SetupWorld()
146150

@@ -193,6 +197,4 @@ WorldLoaded = function()
193197
end)
194198

195199
Camera.Position = GDIReinforcementsWP1.CenterPosition
196-
197-
Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nitejump.vqa") end)
198200
end

mods/cnc/maps/gdi04c/gdi04c.lua

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,13 @@ WorldLoaded = function()
9393
end)
9494
end)
9595

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

100104
townAttackTrigger = false
101105
Trigger.OnExitedFootprint(TownAttackTrigger, function(a, id)
@@ -125,8 +129,6 @@ WorldLoaded = function()
125129
end)
126130

127131
Camera.Position = Actor141.CenterPosition
128-
129-
Media.PlayMovieFullscreen("bkground.vqa", function() Media.PlayMovieFullscreen("nodsweep.vqa") end)
130132
end
131133

132134
Tick = function()

mods/cnc/maps/nod03a/nod03a.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ WorldLoaded = function()
4343
end)
4444
end)
4545

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

5052
Trigger.OnCapture(TechCenter, function()
5153
Trigger.AfterDelay(DateTime.Seconds(2), function()

mods/cnc/maps/nod03b/nod03b.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ WorldLoaded = function()
5959
end)
6060
end)
6161

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

6668
Trigger.OnKilled(TechCenter, function() player.MarkFailedObjective(nodObjective1) end)
6769
Trigger.OnCapture(TechCenter, function()
@@ -74,7 +76,6 @@ WorldLoaded = function()
7476
Trigger.AfterDelay(DateTime.Seconds(40), function() SendAttackWave(FirstAttackWaveUnits, FirstAttackWave) end)
7577
Trigger.AfterDelay(DateTime.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end)
7678
Trigger.AfterDelay(DateTime.Seconds(140), function() SendAttackWave(ThirdAttackWaveUnits, FirstAttackWave) end)
77-
7879
end
7980

8081
Tick = function()

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,15 @@ WorldLoaded = function()
175175
Trigger.OnPlayerLost(player, MissionFailed)
176176
Trigger.OnPlayerWon(player, MissionAccomplished)
177177

178-
FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.")
179-
SurviveObjective = player.AddPrimaryObjective("Tanya and Einstein must survive.")
180-
england.AddPrimaryObjective("Destroy the soviet base after a successful rescue.")
181-
CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.")
182-
DefendObjective = ussr.AddPrimaryObjective("Kill Tanya and keep Einstein hostage.")
178+
Media.PlayMovieFullscreen("landing.vqa", function()
179+
FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.")
180+
SurviveObjective = player.AddPrimaryObjective("Tanya and Einstein must survive.")
181+
england.AddPrimaryObjective("Destroy the soviet base after a successful rescue.")
182+
CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.")
183+
DefendObjective = ussr.AddPrimaryObjective("Kill Tanya and keep Einstein hostage.")
184+
185+
RunInitialActivities()
186+
end)
183187

184188
Trigger.OnKilled(Lab, LabDestroyed)
185189
Trigger.OnKilled(OilPump, OilPumpDestroyed)
@@ -193,13 +197,9 @@ WorldLoaded = function()
193197
civilianTeam = { Civilian1, Civilian2 }
194198
Trigger.OnAnyKilled(civilianTeam, CiviliansKilled)
195199

196-
RunInitialActivities()
197-
198200
SetUnitStances()
199201

200202
Trigger.AfterDelay(DateTime.Seconds(5), function() Actor.Create("camera", true, { Owner = player, Location = BaseCameraPoint.Location }) end)
201203

202204
Camera.Position = InsertionLZ.CenterPosition
203-
204-
Media.PlayMovieFullscreen("landing.vqa")
205205
end

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,11 @@ WorldLoaded = function()
109109
Trigger.OnPlayerLost(player, MissionFailed)
110110
Trigger.OnPlayerWon(player, MissionAccomplished)
111111

112-
ConquestObjective = player.AddPrimaryObjective("Secure the area.")
113-
ussr.AddPrimaryObjective("Defend your base.")
114-
ukraine.AddPrimaryObjective("Destroy the convoy.")
112+
Media.PlayMovieFullscreen("mcv.vqa", function()
113+
ConquestObjective = player.AddPrimaryObjective("Secure the area.")
114+
ussr.AddPrimaryObjective("Defend your base.")
115+
ukraine.AddPrimaryObjective("Destroy the convoy.")
116+
end)
115117

116118
RunInitialActivities()
117119

@@ -123,8 +125,6 @@ WorldLoaded = function()
123125

124126
Camera.Position = ReinforcementsEntryPoint.CenterPosition
125127

126-
Media.PlayMovieFullscreen("mcv.vqa")
127-
128128
ConvoyTimer(DateTime.Seconds(3), "TenMinutesRemaining")
129129
ConvoyTimer(DateTime.Minutes(5), "WarningFiveMinutesRemaining")
130130
ConvoyTimer(DateTime.Minutes(6), "WarningFourMinutesRemaining")

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ InitPlayers = function()
100100
ussr = Player.GetPlayer("USSR")
101101

102102
ussr.Cash = 10000
103-
104-
Media.PlayMovieFullscreen("brdgtilt.vqa")
105103
end
106104

107105
InitObjectives = function()
@@ -263,8 +261,10 @@ end
263261
WorldLoaded = function()
264262

265263
InitPlayers()
266-
InitObjectives()
267-
InitTriggers()
268264

269-
SendAlliedUnits()
265+
Media.PlayMovieFullscreen("brdgtilt.vqa", function()
266+
InitObjectives()
267+
InitTriggers()
268+
SendAlliedUnits()
269+
end)
270270
end

0 commit comments

Comments
 (0)