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

Fix soviet units not attack moving to their rally points

Browse Source 
and remove unnecessary (duplicated) code from the tick function
(the call to IdleHunt inside SpawnSovietUnits is enough)
This commit is contained in:
abcdefg30
2016-10-09 22:05:41 +02:00
parent 648f06af0f
commit d828e709d6
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mods/ra/maps/exodus/exodus.lua
View File

@@ -139,17 +139,18 @@ end
SovietGroupSize = 5
SpawnSovietUnits = function()
local spawnPoint = Utils.Random(SovietEntryPoints)
local rallyPoint = Utils.Random(SovietRallyPoints)
local route = { spawnPoint.Location, rallyPoint.Location }
local units = SovietUnits1
if DateTime.GameTime >= SovietUnits2Ticks[Difficulty] then
units = SovietUnits2
end
local unit = { Utils.Random(units) }
Reinforcements.Reinforce(soviets, unit, route)
local unitType = Utils.Random(units)
local spawnPoint = Utils.Random(SovietEntryPoints)
local rallyPoint = Utils.Random(SovietRallyPoints)
local actor = Actor.Create(unitType, true, { Owner = soviets, Location = spawnPoint.Location })
actor.AttackMove(rallyPoint.Location)
IdleHunt(actor)
local delay = math.max(attackAtFrame - 5, minAttackAtFrame)
Trigger.AfterDelay(delay, SpawnSovietUnits)
@@ -189,24 +190,6 @@ IdleHunt = function(unit)
end)
end
ManageSovietUnits = function()
Utils.Do(SovietRallyPoints, function(rallyPoint)
local radius = WDist.FromCells(8)
local units = Map.ActorsInCircle(rallyPoint.CenterPosition, radius, function(actor)
return actor.Owner == soviets and actor.HasProperty("Hunt")
end)
if #units > SovietGroupSize then
Utils.Do(units, IdleHunt)
end
end)
local scatteredUnits = Utils.Where(soviets.GetGroundAttackers(), function(unit)
return not Map.IsNamedActor(unit) and unit.IsIdle and unit.HasProperty("Hunt")
end)
Utils.Do(scatteredUnits, IdleHunt)
end
AircraftTargets = function()
local targets = Utils.Where(Map.ActorsInWorld, function(a)
return (a.Owner == allies1 or a.Owner == allies2) and a.HasProperty("Health")
@@ -297,7 +280,6 @@ end
Tick = function()
if DateTime.GameTime % 100 == 0 then
ManageSovietUnits()
ManageSovietAircraft()
Utils.Do(humans, function(player)