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

Added OnKilledOrCaptured and OnAllKilledOrCaptured

Browse Source
This commit is contained in:
abcdefg30
2014-11-21 17:01:42 +01:00
parent e29adf5f4f
commit 33eeee4680
3 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mods/ra/maps/survival01/survival01.lua
View File

@@ -63,7 +63,7 @@ SovietRallyPoints = { SovietRallyPoint1, SovietRallyPoint2, SovietRallyPoint3, S
SovietGateRallyPoints = { AlliesBaseGate2, AlliesBaseGate2, AlliesBaseGate1, AlliesBaseGate1, AlliesBaseGate1 }
Airfields = { SovietAirfield1, SovietAirfield2, SovietAirfield3 }
SovietBuildings = { Barrack1, SubPen, RadarDome, AdvancedPowerPlant1, AdvancedPowerPlant2, AdvancedPowerPlant3, WarFactory, Refinery, Silo1, Silo2, FlameTower1, FlameTower2, FlameTower3, Sam3, Sam4 }
SovietBuildings = { Barrack1, SubPen, RadarDome, AdvancedPowerPlant1, AdvancedPowerPlant2, AdvancedPowerPlant3, WarFactory, Refinery, Silo1, Silo2, FlameTower1, FlameTower2, FlameTower3, Sam1, Sam2, Sam3, Sam4, SovietAirfield1, SovietAirfield2, SovietAirfield3 }
IdleTrigger = function(units, dest)
Utils.Do(units, function(unit)
@@ -321,7 +321,7 @@ InitMission = function()
end)
end)
Trigger.OnAllKilled(SovietBuildings, function()
Trigger.OnAllKilledOrCaptured(SovietBuildings, function()
if DestroyObj then
if not soviets.HasNoRequiredUnits() then
KillObj = allies.AddPrimaryObjective("Kill all remaining soviet forces.")
@@ -339,10 +339,7 @@ end
SetupSoviets = function()
Barrack1.IsPrimaryBuilding = true
Barrack1.RallyPoint = SovietInfantryRally1.Location
Trigger.OnKilled(Barrack1, function()
SpawningInfantry = false
end)
Trigger.OnCapture(Barrack1, function()
Trigger.OnKilledOrCaptured(Barrack1, function()
SpawningInfantry = false
end)