diff --git a/mods/cnc/maps/funpark01/scj01ea.lua b/mods/cnc/maps/funpark01/scj01ea.lua index 550cd76764..8d31bb9c4d 100644 --- a/mods/cnc/maps/funpark01/scj01ea.lua +++ b/mods/cnc/maps/funpark01/scj01ea.lua @@ -43,7 +43,7 @@ WorldLoaded = function() dinosaur = Player.GetPlayer("Dinosaur") civilian = Player.GetPlayer("Civilian") - InvestigateObj = nod.AddPrimaryObjective("Investigate the nearby village for reports of \nstrange activity") + InvestigateObj = nod.AddPrimaryObjective("Investigate the nearby village for reports of \nstrange activity.") Trigger.OnObjectiveAdded(nod, function(p, id) Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective") diff --git a/mods/cnc/maps/gdi01/gdi01.lua b/mods/cnc/maps/gdi01/gdi01.lua index 4299accccc..c8e61459a8 100644 --- a/mods/cnc/maps/gdi01/gdi01.lua +++ b/mods/cnc/maps/gdi01/gdi01.lua @@ -87,8 +87,8 @@ WorldLoaded = function() Media.PlaySpeechNotification(player, "Lose") end) - secureAreaObjective = player.AddPrimaryObjective("Eliminate all Nod forces in the area") - beachheadObjective = player.AddSecondaryObjective("Establish a beachhead") + secureAreaObjective = player.AddPrimaryObjective("Eliminate all Nod forces in the area.") + beachheadObjective = player.AddSecondaryObjective("Establish a beachhead.") ReinforceWithLandingCraft(MCVReinforcements, lstStart.Location + CVec.New(2, 0), lstEnd.Location + CVec.New(2, 0), mcvTarget.Location) Reinforce(InfantryReinforcements) diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index 7cff964b0f..7ce3cf578f 100644 --- a/mods/cnc/maps/gdi02/gdi02.lua +++ b/mods/cnc/maps/gdi02/gdi02.lua @@ -78,9 +78,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(player, "Lose") end) - nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops") - gdiObjective1 = player.AddPrimaryObjective("Eliminate all Nod forces in the area") - gdiObjective2 = player.AddSecondaryObjective("Capture the Tiberium Refinery") + nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops.") + gdiObjective1 = player.AddPrimaryObjective("Eliminate all Nod forces in the area.") + gdiObjective2 = player.AddSecondaryObjective("Capture the Tiberium Refinery.") Trigger.OnCapture(NodRefinery, function() player.MarkCompletedObjective(gdiObjective2) end) Trigger.OnKilled(NodRefinery, function() player.MarkFailedObjective(gdiObjective2) end) diff --git a/mods/cnc/maps/gdi03/gdi03.lua b/mods/cnc/maps/gdi03/gdi03.lua index 7db639978a..a623e6e4c8 100644 --- a/mods/cnc/maps/gdi03/gdi03.lua +++ b/mods/cnc/maps/gdi03/gdi03.lua @@ -60,8 +60,8 @@ WorldLoaded = function() end) nodObjective = enemy.AddPrimaryObjective("Destroy all GDI troops") - gdiMainObjective = player.AddPrimaryObjective("Eliminate all Nod forces in the area") - gdiAirSupportObjective = player.AddSecondaryObjective("Destroy the SAM sites to receive air support") + gdiMainObjective = player.AddPrimaryObjective("Eliminate all Nod forces in the area.") + gdiAirSupportObjective = player.AddSecondaryObjective("Destroy the SAM sites to receive air support.") Trigger.OnPlayerLost(player, function() Media.PlaySpeechNotification(player, "Lose") diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index 42dea2d30a..2d2438edee 100644 --- a/mods/cnc/maps/gdi04c/gdi04c.lua +++ b/mods/cnc/maps/gdi04c/gdi04c.lua @@ -87,9 +87,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(player, "Lose") end) - nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops") - gdiObjective1 = player.AddPrimaryObjective("Defend the town of Bialystok") - gdiObjective2 = player.AddPrimaryObjective("Eliminate all Nod forces in the area") + nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops.") + gdiObjective1 = player.AddPrimaryObjective("Defend the town of Bialystok.") + gdiObjective2 = player.AddPrimaryObjective("Eliminate all Nod forces in the area.") townAttackTrigger = false Trigger.OnExitedFootprint(TownAttackTrigger, function(a, id) diff --git a/mods/cnc/maps/gdi05a/gdi05a.lua b/mods/cnc/maps/gdi05a/gdi05a.lua index 994c165c87..1f06579c6e 100644 --- a/mods/cnc/maps/gdi05a/gdi05a.lua +++ b/mods/cnc/maps/gdi05a/gdi05a.lua @@ -132,7 +132,7 @@ DiscoverGdiBase = function(actor, discoverer) baseDiscovered = true - gdiObjective3 = gdi.AddPrimaryObjective("Eliminate all Nod forces in the area") + gdiObjective3 = gdi.AddPrimaryObjective("Eliminate all Nod forces in the area.") gdi.MarkCompletedObjective(gdiObjective1) Attack() @@ -205,9 +205,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(player, "Win") end) - nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops") - gdiObjective1 = gdi.AddPrimaryObjective("Find the GDI base") - gdiObjective2 = gdi.AddSecondaryObjective("Destroy all SAM sites to receive air support") + nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops.") + gdiObjective1 = gdi.AddPrimaryObjective("Find the GDI base.") + gdiObjective2 = gdi.AddSecondaryObjective("Destroy all SAM sites to receive air support.") SetupWorld() diff --git a/mods/cnc/maps/gdi05b/gdi05b.lua b/mods/cnc/maps/gdi05b/gdi05b.lua index 693554e784..53e5aa804a 100644 --- a/mods/cnc/maps/gdi05b/gdi05b.lua +++ b/mods/cnc/maps/gdi05b/gdi05b.lua @@ -74,7 +74,7 @@ DiscoverGdiBase = function(actor, discoverer) baseDiscovered = true - gdiObjective3 = gdi.AddPrimaryObjective("Eliminate all Nod forces in the area") + gdiObjective3 = gdi.AddPrimaryObjective("Eliminate all Nod forces in the area.") gdi.MarkCompletedObjective(gdiObjective1) end @@ -150,9 +150,9 @@ WorldLoaded = function() end end) - gdiObjective1 = gdi.AddPrimaryObjective("Find the GDI base") - gdiObjective2 = gdi.AddSecondaryObjective("Destroy all SAM sites to receive air support") - nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops") + gdiObjective1 = gdi.AddPrimaryObjective("Find the GDI base.") + gdiObjective2 = gdi.AddSecondaryObjective("Destroy all SAM sites to receive air support.") + nodObjective = nod.AddPrimaryObjective("Destroy all GDI troops.") Trigger.AfterDelay(Atk1Delay, Atk1TriggerFunction) Trigger.AfterDelay(Atk2Delay, Atk2TriggerFunction) diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index 361bb77e8f..9476e36509 100644 --- a/mods/cnc/maps/nod01/nod01.lua +++ b/mods/cnc/maps/nod01/nod01.lua @@ -54,10 +54,10 @@ WorldLoaded = function() Media.PlaySpeechNotification(nod, "Lose") end) - NodObjective1 = nod.AddPrimaryObjective("Kill Nikoomba") - NodObjective2 = nod.AddPrimaryObjective("Destroy the village") - NodObjective3 = nod.AddSecondaryObjective("Destroy all GDI troops in the area") - GDIObjective1 = gdi.AddPrimaryObjective("Eliminate all Nod forces") + NodObjective1 = nod.AddPrimaryObjective("Kill Nikoomba.") + NodObjective2 = nod.AddPrimaryObjective("Destroy the village.") + NodObjective3 = nod.AddSecondaryObjective("Destroy all GDI troops in the area.") + GDIObjective1 = gdi.AddPrimaryObjective("Eliminate all Nod forces.") Trigger.OnKilled(Nikoomba, function() nod.MarkCompletedObjective(NodObjective1) diff --git a/mods/cnc/maps/nod02a/nod02a.lua b/mods/cnc/maps/nod02a/nod02a.lua index ffc5e5a03a..c5a6e68be9 100644 --- a/mods/cnc/maps/nod02a/nod02a.lua +++ b/mods/cnc/maps/nod02a/nod02a.lua @@ -182,9 +182,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - NodObjective1 = Nod.AddPrimaryObjective("Build a base") - NodObjective2 = Nod.AddPrimaryObjective("Destroy the GDI base") - GDIObjective = GDI.AddPrimaryObjective("Kill all enemies!") + NodObjective1 = Nod.AddPrimaryObjective("Build a base.") + NodObjective2 = Nod.AddPrimaryObjective("Destroy the GDI base.") + GDIObjective = GDI.AddPrimaryObjective("Kill all enemies.") OnAnyDamaged(Atk3ActorTriggerActivator, Atk3TriggerFunction) Trigger.OnAllRemovedFromWorld(DfndActorTriggerActivator, DfndTriggerFunction) diff --git a/mods/cnc/maps/nod02b/nod02b.lua b/mods/cnc/maps/nod02b/nod02b.lua index 8b69f52938..9851b91d69 100644 --- a/mods/cnc/maps/nod02b/nod02b.lua +++ b/mods/cnc/maps/nod02b/nod02b.lua @@ -120,9 +120,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - GDIObjective = GDI.AddPrimaryObjective("Kill all enemies!") - NodObjective1 = Nod.AddPrimaryObjective("Build a base!") - NodObjective2 = Nod.AddPrimaryObjective("Destroy all GDI units!") + GDIObjective = GDI.AddPrimaryObjective("Kill all enemies.") + NodObjective1 = Nod.AddPrimaryObjective("Build a base.") + NodObjective2 = Nod.AddPrimaryObjective("Destroy all GDI units.") OnAnyDamaged(Grd2ActorTriggerActivator, Grd2TriggerFunction) Trigger.AfterDelay(Atk8TriggerFunctionTime, Atk8TriggerFunction) diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index 28adc65796..88df278a13 100644 --- a/mods/cnc/maps/nod03a/nod03a.lua +++ b/mods/cnc/maps/nod03a/nod03a.lua @@ -37,9 +37,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(player, "Lose") end) - gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area") - nodObjective1 = player.AddPrimaryObjective("Capture the prison") - nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces") + gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area.") + nodObjective1 = player.AddPrimaryObjective("Capture the prison.") + nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces.") Trigger.OnCapture(TechCenter, function() Trigger.AfterDelay(DateTime.Seconds(2), function() diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index ea08b1b231..bd1ddc3443 100644 --- a/mods/cnc/maps/nod03b/nod03b.lua +++ b/mods/cnc/maps/nod03b/nod03b.lua @@ -53,9 +53,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(player, "Lose") end) - gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area") - nodObjective1 = player.AddPrimaryObjective("Capture the prison") - nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces") + gdiObjective = enemy.AddPrimaryObjective("Eliminate all Nod forces in the area.") + nodObjective1 = player.AddPrimaryObjective("Capture the prison.") + nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces.") Trigger.OnKilled(TechCenter, function() player.MarkFailedObjective(nodObjective1) end) Trigger.OnCapture(TechCenter, function() diff --git a/mods/cnc/maps/nod04b/nod04b.lua b/mods/cnc/maps/nod04b/nod04b.lua index 7b7556dd0c..36f17e0875 100644 --- a/mods/cnc/maps/nod04b/nod04b.lua +++ b/mods/cnc/maps/nod04b/nod04b.lua @@ -137,8 +137,8 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - GDIObjective = GDI.AddPrimaryObjective("Kill all enemies!") - NodObjective1 = Nod.AddPrimaryObjective("Destroy the village and kill all civilians!") + GDIObjective = GDI.AddPrimaryObjective("Kill all enemies.") + NodObjective1 = Nod.AddPrimaryObjective("Destroy the village and kill all civilians.") NodObjective2 = Nod.AddSecondaryObjective("Kill all GDI units in the area.") InsertNodUnits() diff --git a/mods/cnc/maps/nod05/nod05.lua b/mods/cnc/maps/nod05/nod05.lua index b488468ce6..ec4aedc80b 100644 --- a/mods/cnc/maps/nod05/nod05.lua +++ b/mods/cnc/maps/nod05/nod05.lua @@ -188,9 +188,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - NodObjective1 = Nod.AddPrimaryObjective("Build 3 SAMs") - NodObjective2 = Nod.AddPrimaryObjective("Destroy the GDI base") - GDIObjective = GDI.AddPrimaryObjective("Kill all enemies!") + NodObjective1 = Nod.AddPrimaryObjective("Build 3 SAMs.") + NodObjective2 = Nod.AddPrimaryObjective("Destroy the GDI base.") + GDIObjective = GDI.AddPrimaryObjective("Kill all enemies.") Trigger.AfterDelay(AirstrikeDelay, SendGDIAirstrike) Trigger.AfterDelay(YyyyTriggerFunctionTime, YyyyTriggerFunction) diff --git a/mods/cnc/maps/nod06a/nod06a.lua b/mods/cnc/maps/nod06a/nod06a.lua index 1b91adbb21..69ff908442 100644 --- a/mods/cnc/maps/nod06a/nod06a.lua +++ b/mods/cnc/maps/nod06a/nod06a.lua @@ -141,10 +141,10 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI nuclear detonator") - NodObjective2 = Nod.AddSecondaryObjective("Destroy the houses of the GDI supporter \nin the village") + NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI nuclear detonator.") + NodObjective2 = Nod.AddSecondaryObjective("Destroy the houses of the GDI supporter \nin the village.") - GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator") + GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator.") InsertNodUnits() @@ -182,7 +182,7 @@ WorldLoaded = function() Trigger.OnEnteredFootprint(Win1CellTriggerActivator, function(a, id) if a.Owner == Nod then - NodObjective3 = Nod.AddPrimaryObjective("Move to the evacuation point") + NodObjective3 = Nod.AddPrimaryObjective("Move to the evacuation point.") Nod.MarkCompletedObjective(NodObjective1) Trigger.RemoveFootprintTrigger(id) end diff --git a/mods/cnc/maps/nod06b/nod06b.lua b/mods/cnc/maps/nod06b/nod06b.lua index c0e94feba0..a30f78cba0 100644 --- a/mods/cnc/maps/nod06b/nod06b.lua +++ b/mods/cnc/maps/nod06b/nod06b.lua @@ -27,7 +27,7 @@ HuntTriggerFunction = function() end Win1TriggerFunction = function() - NodObjective2 = Nod.AddPrimaryObjective("Move to the evacuation point") + NodObjective2 = Nod.AddPrimaryObjective("Move to the evacuation point.") Nod.MarkCompletedObjective(NodObjective1) end @@ -119,8 +119,8 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI nuclear detonator") - GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator") + NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI nuclear detonator.") + GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator.") InsertNodUnits() diff --git a/mods/cnc/maps/nod06c/nod06c.lua b/mods/cnc/maps/nod06c/nod06c.lua index 5c93efee23..b5f5089ac6 100644 --- a/mods/cnc/maps/nod06c/nod06c.lua +++ b/mods/cnc/maps/nod06c/nod06c.lua @@ -105,9 +105,9 @@ WorldLoaded = function() Media.PlaySpeechNotification(Nod, "Lose") end) - NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI Nuclear detonator") - NodObjective3 = Nod.AddSecondaryObjective("Infiltrate the barracks, weapon factory and \nthe construction yard") - GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator") + NodObjective1 = Nod.AddPrimaryObjective("Steal the GDI nuclear detonator.") + NodObjective3 = Nod.AddSecondaryObjective("Infiltrate the barracks, weapon factory and \nthe construction yard.") + GDIObjective = GDI.AddPrimaryObjective("Stop the Nod taskforce from escaping with the detonator.") InsertNodUnits() @@ -131,7 +131,7 @@ WorldLoaded = function() Trigger.OnEnteredFootprint(Win1CellTriggerActivator, function(a, id) if a.Owner == Nod then - NodObjective2 = Nod.AddPrimaryObjective("Move to the evacuation point") + NodObjective2 = Nod.AddPrimaryObjective("Move to the evacuation point.") Nod.MarkCompletedObjective(NodObjective1) Trigger.RemoveFootprintTrigger(id) end