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

Resolve conflicts between actor and API names (Radar)

Browse Source
This commit is contained in:
abcdefg30
2018-08-05 15:33:10 +02:00
committed by Oliver Brakmann
parent 1927b88a18
commit 0b53c1f139
16 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ra/maps/soviet-05/map.yaml
View File

@@ -225,7 +225,7 @@ Actors:
Location: 69,49
Owner: Greece
Facing: 32
Radar: dome
RadarDome: dome
Location: 70,45
Owner: France
Actor57: fact

14
mods/ra/maps/soviet-05/soviet05.lua
View File

@@ -214,7 +214,7 @@ WorldLoaded = function()
Trigger.OnDamaged(mcvGG, Expand)
Trigger.OnDamaged(mcvtransport, Expand)
Trigger.OnKilled(Radar, function()
Trigger.OnKilled(RadarDome, function()
if not player.IsObjectiveCompleted(CaptureObjective) then
player.MarkFailedObjective(CaptureObjective)
end
@@ -224,8 +224,8 @@ WorldLoaded = function()
end
end)
Radar.GrantCondition("french")
Trigger.OnCapture(Radar, function()
RadarDome.GrantCondition("french")
Trigger.OnCapture(RadarDome, function()
HoldObjective = player.AddPrimaryObjective("Defend the Radar Dome.")
player.MarkCompletedObjective(CaptureObjective)
Beacon.New(player, MCVDeploy.CenterPosition)
@@ -244,17 +244,17 @@ WorldLoaded = function()
Reinforcements.Reinforce(Greece, ArmorReinfGreece, AlliedCrossroadsToRadarPath , 0, IdleHunt)
Radar.RevokeCondition(1)
Trigger.ClearAll(Radar)
RadarDome.RevokeCondition(1)
Trigger.ClearAll(RadarDome)
Trigger.AfterDelay(0, function()
Trigger.OnRemovedFromWorld(Radar, function()
Trigger.OnRemovedFromWorld(RadarDome, function()
player.MarkFailedObjective(HoldObjective)
end)
end)
end)
Trigger.OnEnteredProximityTrigger(USSRExpansionPoint.CenterPosition, WDist.New(4 * 1024), function(unit, id)
if unit.Owner == player and Radar.Owner == player then
if unit.Owner == player and RadarDome.Owner == player then
Trigger.RemoveProximityTrigger(id)
Para2()