Add support for circumventing the target scan limit in AttackMove

This commit is contained in:
abcdefg30
2020-08-20 23:03:17 +02:00
committed by reaperrr
parent a12d127fd6
commit ad3722e19f
2 changed files with 7 additions and 5 deletions

View File

@@ -279,15 +279,16 @@ namespace OpenRA.Mods.Common.Traits
--nextScanTime;
}
public Target ScanForTarget(Actor self, bool allowMove, bool allowTurn)
public Target ScanForTarget(Actor self, bool allowMove, bool allowTurn, bool ignoreScanInterval = false)
{
if (nextScanTime <= 0 && ActiveAttackBases.Any())
if ((ignoreScanInterval || nextScanTime <= 0) && ActiveAttackBases.Any())
{
foreach (var dat in disableAutoTarget)
if (dat.DisableAutoTarget(self))
return Target.Invalid;
nextScanTime = self.World.SharedRandom.Next(Info.MinimumScanTimeInterval, Info.MaximumScanTimeInterval);
if (!ignoreScanInterval)
nextScanTime = self.World.SharedRandom.Next(Info.MinimumScanTimeInterval, Info.MaximumScanTimeInterval);
foreach (var ab in ActiveAttackBases)
{