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

Fix broken reinforcements on gdi04 and limit them to 3 waves

Browse Source
This commit is contained in:
abcdefg30
2019-05-18 14:27:51 +02:00
committed by reaperrr
parent b1f6c69fce
commit 54e2aad1cd
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mods/cnc/maps/gdi04a/gdi04a.lua
View File

@@ -18,6 +18,7 @@ HeliDelay = { 83, 137, 211 }
GDIReinforcements = { "e2", "e2", "e2", "e2", "e2" } GDIReinforcements = { "e2", "e2", "e2", "e2", "e2" }
GDIReinforcementsWaypoints = { GDIReinforcementsEntry.Location, GDIReinforcementsWP1.Location } GDIReinforcementsWaypoints = { GDIReinforcementsEntry.Location, GDIReinforcementsWP1.Location }
GDIReinforcementsLeft = 3
NodHelis = NodHelis =
{ {
@@ -49,8 +50,15 @@ SendGDIReinforcements = function()
Media.PlaySpeechNotification(GDI, "Reinforce") Media.PlaySpeechNotification(GDI, "Reinforce")
Reinforcements.ReinforceWithTransport(GDI, "apc", GDIReinforcements, GDIReinforcementsWaypoints, nil, function(apc, team) Reinforcements.ReinforceWithTransport(GDI, "apc", GDIReinforcements, GDIReinforcementsWaypoints, nil, function(apc, team)
table.insert(team, apc) table.insert(team, apc)
Trigger.OnAllKilled(team, function() Trigger.AfterDelay(DateTime.Seconds(5), SendGDIReinforcements) end) Trigger.OnAllKilled(team, function()
Utils.Do(team, function(unit) unit.Stance = "Defend" end) if GDIReinforcementsLeft > 0 then
GDIReinforcementsLeft = GDIReinforcementsLeft - 1
Trigger.AfterDelay(DateTime.Seconds(5), function()
Media.DisplayMessage("APC squads in reserve: " .. GDIReinforcementsLeft, "Battlefield Control")
SendGDIReinforcements()
end)
end
end)
end) end)
end end
@@ -81,8 +89,8 @@ end
Tick = function() Tick = function()
Nod.Cash = 1000 Nod.Cash = 1000
if GDI.HasNoRequiredUnits() then if (GDIReinforcementsLeft == 0 or not GDI.IsObjectiveCompleted(ReinforcementsObjective)) and GDI.HasNoRequiredUnits() then
Trigger.AfterDelay(DateTime.Seconds(1), function() GDI.MarkFailedObjective(GDIObjective) end) GDI.MarkFailedObjective(GDIObjective)
end end
end end

17
mods/cnc/maps/gdi04b/gdi04b.lua
View File

@@ -21,6 +21,7 @@ KillsUntilReinforcements = 12
GDIReinforcements = { "e2", "e2", "e2", "e2", "e2" } GDIReinforcements = { "e2", "e2", "e2", "e2", "e2" }
GDIReinforcementsWaypoints = { GDIReinforcementsEntry.Location, GDIReinforcementsWP1.Location } GDIReinforcementsWaypoints = { GDIReinforcementsEntry.Location, GDIReinforcementsWP1.Location }
GDIReinforcementsLeft = 3
NodHeli = { { HeliEntry.Location, NodHeliLZ.Location }, { "e1", "e1", "e3", "e3" } } NodHeli = { { HeliEntry.Location, NodHeliLZ.Location }, { "e1", "e1", "e3", "e3" } }
@@ -46,7 +47,15 @@ SendGDIReinforcements = function()
Media.PlaySpeechNotification(GDI, "Reinforce") Media.PlaySpeechNotification(GDI, "Reinforce")
Reinforcements.ReinforceWithTransport(GDI, "apc", GDIReinforcements, GDIReinforcementsWaypoints, nil, function(apc, team) Reinforcements.ReinforceWithTransport(GDI, "apc", GDIReinforcements, GDIReinforcementsWaypoints, nil, function(apc, team)
table.insert(team, apc) table.insert(team, apc)
Trigger.OnAllKilled(team, function() Trigger.AfterDelay(DateTime.Seconds(5), SendGDIReinforcements) end) Trigger.OnAllKilled(team, function()
if GDIReinforcementsLeft > 0 then
GDIReinforcementsLeft = GDIReinforcementsLeft - 1
Trigger.AfterDelay(DateTime.Seconds(5), function()
Media.DisplayMessage("APC squads in reserve: " .. GDIReinforcementsLeft, "Battlefield Control")
SendGDIReinforcements()
end)
end
end)
end) end)
end end
@@ -70,10 +79,8 @@ end
Tick = function() Tick = function()
Nod.Cash = 1000 Nod.Cash = 1000
if GDI.HasNoRequiredUnits() then if (GDIReinforcementsLeft == 0 or not GDI.IsObjectiveCompleted(ReinforcementsObjective)) and GDI.HasNoRequiredUnits() then
Trigger.AfterDelay(DateTime.Seconds(1), function() GDI.MarkFailedObjective(GDIObjective)
GDI.MarkFailedObjective(gdiObjective)
end)
end end
end end