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 Tower2: gtwr
Location: 23,21 Location: 23,21
Owner: GDI Owner: GDI
Radar: hq CommCenter: hq
Location: 21,14 Location: 21,14
Owner: GDI Owner: GDI
Silo1: silo 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 } 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 = { } GDIStartUnits = { }
SendGDIAirstrike = function() SendGDIAirstrike = function()
if not Radar.IsDead and Radar.Owner == enemy then if not CommCenter.IsDead and CommCenter.Owner == enemy then
local target = getAirstrikeTarget() local target = getAirstrikeTarget()
if target then if target then
Radar.SendAirstrike(target, false, Facing.NorthEast + 4) CommCenter.SendAirstrike(target, false, Facing.NorthEast + 4)
Trigger.AfterDelay(AirstrikeDelay, SendGDIAirstrike) Trigger.AfterDelay(AirstrikeDelay, SendGDIAirstrike)
else else
Trigger.AfterDelay(AirstrikeDelay/4, SendGDIAirstrike) Trigger.AfterDelay(AirstrikeDelay/4, SendGDIAirstrike)

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

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

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

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

4
mods/ra/maps/allies-06a/allies06a.lua
View File

@@ -109,11 +109,11 @@ InitialAlliedReinforcements = function()
end end
CaptureRadarDome = function() CaptureRadarDome = function()
Trigger.OnKilled(Radar, function() Trigger.OnKilled(RadarDome, function()
player.MarkFailedObjective(CaptureRadarDomeObj) player.MarkFailedObjective(CaptureRadarDomeObj)
end) end)
Trigger.OnCapture(Radar, function() Trigger.OnCapture(RadarDome, function()
player.MarkCompletedObjective(CaptureRadarDomeObj) player.MarkCompletedObjective(CaptureRadarDomeObj)
Beacon.New(player, TechLab1.CenterPosition) Beacon.New(player, TechLab1.CenterPosition)
Beacon.New(player, TechLab2.CenterPosition) Beacon.New(player, TechLab2.CenterPosition)

2
mods/ra/maps/allies-06a/map.yaml
View File

@@ -630,7 +630,7 @@ Actors:
Refinery: proc Refinery: proc
Location: 81,90 Location: 81,90
Owner: USSR Owner: USSR
Radar: dome RadarDome: dome
Location: 20,83 Location: 20,83
Owner: USSR Owner: USSR
WeaponMeetPoint: waypoint WeaponMeetPoint: waypoint

4
mods/ra/maps/allies-06b/allies06b.lua
View File

@@ -120,11 +120,11 @@ InitialAlliedReinforcements = function()
end end
CaptureRadarDome = function() CaptureRadarDome = function()
Trigger.OnKilled(Radar, function() Trigger.OnKilled(RadarDome, function()
player.MarkFailedObjective(CaptureRadarDomeObj) player.MarkFailedObjective(CaptureRadarDomeObj)
end) end)
Trigger.OnCapture(Radar, function() Trigger.OnCapture(RadarDome, function()
player.MarkCompletedObjective(CaptureRadarDomeObj) player.MarkCompletedObjective(CaptureRadarDomeObj)
Beacon.New(player, TechLab1.CenterPosition) Beacon.New(player, TechLab1.CenterPosition)
Beacon.New(player, TechLab2.CenterPosition) Beacon.New(player, TechLab2.CenterPosition)

2
mods/ra/maps/allies-06b/map.yaml
View File

@@ -618,7 +618,7 @@ Actors:
Refinery: proc Refinery: proc
Location: 68,35 Location: 68,35
Owner: USSR Owner: USSR
Radar: dome RadarDome: dome
Location: 75,86 Location: 75,86
Owner: USSR Owner: USSR
Radar2: dome Radar2: dome

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

@@ -415,7 +415,7 @@ Actors:
Actor159: mine Actor159: mine
Location: 77,46 Location: 77,46
Owner: Neutral Owner: Neutral
Radar: dome RadarDome: dome
Location: 49,46 Location: 49,46
Owner: Greece Owner: Greece
CYard: fact CYard: fact

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

@@ -39,7 +39,7 @@ AttackPaths =
} }
ReinfInf = function() ReinfInf = function()
if Radar.IsDead or Radar.Owner ~= Greece then if RadarDome.IsDead or RadarDome.Owner ~= Greece then
return return
end end
@@ -49,7 +49,7 @@ ReinfInf = function()
end end
ReinfArmor = function() ReinfArmor = function()
if not Radar.IsDead and Radar.Owner == Greece then if not RadarDome.IsDead and RadarDome.Owner == Greece then
RCheck = true RCheck = true
Reinforcements.Reinforce(Greece, ArmorReinfGreece, ArmorReinfPath, 0, function(soldier) Reinforcements.Reinforce(Greece, ArmorReinfGreece, ArmorReinfPath, 0, function(soldier)
soldier.Hunt() soldier.Hunt()
@@ -58,7 +58,7 @@ ReinfArmor = function()
end end
BringPatrol1 = function() BringPatrol1 = function()
if Radar.IsDead or Radar.Owner ~= Greece then if RadarDome.IsDead or RadarDome.Owner ~= Greece then
return return
end end
@@ -77,7 +77,7 @@ BringPatrol1 = function()
end end
BringPatrol2 = function() BringPatrol2 = function()
if Radar.IsDead or Radar.Owner ~= Greece then if RadarDome.IsDead or RadarDome.Owner ~= Greece then
return return
end end

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

@@ -154,7 +154,7 @@ WorldLoaded = function()
Media.PlaySpeechNotification(player, "Win") Media.PlaySpeechNotification(player, "Win")
end) end)
Trigger.OnKilled(Radar, function() Trigger.OnKilled(RadarDome, function()
player.MarkCompletedObjective(KillRadar) player.MarkCompletedObjective(KillRadar)
Media.PlaySpeechNotification(player, "ObjectiveMet") Media.PlaySpeechNotification(player, "ObjectiveMet")
end) end)

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

@@ -482,7 +482,7 @@ Actors:
Actor169: mine Actor169: mine
Location: 91,87 Location: 91,87
Owner: Neutral Owner: Neutral
Radar: dome RadarDome: dome
Location: 111,50 Location: 111,50
Owner: Greece Owner: Greece
Pbox1: pbox Pbox1: pbox

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

@@ -39,7 +39,7 @@ AttackPaths =
} }
ReinfInf = function() ReinfInf = function()
if Radar.IsDead or Radar.Owner ~= Greece then if RadarDome.IsDead or RadarDome.Owner ~= Greece then
return return
end end
@@ -49,7 +49,7 @@ ReinfInf = function()
end end
ReinfArmor = function() ReinfArmor = function()
if not Radar.IsDead and Radar.Owner == Greece then if not RadarDome.IsDead and RadarDome.Owner == Greece then
RCheck = true RCheck = true
Reinforcements.Reinforce(Greece, ArmorReinfGreece, InfReinfPath, 0, function(soldier) Reinforcements.Reinforce(Greece, ArmorReinfGreece, InfReinfPath, 0, function(soldier)
soldier.Hunt() soldier.Hunt()
@@ -58,7 +58,7 @@ ReinfArmor = function()
end end
BringPatrol1 = function() BringPatrol1 = function()
if Radar.IsDead or Radar.Owner ~= Greece then if RadarDome.IsDead or RadarDome.Owner ~= Greece then
return return
end end
@@ -77,7 +77,7 @@ BringPatrol1 = function()
end end
BringPatrol2 = function() BringPatrol2 = function()
if Radar.IsDead or Radar.Owner ~= Greece then if RadarDome.IsDead or RadarDome.Owner ~= Greece then
return return
end end

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

@@ -139,7 +139,7 @@ WorldLoaded = function()
Media.PlaySpeechNotification(player, "Win") Media.PlaySpeechNotification(player, "Win")
end) end)
Trigger.OnKilled(Radar, function() Trigger.OnKilled(RadarDome, function()
player.MarkCompletedObjective(KillRadar) player.MarkCompletedObjective(KillRadar)
Media.PlaySpeechNotification(player, "ObjectiveMet") Media.PlaySpeechNotification(player, "ObjectiveMet")
end) end)

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

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

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

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