Rename Win -> MissionAccomplished and Lose -> MissionFailed

But keep them in notifications.yaml for backwards compatibility.
This commit is contained in:
abcdefg30
2015-01-06 12:09:25 +01:00
parent 4a1e0a44d5
commit d9572d4ca4
8 changed files with 16 additions and 14 deletions

View File

@@ -141,11 +141,11 @@ HelicopterGone = function()
end
MissionAccomplished = function()
Media.PlaySpeechNotification(player, "Win")
Media.PlaySpeechNotification(player, "MissionAccomplished")
end
MissionFailed = function()
Media.PlaySpeechNotification(player, "Lose")
Media.PlaySpeechNotification(player, "MissionFailed")
end
SetUnitStances = function()

View File

@@ -21,11 +21,11 @@ RunInitialActivities = function()
end
MissionAccomplished = function()
Media.PlaySpeechNotification(player, "Win")
Media.PlaySpeechNotification(player, "MissionAccomplished")
end
MissionFailed = function()
Media.PlaySpeechNotification(player, "Lose")
Media.PlaySpeechNotification(player, "MissionFailed")
end
Tick = function()

View File

@@ -113,12 +113,12 @@ InitObjectives = function()
Trigger.OnPlayerLost(player, function()
Trigger.AfterDelay(25, function()
Media.PlaySpeechNotification(player, "Lose")
Media.PlaySpeechNotification(player, "MissionFailed")
end)
end)
Trigger.OnPlayerWon(player, function()
Trigger.AfterDelay(25, function()
Media.PlaySpeechNotification(player, "Win")
Media.PlaySpeechNotification(player, "MissionAccomplished")
end)
end)
end

View File

@@ -227,11 +227,11 @@ WorldLoaded = function()
end)
Trigger.OnPlayerWon(player, function()
Media.PlaySpeechNotification(player, "Win")
Media.PlaySpeechNotification(player, "MissionAccomplished")
end)
Trigger.OnPlayerLost(player, function()
Media.PlaySpeechNotification(player, "Lose")
Media.PlaySpeechNotification(player, "MissionFailed")
end)
sovietObjective = soviets.AddPrimaryObjective("Destroy the village.")

View File

@@ -260,7 +260,7 @@ InitObjectives = function()
end)
Trigger.OnPlayerLost(player, function()
Media.PlaySpeechNotification(player, "Lose")
Media.PlaySpeechNotification(player, "MissionFailed")
ussr.MarkCompletedObjective(USSRObj)
badguy.MarkCompletedObjective(BadGuyObj)
@@ -268,7 +268,7 @@ InitObjectives = function()
turkey.MarkCompletedObjective(TurkeyObj)
end)
Trigger.OnPlayerWon(player, function()
Media.PlaySpeechNotification(player, "Win")
Media.PlaySpeechNotification(player, "MissionAccomplished")
Media.DisplayMessage("Dr. Demitri has been extracted and the super tanks have been dealt with.")
ussr.MarkFailedObjective(USSRObj)

View File

@@ -50,11 +50,11 @@ WorldLoaded = function()
JeepDemolishingBridge()
Trigger.OnPlayerWon(player, function()
Media.PlaySpeechNotification(player, "Win")
Media.PlaySpeechNotification(player, "MissionAccomplished")
end)
Trigger.OnPlayerLost(player, function()
Media.PlaySpeechNotification(player, "Lose")
Media.PlaySpeechNotification(player, "MissionFailed")
end)
Trigger.AfterDelay(DateTime.Seconds(2), InsertYaks)

View File

@@ -281,10 +281,10 @@ InitObjectives = function()
end)
Trigger.OnPlayerLost(allies, function()
Media.PlaySpeechNotification(allies, "Lose")
Media.PlaySpeechNotification(allies, "MissionFailed")
end)
Trigger.OnPlayerWon(allies, function()
Media.PlaySpeechNotification(allies, "Win")
Media.PlaySpeechNotification(allies, "MissionAccomplished")
Media.DisplayMessage("The French forces have survived and dismantled the soviet presence in the area!")
end)
end

View File

@@ -50,6 +50,8 @@ Speech:
LowPower: lopower1
MercenaryFreed: mercf1
MercenaryRescued: mercr1
MissionAccomplished: misnwon1
MissionFailed: misnlst1
MissionLoaded: load1
MissionSaved: save1
MissionTimerInitialised: mtimein1