Merge pull request OpenRA#2754 from Mailaender/auto-target-desync-hotfix

Hotfix: Addresses Desync Issues in AutoTarget Trait
chrisforbes · Mar 11, 2013 · 623fce3 · 623fce3
2 parents 7cbc4a2 + 97d850e
commit 623fce3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs
@@ -36,8 +36,8 @@ public abstract class AttackBaseInfo : ITraitInfo
 		public readonly bool AlignIdleTurrets = false;
 		public readonly bool CanAttackGround = true;
 
-		public readonly float ScanTimeAverage = 2f;
-		public readonly float ScanTimeSpread = .5f;
+		public readonly int MinimumScanTimeInterval = 30;
+		public readonly int MaximumScanTimeInterval = 60;
 
 		public abstract object Create(ActorInitializer init);
 

diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs
@@ -107,9 +107,7 @@ public void ScanAndAttack(Actor self)
 		Actor ChooseTarget(Actor self, float range)
 		{
 			var info = self.Info.Traits.Get<AttackBaseInfo>();
-			nextScanTime = (int)(25 * (info.ScanTimeAverage +
-				(self.World.SharedRandom.NextFloat() * 2 - 1) * info.ScanTimeSpread));
-			Log.Write("debug", "Actor {0}; nextScanTime: {1}", self.ActorID, nextScanTime);
+			nextScanTime = self.World.SharedRandom.Next(info.MinimumScanTimeInterval, info.MaximumScanTimeInterval);
 
 			var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range));