epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split Einstein and Tanya survival objectives for clarity

Browse Source 
fixes #7068
This commit is contained in:
Matthias Mailänder
2014-12-06 20:04:11 +01:00
parent e16bc064a0
commit d319a8f506
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mods/ra/maps/allies-01/allies01.lua
View File

@@ -12,7 +12,7 @@ SendInsertionHelicopter = function()
local passengers = Reinforcements.ReinforceWithTransport(player, InsertionHelicopterType, local passengers = Reinforcements.ReinforceWithTransport(player, InsertionHelicopterType,
TanyaReinforcements, InsertionPath, { InsertionEntry.Location })[2] TanyaReinforcements, InsertionPath, { InsertionEntry.Location })[2]
local tanya = passengers[1] local tanya = passengers[1]
Trigger.OnKilled(tanya, RescueFailed) Trigger.OnKilled(tanya, TanyaKilledInAction)
tanya.Stance = "HoldFire" tanya.Stance = "HoldFire"
end end
@@ -95,7 +95,13 @@ LabDestroyed = function()
end end
RescueFailed = function() RescueFailed = function()
player.MarkFailedObjective(SurviveObjective) Media.PlaySpeechNotification(player, "ObjectiveNotMet")
player.MarkFailedObjective(EinsteinSurviveObjective)
end
TanyaKilledInAction = function()
Media.PlaySpeechNotification(player, "ObjectiveNotMet")
player.MarkFailedObjective(TanyaSurviveObjective)
end end
OilPumpDestroyed = function() OilPumpDestroyed = function()
@@ -123,7 +129,10 @@ HelicopterGone = function()
Media.PlaySpeechNotification(player, "TargetRescued") Media.PlaySpeechNotification(player, "TargetRescued")
Trigger.AfterDelay(DateTime.Seconds(1), function() Trigger.AfterDelay(DateTime.Seconds(1), function()
player.MarkCompletedObjective(ExtractObjective) player.MarkCompletedObjective(ExtractObjective)
player.MarkCompletedObjective(SurviveObjective) player.MarkCompletedObjective(EinsteinSurviveObjective)
if not Tanya.IsDead then
player.MarkCompletedObjective(TanyaSurviveObjective)
end
if not collateralDamage then if not collateralDamage then
player.MarkCompletedObjective(CivilProtectionObjective) player.MarkCompletedObjective(CivilProtectionObjective)
end end
@@ -175,7 +184,8 @@ WorldLoaded = function()
Media.PlayMovieFullscreen("landing.vqa", function() Media.PlayMovieFullscreen("landing.vqa", function()
FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.") FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.")
SurviveObjective = player.AddPrimaryObjective("Tanya and Einstein must survive.") TanyaSurviveObjective = player.AddPrimaryObjective("Tanya must survive.")
EinsteinSurviveObjective = player.AddPrimaryObjective("Einstein must survive.")
CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.") CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.")
RunInitialActivities() RunInitialActivities()