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

Work around a recursive loop in TargetAndAttack

Browse Source
This commit is contained in:
abcdefg30
2019-10-09 15:11:29 +02:00
committed by reaperrr
parent 3860cd1b98
commit feb58801e0
7 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mods/ra/maps/allies-04/allies04-AI.lua
View File

@@ -245,6 +245,10 @@ ProduceAircraft = function()
end
TargetAndAttack = function(yak, target)
if yak.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == player and self.HasProperty("Health") and yak.CanTarget(self) end)
@@ -260,7 +264,11 @@ TargetAndAttack = function(yak, target)
end
yak.CallFunc(function()
TargetAndAttack(yak, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(yak, target)
end)
end)
end

10
mods/ra/maps/allies-05a/allies05a-AI.lua
View File

@@ -264,6 +264,10 @@ ProduceAircraft = function()
end
TargetAndAttack = function(yak, target)
if yak.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == greece and self.HasProperty("Health") and yak.CanTarget(self) end)
if #enemies > 0 then
@@ -278,7 +282,11 @@ TargetAndAttack = function(yak, target)
end
yak.CallFunc(function()
TargetAndAttack(yak, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(yak, target)
end)
end)
end

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

@@ -159,6 +159,10 @@ ProduceAircraft = function()
end
TargetAndAttack = function(yak, target)
if yak.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == player and self.HasProperty("Health") and yak.CanTarget(self) end)
if #enemies > 0 then
@@ -173,7 +177,11 @@ TargetAndAttack = function(yak, target)
end
yak.CallFunc(function()
TargetAndAttack(yak, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(yak, target)
end)
end)
end

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

@@ -171,6 +171,10 @@ ProduceAircraft = function()
end
TargetAndAttack = function(yak, target)
if yak.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == player and self.HasProperty("Health") and yak.CanTarget(self) end)
if #enemies > 0 then
@@ -185,7 +189,11 @@ TargetAndAttack = function(yak, target)
end
yak.CallFunc(function()
TargetAndAttack(yak, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(yak, target)
end)
end)
end

10
mods/ra/maps/allies-07/allies07-AI.lua
View File

@@ -134,6 +134,10 @@ ProduceAircraft = function()
end
TargetAndAttack = function(yak, target)
if yak.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == greece and self.HasProperty("Health") and yak.CanTarget(self) end)
if #enemies > 0 then
@@ -148,7 +152,11 @@ TargetAndAttack = function(yak, target)
end
yak.CallFunc(function()
TargetAndAttack(yak, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(yak, target)
end)
end)
end

12
mods/ra/maps/allies-08a/allies08a-AI.lua
View File

@@ -130,9 +130,13 @@ ProduceAircraft = function()
end
TargetAndAttack = function(mig, target)
if mig.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(greece.GetActors(), function(actor)
return actor.HasProperty("Health") and actor.Type ~= "brik"
return actor.HasProperty("Health") and actor.Type ~= "brik" and mig.CanTarget(target)
end)
if #enemies > 0 then
target = Utils.Random(enemies)
@@ -146,7 +150,11 @@ TargetAndAttack = function(mig, target)
end
mig.CallFunc(function()
TargetAndAttack(mig, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(mig, target)
end)
end)
end

12
mods/ra/maps/allies-08b/allies08b-AI.lua
View File

@@ -129,9 +129,13 @@ ProduceAircraft = function()
end
TargetAndAttack = function(mig, target)
if mig.IsDead then
return
end
if not target or target.IsDead or (not target.IsInWorld) then
local enemies = Utils.Where(greece.GetActors(), function(actor)
return actor.HasProperty("Health") and actor.Type ~= "brik"
return actor.HasProperty("Health") and actor.Type ~= "brik" and mig.CanTarget(target)
end)
if #enemies > 0 then
target = Utils.Random(enemies)
@@ -145,7 +149,11 @@ TargetAndAttack = function(mig, target)
end
mig.CallFunc(function()
TargetAndAttack(mig, target)
-- TODO: Replace this with an idle trigger once that works for aircraft
-- Add a delay of one tick to fix an endless recursive call
Trigger.AfterDelay(1, function()
TargetAndAttack(mig, target)
end)
end)
end