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

Merge pull request #9969 from obrakmann/fix9892_dead-radar-stops-all-reinf

Browse Source 
Fix reinforcements appearing in soviet04a/b despite killed radar dome
This commit is contained in:
Pavel Penev
2015-11-14 14:58:25 +02:00
parent 473ae7c9cb c8a517713d
commit 0c1283c8c0
2 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mods/ra/maps/soviet-04a/soviet04a-reinforcements_teams.lua
View File

@@ -31,6 +31,10 @@ AttackPaths =
} }
ReinfInf = function() ReinfInf = function()
if Radar.IsDead or Radar.Owner ~= Greece then
return
end
Reinforcements.Reinforce(Greece, InfantryReinfGreece, InfReinfPath, 0, function(soldier) Reinforcements.Reinforce(Greece, InfantryReinfGreece, InfReinfPath, 0, function(soldier)
soldier.Hunt() soldier.Hunt()
end) end)
@@ -46,35 +50,39 @@ ReinfArmor = function()
end end
BringPatrol1 = function() BringPatrol1 = function()
if Radar.IsDead or Radar.Owner ~= Greece then
return
end
local units = Reinforcements.Reinforce(Greece, Patrol1Group, { SWRoadPoint.Location }, 0) local units = Reinforcements.Reinforce(Greece, Patrol1Group, { SWRoadPoint.Location }, 0)
Utils.Do(units, function(patrols) Utils.Do(units, function(patrols)
patrols.Patrol(Patrol1Path, true, 250) patrols.Patrol(Patrol1Path, true, 250)
end) end)
if not Radar.IsDead and Radar.Owner == Greece then Trigger.OnAllKilled(units, function()
Trigger.OnAllKilled(units, function() if Map.Difficulty == "Hard" then
if Map.Difficulty == "Hard" then Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol1)
Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol1) else
else Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol1)
Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol1) end
end end)
end)
end
end end
BringPatrol2 = function() BringPatrol2 = function()
if Radar.IsDead or Radar.Owner ~= Greece then
return
end
local units = Reinforcements.Reinforce(Greece, Patrol2Group, { NRoadPoint.Location }, 0) local units = Reinforcements.Reinforce(Greece, Patrol2Group, { NRoadPoint.Location }, 0)
Utils.Do(units, function(patrols) Utils.Do(units, function(patrols)
patrols.Patrol(Patrol2Path, true, 250) patrols.Patrol(Patrol2Path, true, 250)
end) end)
if not Radar.IsDead and Radar.Owner == Greece then Trigger.OnAllKilled(units, function()
Trigger.OnAllKilled(units, function() if Map.Difficulty == "Hard" then
if Map.Difficulty == "Hard" then Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol2)
Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol2) else
else Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol2)
Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol2) end
end end)
end)
end
end end

44
mods/ra/maps/soviet-04b/soviet04b-reinforcements_teams.lua
View File

@@ -31,6 +31,10 @@ AttackPaths =
} }
ReinfInf = function() ReinfInf = function()
if Radar.IsDead or Radar.Owner ~= Greece then
return
end
Reinforcements.Reinforce(Greece, InfantryReinfGreece, InfReinfPath, 0, function(soldier) Reinforcements.Reinforce(Greece, InfantryReinfGreece, InfReinfPath, 0, function(soldier)
soldier.Hunt() soldier.Hunt()
end) end)
@@ -46,35 +50,39 @@ ReinfArmor = function()
end end
BringPatrol1 = function() BringPatrol1 = function()
if Radar.IsDead or Radar.Owner ~= Greece then
return
end
local units = Reinforcements.Reinforce(Greece, Patrol1Group, { NRoadPoint.Location }, 0) local units = Reinforcements.Reinforce(Greece, Patrol1Group, { NRoadPoint.Location }, 0)
Utils.Do(units, function(patrols) Utils.Do(units, function(patrols)
patrols.Patrol(Patrol1Path, true, 250) patrols.Patrol(Patrol1Path, true, 250)
end) end)
if not Radar.IsDead and Radar.Owner == Greece then Trigger.OnAllKilled(units, function()
Trigger.OnAllKilled(units, function() if Map.Difficulty == "Hard" then
if Map.Difficulty == "Hard" then Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol1)
Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol1) else
else Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol1)
Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol1) end
end end)
end)
end
end end
BringPatrol2 = function() BringPatrol2 = function()
if Radar.IsDead or Radar.Owner ~= Greece then
return
end
local units = Reinforcements.Reinforce(Greece, Patrol2Group, { NRoadPoint.Location }, 0) local units = Reinforcements.Reinforce(Greece, Patrol2Group, { NRoadPoint.Location }, 0)
Utils.Do(units, function(patrols) Utils.Do(units, function(patrols)
patrols.Patrol(Patrol2Path, true, 250) patrols.Patrol(Patrol2Path, true, 250)
end) end)
if not Radar.IsDead and Radar.Owner == Greece then Trigger.OnAllKilled(units, function()
Trigger.OnAllKilled(units, function() if Map.Difficulty == "Hard" then
if Map.Difficulty == "Hard" then Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol2)
Trigger.AfterDelay(DateTime.Minutes(4), BringPatrol2) else
else Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol2)
Trigger.AfterDelay(DateTime.Minutes(7), BringPatrol2) end
end end)
end)
end
end end