diff --git a/mods/cnc/languages/lua/en.ftl b/mods/cnc/languages/lua/en.ftl index 9ca0d703b7..96940fb6ed 100644 --- a/mods/cnc/languages/lua/en.ftl +++ b/mods/cnc/languages/lua/en.ftl @@ -25,15 +25,12 @@ kill-creatures = Kill all creatures in the area. ## gdi01 establish-beachhead = Establish a beachhead. -## gdi01, gdi02, gdi03, gdi04c, gdi05abc, nod07a, nod08ab, nod09, nod10b +## gdi01, gdi02, gdi03, gdi04c, gdi05abc eliminate-nod = Eliminate all Nod forces in the area. ## gdi02, nod09 capture-refinery = Capture the Tiberium refinery. -## gdi02, gdi04c, gdi05abc -destroy-gdi = Destroy all GDI troops. - ## gdi04ab battlefield-control = Battlefield Control apcs-left = APC squads in reserve: { $apcs } @@ -65,9 +62,6 @@ protect-hospital = Protect the Hospital. keep-civilians-alive = Keep at least { $civilians } out of 14 Civilians alive. destroy-nod-bases = Destroy the Nod bases. -## gdi08ab, gdi09, nod02ab, nod05, nod07c -kill-all-enemies = Kill all enemies! - ## gdi09 destroy-nod-bunkers = Destroy the Nod bunkers to allow Carter's convoy to pass through safely. @@ -77,7 +71,6 @@ convoy-passed-partly = Part of Carter's convoy passed through! destroy-gdi-troops-area = Destroy all GDI troops in the area. kill-nikoomba = Kill Nikoomba. destroy-village = Destroy the village. -eliminate-nod-forces = Eliminate all Nod forces. ## nod02a destroy-gdi-units = Destroy all GDI units. diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index fc8467ef6f..fcf8ab601b 100644 --- a/mods/cnc/maps/gdi02/gdi02.lua +++ b/mods/cnc/maps/gdi02/gdi02.lua @@ -44,7 +44,7 @@ WorldLoaded = function() InitObjectives(GDI) - NodObjective = AddPrimaryObjective(Nod, "destroy-gdi") + NodObjective = AddPrimaryObjective(Nod, "") GDIObjective1 = AddPrimaryObjective(GDI, "eliminate-nod") GDIObjective2 = AddSecondaryObjective(GDI, "capture-refinery") diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index bfd54cc45e..8b7ea224ff 100644 --- a/mods/cnc/maps/gdi04c/gdi04c.lua +++ b/mods/cnc/maps/gdi04c/gdi04c.lua @@ -73,7 +73,7 @@ WorldLoaded = function() GDI.MarkFailedObjective(DefendTown) end) - NodObjective = AddPrimaryObjective(Nod, "destroy-gdi") + NodObjective = AddPrimaryObjective(Nod, "") DefendTown = AddPrimaryObjective(GDI, "defend-bialystok") EliminateNod = AddPrimaryObjective(GDI, "eliminate-nod") diff --git a/mods/cnc/maps/gdi05a/gdi05a.lua b/mods/cnc/maps/gdi05a/gdi05a.lua index 69391e7f9e..7ce2346f5e 100644 --- a/mods/cnc/maps/gdi05a/gdi05a.lua +++ b/mods/cnc/maps/gdi05a/gdi05a.lua @@ -168,7 +168,7 @@ WorldLoaded = function() InitObjectives(GDI) - NodObjective = AddPrimaryObjective(Nod, "destroy-gdi") + NodObjective = AddPrimaryObjective(Nod, "") FindBase = AddPrimaryObjective(GDI, "find-gdi-base") DestroySAMs = AddSecondaryObjective(GDI, "destroy-sams") diff --git a/mods/cnc/maps/gdi05b/gdi05b.lua b/mods/cnc/maps/gdi05b/gdi05b.lua index ca4bfd3803..e7e7899f85 100644 --- a/mods/cnc/maps/gdi05b/gdi05b.lua +++ b/mods/cnc/maps/gdi05b/gdi05b.lua @@ -117,7 +117,7 @@ WorldLoaded = function() FindBase = AddPrimaryObjective(GDI, "find-gdi-base") DestroySAMs = AddSecondaryObjective(GDI, "destroy-sams") - NodObjective = AddPrimaryObjective(Nod, "destroy-gdi") + NodObjective = AddPrimaryObjective(Nod, "") Trigger.AfterDelay(Atk1Delay, Atk1TriggerFunction) Trigger.AfterDelay(Atk2Delay, Atk2TriggerFunction) diff --git a/mods/cnc/maps/gdi05c/gdi05c.lua b/mods/cnc/maps/gdi05c/gdi05c.lua index decf7e3786..272292621c 100644 --- a/mods/cnc/maps/gdi05c/gdi05c.lua +++ b/mods/cnc/maps/gdi05c/gdi05c.lua @@ -110,7 +110,7 @@ WorldLoaded = function() FindBase = AddPrimaryObjective(GDI, "find-gdi-base") DestroySAMs = AddSecondaryObjective(GDI, "destroy-sams") - NodObjective = AddPrimaryObjective(Nod, "destroy-gdi") + NodObjective = AddPrimaryObjective(Nod, "") Utils.Do(ActorRemovals[Difficulty], function(unit) unit.Destroy() diff --git a/mods/cnc/maps/gdi08a/gdi08a.lua b/mods/cnc/maps/gdi08a/gdi08a.lua index 0a45922975..16ae769723 100644 --- a/mods/cnc/maps/gdi08a/gdi08a.lua +++ b/mods/cnc/maps/gdi08a/gdi08a.lua @@ -97,7 +97,7 @@ WorldLoaded = function() InitObjectives(GDI) SecureArea = AddPrimaryObjective(GDI, "destroy-nod-force") - KillGDI = AddPrimaryObjective(Nod, "kill-all-enemies") + KillGDI = AddPrimaryObjective(Nod, "") RepairAssets = AddSecondaryObjective(GDI, "repair-base-vehicles") Trigger.AfterDelay(DateTime.Seconds(5), function() CheckRepairGDIAssetsObjective() end) diff --git a/mods/cnc/maps/gdi08b/gdi08b.lua b/mods/cnc/maps/gdi08b/gdi08b.lua index b594f19016..b56aa62d9f 100644 --- a/mods/cnc/maps/gdi08b/gdi08b.lua +++ b/mods/cnc/maps/gdi08b/gdi08b.lua @@ -130,7 +130,7 @@ WorldLoaded = function() SecureArea = AddPrimaryObjective(GDI, "destroy-nod-bases") - KillGDI = AddPrimaryObjective(Nod, "kill-all-enemies") + KillGDI = AddPrimaryObjective(Nod, "") AirSupport = AddSecondaryObjective(GDI, "destroy-sams") Trigger.OnAllKilled(SamSites, function() diff --git a/mods/cnc/maps/gdi09/gdi09.lua b/mods/cnc/maps/gdi09/gdi09.lua index 7b4cd1cf5a..16d70d2d4d 100644 --- a/mods/cnc/maps/gdi09/gdi09.lua +++ b/mods/cnc/maps/gdi09/gdi09.lua @@ -129,7 +129,7 @@ WorldLoaded = function() end) SecureArea = AddPrimaryObjective(GDI, "destroy-nod-force") - KillGDI = AddPrimaryObjective(Nod, "kill-all-enemies") + KillGDI = AddPrimaryObjective(Nod, "") Trigger.AfterDelay(DateTime.Seconds(5), SendGDIReinforcements) diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index a3a430e453..0bc565937f 100644 --- a/mods/cnc/maps/nod01/nod01.lua +++ b/mods/cnc/maps/nod01/nod01.lua @@ -44,7 +44,7 @@ WorldLoaded = function() KillNikoomba = AddPrimaryObjective(Nod, "kill-nikoomba") DestroyVillage = AddPrimaryObjective(Nod, "destroy-village") DestroyGDI = AddSecondaryObjective(Nod, "destroy-gdi-troops-area") - GDIObjective = AddPrimaryObjective(GDI, "eliminate-nod-forces") + GDIObjective = AddPrimaryObjective(GDI, "") Trigger.OnKilled(Nikoomba, function() Nod.MarkCompletedObjective(KillNikoomba) diff --git a/mods/cnc/maps/nod02a/nod02a.lua b/mods/cnc/maps/nod02a/nod02a.lua index 25a4b5ea2e..daac2f2858 100644 --- a/mods/cnc/maps/nod02a/nod02a.lua +++ b/mods/cnc/maps/nod02a/nod02a.lua @@ -31,7 +31,7 @@ WorldLoaded = function() InitObjectives(Nod) - GDIObjective = AddPrimaryObjective(GDI, "kill-all-enemies") + GDIObjective = AddPrimaryObjective(GDI, "") BuildBase = AddPrimaryObjective(Nod, "build-base") DestroyGDI = AddPrimaryObjective(Nod, "destroy-gdi-units") diff --git a/mods/cnc/maps/nod02b/nod02b.lua b/mods/cnc/maps/nod02b/nod02b.lua index 211686198c..1aca4fbb02 100644 --- a/mods/cnc/maps/nod02b/nod02b.lua +++ b/mods/cnc/maps/nod02b/nod02b.lua @@ -40,7 +40,7 @@ WorldLoaded = function() BuildBase = AddPrimaryObjective(Nod, "build-base") DestroyGDI = AddPrimaryObjective(Nod, "destroy-gdi-base") - GDIObjective = AddPrimaryObjective(GDI, "kill-all-enemies") + GDIObjective = AddPrimaryObjective(GDI, "") Utils.Do(Guards, function(actor) Trigger.OnDamaged(actor, function() diff --git a/mods/cnc/maps/nod05/nod05.lua b/mods/cnc/maps/nod05/nod05.lua index 8ebd6cff91..85338dacd5 100644 --- a/mods/cnc/maps/nod05/nod05.lua +++ b/mods/cnc/maps/nod05/nod05.lua @@ -117,7 +117,7 @@ WorldLoaded = function() local localBuildSAMs = UserInterface.Translate("build-sams", { ["sams"] = SamSiteGoal }) BuildSAMObjective = AddPrimaryObjective(Nod, localBuildSAMs) DestroyGDI = AddPrimaryObjective(Nod, "destroy-gdi-base") - GDIObjective = AddPrimaryObjective(GDI, "kill-all-enemies") + GDIObjective = AddPrimaryObjective(GDI, "") Trigger.AfterDelay(AirstrikeDelay, SendGDIAirstrike) Trigger.AfterDelay(DateTime.Minutes(1) + DateTime.Seconds(30), SendGDI2Units) diff --git a/mods/cnc/maps/nod07a/nod07a.lua b/mods/cnc/maps/nod07a/nod07a.lua index 9d946e5191..5942da11ff 100644 --- a/mods/cnc/maps/nod07a/nod07a.lua +++ b/mods/cnc/maps/nod07a/nod07a.lua @@ -177,7 +177,7 @@ WorldLoaded = function() EliminateGDI = AddPrimaryObjective(Nod, "eliminate-gdi-forces") local buildSAMs = UserInterface.Translate("build-sams", { ["sams"] = SamSiteGoal }) BuildSAMs = AddPrimaryObjective(Nod, buildSAMs) - GDIObjective = AddPrimaryObjective(GDI, "eliminate-nod") + GDIObjective = AddPrimaryObjective(GDI, "") Trigger.OnKilled(GDIProc, function() Actor.Create("moneycrate", true, { Owner = GDI, Location = CPos.New(24, 54) }) diff --git a/mods/cnc/maps/nod07c/nod07c.lua b/mods/cnc/maps/nod07c/nod07c.lua index d90fb403a1..6c0932c24f 100644 --- a/mods/cnc/maps/nod07c/nod07c.lua +++ b/mods/cnc/maps/nod07c/nod07c.lua @@ -145,7 +145,7 @@ WorldLoaded = function() NoCaptureObjective = AddPrimaryObjective(Nod, "dont-capture-or-destroy") UseOrcaObjective = AddPrimaryObjective(Nod, "orca-wreak-havoc") DistractGuardsObjective = AddSecondaryObjective(Nod, "distract-guards") - GDIObjective = AddPrimaryObjective(GDI, "kill-all-enemies") + GDIObjective = AddPrimaryObjective(GDI, "") end Tick = function() diff --git a/mods/cnc/maps/nod08a/nod08a.lua b/mods/cnc/maps/nod08a/nod08a.lua index b5bb6f91ac..69bc79f9b2 100644 --- a/mods/cnc/maps/nod08a/nod08a.lua +++ b/mods/cnc/maps/nod08a/nod08a.lua @@ -162,7 +162,7 @@ WorldLoaded = function() LocateNodBase = AddPrimaryObjective(Nod, "locate-nod-base") CaptureGDIOutpost = AddPrimaryObjective(Nod, "capture-gdi-outpost") EliminateGDI = AddPrimaryObjective(Nod, "eliminate-gdi-forces") - GDIObjective = AddPrimaryObjective(GDI, "eliminate-nod") + GDIObjective = AddPrimaryObjective(GDI, "") end Tick = function() diff --git a/mods/cnc/maps/nod08b/nod08b.lua b/mods/cnc/maps/nod08b/nod08b.lua index 858bdd89bc..f0fcbc3068 100644 --- a/mods/cnc/maps/nod08b/nod08b.lua +++ b/mods/cnc/maps/nod08b/nod08b.lua @@ -157,7 +157,7 @@ WorldLoaded = function() LocateNodBase = AddPrimaryObjective(Nod, "locate-nod-base") CaptureGDIOutpost = AddPrimaryObjective(Nod, "capture-gdi-outpost") NodObjective3 = AddPrimaryObjective(Nod, "eliminate-gdi-forces") - GDIObjective = AddPrimaryObjective(GDI, "eliminate-nod") + GDIObjective = AddPrimaryObjective(GDI, "") end Tick = function() diff --git a/mods/cnc/maps/nod09/nod09.lua b/mods/cnc/maps/nod09/nod09.lua index a2205bb89f..a56d9a1fa0 100644 --- a/mods/cnc/maps/nod09/nod09.lua +++ b/mods/cnc/maps/nod09/nod09.lua @@ -198,7 +198,7 @@ WorldLoaded = function() EliminateGDI = AddPrimaryObjective(Nod, "eliminate-gdi-forces") local buildSAMs = UserInterface.Translate("build-sams", { ["sams"] = SamSiteGoal }) BuildSAMs = AddSecondaryObjective(Nod, buildSAMs) - GDIObjective = AddPrimaryObjective(GDI, "eliminate-nod") + GDIObjective = AddPrimaryObjective(GDI, "") end Tick = function() diff --git a/mods/cnc/maps/nod10b/nod10b.lua b/mods/cnc/maps/nod10b/nod10b.lua index b19245b52e..a6326b26a3 100644 --- a/mods/cnc/maps/nod10b/nod10b.lua +++ b/mods/cnc/maps/nod10b/nod10b.lua @@ -52,7 +52,7 @@ WorldLoaded = function() InitObjectives(Nod) - GDIObjective = AddPrimaryObjective(Nod, "eliminate-nod") + GDIObjective = AddPrimaryObjective(GDI, "") WarFactoryObjective = AddPrimaryObjective(Nod, "destroy-capture-warfactory") DestroyTanksObjective = AddPrimaryObjective(Nod, "destroy-mammoth-tanks") KeepRamboAliveObjective = AddSecondaryObjective(Nod, "keep-commando-alive")