Merge pull request #10731 from RoosterDragon/fuzzy-singletons

Create singletons for AttackOrFleeFuzzy rulesets
This commit is contained in:
Oliver Brakmann
2016-02-17 21:25:03 +01:00
6 changed files with 133 additions and 148 deletions

View File

@@ -231,8 +231,6 @@ namespace OpenRA.Mods.Common.AI
BitArray resourceTypeIndices;
RushFuzzy rushFuzzy = new RushFuzzy();
Cache<Player, Enemy> aggro = new Cache<Player, Enemy>(_ => new Enemy());
List<BaseBuilder> builders = new List<BaseBuilder>();
@@ -774,7 +772,7 @@ namespace OpenRA.Mods.Common.AI
var enemies = World.FindActorsInCircle(b.CenterPosition, WDist.FromCells(Info.RushAttackScanRadius))
.Where(unit => Player.Stances[unit.Owner] == Stance.Enemy && unit.Info.HasTraitInfo<AttackBaseInfo>()).ToList();
if (rushFuzzy.CanAttack(ownUnits, enemies))
if (AttackOrFleeFuzzy.Rush.CanAttack(ownUnits, enemies))
{
var target = enemies.Any() ? enemies.Random(Random) : b;
var rush = GetSquadOfType(SquadType.Rush);