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/cnc/maps/nod05/map.yaml
View File

@@ -342,7 +342,7 @@ Actors:
Tower2: gtwr
Location: 23,21
Owner: GDI
Radar: hq
CommCenter: hq
Location: 21,14
Owner: GDI
Silo1: silo

6
mods/cnc/maps/nod05/nod05.lua
View File

@@ -45,16 +45,16 @@ Gdi12Waypoints = { waypoint0, waypoint1, waypoint3, waypoint11, waypoint12 }
AllWaypoints = { Gdi1Waypoints, Gdi2Waypoints, Gdi3Waypoints, Gdi5Waypoints, Gdi11Waypoints, Gdi12Waypoints }
PrimaryTargets = { Tower1, Tower2, Radar, Silo1, Silo2, Silo3, Refinery, Barracks, Plant1, Plant2, Yard, Factory }
PrimaryTargets = { Tower1, Tower2, CommCenter, Silo1, Silo2, Silo3, Refinery, Barracks, Plant1, Plant2, Yard, Factory }
GDIStartUnits = { }
SendGDIAirstrike = function()
if not Radar.IsDead and Radar.Owner == enemy then
if not CommCenter.IsDead and CommCenter.Owner == enemy then
local target = getAirstrikeTarget()
if target then
Radar.SendAirstrike(target, false, Facing.NorthEast + 4)
CommCenter.SendAirstrike(target, false, Facing.NorthEast + 4)
Trigger.AfterDelay(AirstrikeDelay, SendGDIAirstrike)
else
Trigger.AfterDelay(AirstrikeDelay/4, SendGDIAirstrike)

2
mods/cnc/maps/nod06a/map.yaml
View File

@@ -638,7 +638,7 @@ Actors:
Detonator: CRATE.plain
Location: 59,43
Owner: GDI
Radar: hq
CommCenter: hq
Location: 57,32
Owner: GDI
Actor187: jeep

8
mods/cnc/maps/nod06a/nod06a.lua
View File

@@ -91,12 +91,12 @@ end
Atk3TriggerFunction = function()
if not Atk3Switch then
Atk3Switch = true
if not Radar.IsDead then
if not CommCenter.IsDead then
local targets = player.GetGroundAttackers()
local target = targets[DateTime.GameTime % #targets + 1].CenterPosition
if target then
Radar.SendAirstrike(target, false, Facing.NorthEast + 4)
CommCenter.SendAirstrike(target, false, Facing.NorthEast + 4)
end
end
end
@@ -135,7 +135,7 @@ InsertNodUnits = function()
local difficulty = Map.LobbyOption("difficulty")
NodStartUnitsRight = NodStartUnitsRight[difficulty]
NodStartUnitsLeft = NodStartUnitsLeft[difficulty]
Camera.Position = UnitsRallyRight.CenterPosition
Media.PlaySpeechNotification(player, "Reinforce")
@@ -183,7 +183,7 @@ WorldLoaded = function()
OnAnyDamaged(Atk1ActorTriggerActivator, Atk1TriggerFunction)
OnAnyDamaged(Atk2ActorTriggerActivator, Atk2TriggerFunction)
if Map.LobbyOption("difficulty") == "tough" then
Trigger.OnDamaged(Atk3Activator, Atk3TriggerFunction)
end