From 0a092237d361b8d223317b98e7c9f453d8845219 Mon Sep 17 00:00:00 2001 From: Muh-Muh Date: Mon, 5 Feb 2018 12:33:02 +0100 Subject: [PATCH] Add Capture as a possibility for completing the objectives on Soviet06 --- mods/ra/maps/soviet-06a/soviet06a.lua | 10 ++++++---- mods/ra/maps/soviet-06b/soviet06b.lua | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mods/ra/maps/soviet-06a/soviet06a.lua b/mods/ra/maps/soviet-06a/soviet06a.lua index d574660967..e16cc882d3 100644 --- a/mods/ra/maps/soviet-06a/soviet06a.lua +++ b/mods/ra/maps/soviet-06a/soviet06a.lua @@ -87,9 +87,11 @@ Trigger.OnKilled(Apwr2, function(building) BaseApwr2.exists = false end) -Trigger.OnKilled(Dome, function() - player.MarkCompletedObjective(sovietObjective2) - Media.PlaySpeechNotification(player, "ObjectiveMet") +Trigger.OnKilledOrCaptured(Dome, function() + Trigger.AfterDelay(DateTime.Seconds(2), function() + player.MarkCompletedObjective(sovietObjective2) + Media.PlaySpeechNotification(player, "ObjectiveMet") + end) end) -- Activate the AI once the player deployed the Mcv @@ -145,7 +147,7 @@ WorldLoaded = function() end) alliedObjective = enemy.AddPrimaryObjective("Destroy all Soviet troops.") sovietObjective = player.AddPrimaryObjective("Escort the Convoy.") - sovietObjective2 = player.AddSecondaryObjective("Destroy the Allied radar dome to stop enemy\nreinforcements.") + sovietObjective2 = player.AddSecondaryObjective("Destroy or capture the Allied radar dome to stop\nenemy reinforcements.") SaveAllTrucks = player.AddSecondaryObjective("Keep all trucks alive.") end diff --git a/mods/ra/maps/soviet-06b/soviet06b.lua b/mods/ra/maps/soviet-06b/soviet06b.lua index 04a4c3e818..20a41f1dc3 100644 --- a/mods/ra/maps/soviet-06b/soviet06b.lua +++ b/mods/ra/maps/soviet-06b/soviet06b.lua @@ -58,9 +58,11 @@ Trigger.OnKilled(Apwr2, function(building) BaseApwr2.exists = false end) -Trigger.OnKilled(Dome, function() - player.MarkCompletedObjective(sovietObjective2) - Media.PlaySpeechNotification(player, "ObjectiveMet") +Trigger.OnKilledOrCaptured(Dome, function() + Trigger.AfterDelay(DateTime.Seconds(2), function() + player.MarkCompletedObjective(sovietObjective2) + Media.PlaySpeechNotification(player, "ObjectiveMet") + end) end) Trigger.OnRemovedFromWorld(Mcv, function() @@ -110,7 +112,7 @@ WorldLoaded = function() end) alliedObjective = enemy.AddPrimaryObjective("Destroy all Soviet troops.") sovietObjective = player.AddPrimaryObjective("Escort the Convoy.") - sovietObjective2 = player.AddSecondaryObjective("Destroy the Allied radar dome to stop enemy\nreinforcements.") + sovietObjective2 = player.AddSecondaryObjective("Destroy or capture the Allied radar dome to stop\nenemy reinforcements.") SaveAllTrucks = player.AddSecondaryObjective("Keep all trucks alive.") end