Fix destroyed truck escaping ra mission sarin-gas-1

This commit is contained in:
Michael Silber
2019-07-26 16:46:33 +02:00
committed by Paul Chote
parent 865d8d77e0
commit 81eb939d4d

View File

@@ -41,30 +41,6 @@ SetupTriggers = function()
Trigger.OnAllKilled(ConvoyTrucks, function() Trigger.OnAllKilled(ConvoyTrucks, function()
greece.MarkCompletedObjective(objDestroyAllTrucks) greece.MarkCompletedObjective(objDestroyAllTrucks)
end) end)
Trigger.OnEnteredFootprint({ TruckEscapeCenter.Location }, function(actor, triggerlose1)
if actor.Owner == ussr and actor.Type == "truk" then
Trigger.RemoveProximityTrigger(triggerlose1)
actor.Destroy()
greece.MarkFailedObjective(objDestroyAllTrucks)
end
end)
Trigger.OnEnteredFootprint({ EscapeNorth10.Location }, function(actor, triggerlose2)
if actor.Owner == ussr and actor.Type == "truk" then
Trigger.RemoveProximityTrigger(triggerlose2)
actor.Destroy()
greece.MarkFailedObjective(objDestroyAllTrucks)
end
end)
Trigger.OnEnteredFootprint({ EscapeSouth5.Location }, function(actor, triggerlose3)
if actor.Owner == ussr and actor.Type == "truk" then
Trigger.RemoveProximityTrigger(triggerlose3)
actor.Destroy()
greece.MarkFailedObjective(objDestroyAllTrucks)
end
end)
end end
MissionStart = function() MissionStart = function()
@@ -123,26 +99,23 @@ SendPatrol = function(mammoth)
end end
end end
MoveTruckNorth = function(truck) MoveTruckEscapeRoute = function(truck, route)
if truck.IsDead then if truck.IsDead then
return return
else else
Media.DisplayMessage("Convoy truck attempting to escape!") Media.DisplayMessage("Convoy truck attempting to escape!")
Media.PlaySoundNotification(greece, "AlertBleep") Media.PlaySoundNotification(greece, "AlertBleep")
Utils.Do(TruckEscapeNorth, function(waypoint) Utils.Do(route, function(waypoint)
truck.Move(waypoint.Location) truck.Move(waypoint.Location)
end) end)
end
end Trigger.OnIdle(truck, function()
if truck.Location == route[#route].Location then
MoveTruckSouth = function(truck) truck.Destroy()
if truck.IsDead then greece.MarkFailedObjective(objDestroyAllTrucks)
return else
else truck.Move(route[#route].Location)
Media.DisplayMessage("Convoy truck attempting to escape!") end
Media.PlaySoundNotification(greece, "AlertBleep")
Utils.Do(TruckEscapeSouth, function(waypoint)
truck.Move(waypoint.Location)
end) end)
end end
end end
@@ -195,10 +168,10 @@ WorldLoaded = function()
Camera.Position = DefaultCameraPosition.CenterPosition Camera.Position = DefaultCameraPosition.CenterPosition
Trigger.AfterDelay(DateTime.Minutes(5), function() SendPatrol(PatrolMammoth) end) Trigger.AfterDelay(DateTime.Minutes(5), function() SendPatrol(PatrolMammoth) end)
Trigger.AfterDelay(DateTime.Minutes(5), function() MoveTruckNorth(Truck1) end) Trigger.AfterDelay(DateTime.Minutes(5), function() MoveTruckEscapeRoute(Truck1, TruckEscapeNorth) end)
Trigger.AfterDelay(DateTime.Minutes(9), function() MoveTruckNorth(Truck2) end) Trigger.AfterDelay(DateTime.Minutes(9), function() MoveTruckEscapeRoute(Truck2, TruckEscapeNorth) end)
Trigger.AfterDelay(DateTime.Minutes(12), function() MoveTruckSouth(Truck3) end) Trigger.AfterDelay(DateTime.Minutes(12), function() MoveTruckEscapeRoute(Truck3, TruckEscapeSouth) end)
Trigger.AfterDelay(DateTime.Minutes(15), function() MoveTruckNorth(Truck4) end) Trigger.AfterDelay(DateTime.Minutes(15), function() MoveTruckEscapeRoute(Truck4, TruckEscapeNorth) end)
Trigger.AfterDelay(DateTime.Minutes(17), function() MoveTruckSouth(Truck5) end) Trigger.AfterDelay(DateTime.Minutes(17), function() MoveTruckEscapeRoute(Truck5, TruckEscapeSouth) end)
Trigger.AfterDelay(DateTime.Minutes(18), function() MoveTruckSouth(IntroTruck2) end) Trigger.AfterDelay(DateTime.Minutes(18), function() MoveTruckEscapeRoute(IntroTruck2, TruckEscapeSouth) end)
end end