Fix the expansion mcv in soviet05 being transported off the map

This commit is contained in:
abcdefg30
2019-09-18 19:23:55 +02:00
committed by reaperrr
parent 4d2b70acd1
commit 411316726b

View File

@@ -6,6 +6,7 @@
the License, or (at your option) any later version. For more the License, or (at your option) any later version. For more
information, see COPYING. information, see COPYING.
]] ]]
CheckForBase = function() CheckForBase = function()
baseBuildings = Map.ActorsInBox(Map.TopLeft, CFBPoint.CenterPosition, function(actor) baseBuildings = Map.ActorsInBox(Map.TopLeft, CFBPoint.CenterPosition, function(actor)
return actor.Type == "fact" or actor.Type == "powr" return actor.Type == "fact" or actor.Type == "powr"
@@ -75,32 +76,29 @@ RunInitialActivities = function()
end end
Expand = function() Expand = function()
if ExpansionCheck then if ExpansionCheck or mcvtransport.IsDead or mcvGG.IsDead then
return
elseif mcvtransport.IsDead then
return
elseif mcvGG.IsDead then
return return
end end
mcvGG.Move(mcvGGLoadPoint.Location) ExpansionCheck = true
mcvtransport.Move(lstBeachPoint.Location) Trigger.ClearAll(mcvGG)
Trigger.ClearAll(mcvtransport)
Media.DisplayMessage("Allied MCV detected moving to the island.") Media.DisplayMessage("Allied MCV detected moving to the island.")
Reinforcements.Reinforce(GoodGuy, { "dd", "dd" }, ShipArrivePath, 0, function(ddsquad) Reinforcements.Reinforce(GoodGuy, { "dd", "dd" }, ShipArrivePath, 0, function(ddsquad)
ddsquad.AttackMove(NearExpPoint.Location) end) ddsquad.AttackMove(NearExpPoint.Location) end)
ExpansionCheck = true
Trigger.ClearAll(mcvGG) mcvtransport.Move(lstBeachPoint.Location)
Trigger.ClearAll(mcvtransport)
Trigger.AfterDelay(DateTime.Seconds(3), function() mcvGG.Move(mcvGGLoadPoint.Location)
if mcvtransport.IsDead then mcvGG.EnterTransport(mcvtransport)
return
elseif mcvGG.IsDead then Trigger.AfterDelay(DateTime.Seconds(5), function()
if mcvtransport.IsDead or mcvGG.IsDead then
return return
end end
mcvGG.EnterTransport(mcvtransport)
mcvtransport.Move(GGUnloadPoint.Location) mcvtransport.Move(GGUnloadPoint.Location)
mcvtransport.UnloadPassengers() mcvtransport.UnloadPassengers()
Trigger.AfterDelay(DateTime.Seconds(12), function() Trigger.AfterDelay(DateTime.Seconds(12), function()