Merge pull request #9562 from Biofreak1987/soviet07-fix

Fix early game over in soviet07
This commit is contained in:
Oliver Brakmann
2015-10-11 15:43:26 +02:00
3 changed files with 10 additions and 2 deletions

View File

@@ -57,6 +57,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Red Alert Lua scripts", "Re
mods\ra\maps\allies-05a\AI.lua = mods\ra\maps\allies-05a\AI.lua mods\ra\maps\allies-05a\AI.lua = mods\ra\maps\allies-05a\AI.lua
mods\ra\maps\soviet-01\soviet01.lua = mods\ra\maps\soviet-01\soviet01.lua mods\ra\maps\soviet-01\soviet01.lua = mods\ra\maps\soviet-01\soviet01.lua
mods\ra\maps\soviet-02a\soviet02a.lua = mods\ra\maps\soviet-02a\soviet02a.lua mods\ra\maps\soviet-02a\soviet02a.lua = mods\ra\maps\soviet-02a\soviet02a.lua
mods\ra\maps\soviet-07\soviet07.lua = mods\ra\maps\soviet-07\soviet07.lua
mods\ra\maps\survival01\survival01.lua = mods\ra\maps\survival01\survival01.lua mods\ra\maps\survival01\survival01.lua = mods\ra\maps\survival01\survival01.lua
mods\ra\maps\survival02\survival02.lua = mods\ra\maps\survival02\survival02.lua mods\ra\maps\survival02\survival02.lua = mods\ra\maps\survival02\survival02.lua
mods\ra\maps\fort-lonestar\fort-lonestar.lua = mods\ra\maps\fort-lonestar\fort-lonestar.lua mods\ra\maps\fort-lonestar\fort-lonestar.lua = mods\ra\maps\fort-lonestar\fort-lonestar.lua

View File

@@ -463,6 +463,9 @@ Actors:
Owner: Greece Owner: Greece
Facing: 224 Facing: 224
SubCell: 2 SubCell: 2
Actor214: healcrate
Owner: Neutral
Location: 88,69
Actor227: flare Actor227: flare
Owner: Spain Owner: Spain
Location: 75,49 Location: 75,49

View File

@@ -238,8 +238,12 @@ IntroSequence = function()
Media.PlaySpeechNotification(player, "TimerStarted") Media.PlaySpeechNotification(player, "TimerStarted")
timerStarted = true timerStarted = true
end) end)
-- Trigger a game over if the player lost all human units before the security system has been deactivated
Trigger.OnAllKilled(StartingUnits, function() Trigger.OnAllKilled(StartingUnits, function()
enemy.MarkCompletedObjective(alliedObjective) if not controlCenterTrigger then
enemy.MarkCompletedObjective(alliedObjective)
end
end) end)
end end
@@ -299,4 +303,4 @@ Tick = function()
UserInterface.SetMissionText("") UserInterface.SetMissionText("")
enemy.MarkCompletedObjective(alliedObjective) enemy.MarkCompletedObjective(alliedObjective)
end end
end end