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

move autotarget scan time params into AutoTargetInfo

Browse Source
This commit is contained in:
Chris Forbes
2013-04-20 16:19:06 +12:00
parent d735242cd0
commit b6de3b3991
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -21,11 +21,6 @@ namespace OpenRA.Mods.RA
{
public readonly bool CanAttackGround = true;
[Desc("Ticks to wait until next AutoTarget: attempt.")]
public readonly int MinimumScanTimeInterval = 30;
[Desc("Ticks to wait until next AutoTarget: attempt.")]
public readonly int MaximumScanTimeInterval = 60;
public abstract object Create(ActorInitializer init);
}

9
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -23,6 +23,11 @@ namespace OpenRA.Mods.RA
public readonly int ScanRadius = -1;
public readonly UnitStance InitialStance = UnitStance.AttackAnything;
[Desc("Ticks to wait until next AutoTarget: attempt.")]
public readonly int MinimumScanTimeInterval = 30;
[Desc("Ticks to wait until next AutoTarget: attempt.")]
public readonly int MaximumScanTimeInterval = 60;
public object Create(ActorInitializer init) { return new AutoTarget(init.self, this); }
}
@@ -112,8 +117,7 @@ namespace OpenRA.Mods.RA
Actor ChooseTarget(Actor self, float range)
{
var info = self.Info.Traits.Get<AttackBaseInfo>();
nextScanTime = self.World.SharedRandom.Next(info.MinimumScanTimeInterval, info.MaximumScanTimeInterval);
nextScanTime = self.World.SharedRandom.Next(Info.MinimumScanTimeInterval, Info.MaximumScanTimeInterval);
var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range));
@@ -134,6 +138,7 @@ namespace OpenRA.Mods.RA
}
}
}
[Desc("Will not get automatically targeted by enemy (like walls)")]
class AutoTargetIgnoreInfo : TraitInfo<AutoTargetIgnore> { }
class AutoTargetIgnore { }