From f2d5d6cb8691e9641bd9addcce33eb42bdcb6191 Mon Sep 17 00:00:00 2001 From: clemty Date: Thu, 25 Jun 2015 23:50:11 +0200 Subject: [PATCH] nod05: change objective - only buildings need to be destroyed for primary objective (#8531) - GDI airstrikes also stop when GDI tech center is captured --- mods/cnc/maps/nod05/nod05.lua | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mods/cnc/maps/nod05/nod05.lua b/mods/cnc/maps/nod05/nod05.lua index b488468ce6..fb095dc6ae 100644 --- a/mods/cnc/maps/nod05/nod05.lua +++ b/mods/cnc/maps/nod05/nod05.lua @@ -37,12 +37,12 @@ Gdi12Waypoints = { waypoint0, waypoint1, waypoint3, waypoint11, waypoint12 } AllWaypoints = { Gdi1Waypoints, Gdi2Waypoints, Gdi3Waypoints, Gdi5Waypoints, Gdi11Waypoints, Gdi12Waypoints } -HuntActorTriggerActivator = { Tower1, Tower2, Radar, Silo1, Silo2, Silo3, Refinery, Barracks, Plant1, Plant2, Yard, Factory } +PrimaryTargets = { Tower1, Tower2, Radar, Silo1, Silo2, Silo3, Refinery, Barracks, Plant1, Plant2, Yard, Factory } GDIStartUnits = { } SendGDIAirstrike = function() - if not Radar.IsDead then + if not Radar.IsDead and Radar.Owner == GDI then local target = getAirstrikeTarget() if target then @@ -234,7 +234,10 @@ WorldLoaded = function() Trigger.OnDiscovered(Tower1, AutoTriggerFunction) Trigger.OnDiscovered(Tower2, AutoTriggerFunction) - Trigger.OnAllRemovedFromWorld(HuntActorTriggerActivator, HuntTriggerFunction) + Trigger.OnAllKilledOrCaptured(PrimaryTargets, function() + Nod.MarkCompletedObjective(NodObjective2) + HuntTriggerFunction() + end) Trigger.AfterDelay(0, getStartUnits) end @@ -250,10 +253,6 @@ Tick = function() Nod.MarkCompletedObjective(NodObjective1) end - if GDI.HasNoRequiredUnits() then - Nod.MarkCompletedObjective(NodObjective2) - end - if DateTime.GameTime % DateTime.Seconds(3) == 0 then checkProduction(GDI) end