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

Merge pull request #5405 from RoosterDragon/min-max

Browse Source 
Added MinBy, MaxBy, etc.
This commit is contained in:
Paul Chote
2014-06-09 17:42:01 +12:00
parent 033f631f28 0ea3509ee4
commit d8e5177a36
16 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -298,7 +298,7 @@ namespace OpenRA.Mods.RA.AI
// Try to maintain 20% excess power
if (!HasAdequatePower())
return buildableThings.Where(a => GetPowerProvidedBy(a) > 0)
.OrderByDescending(a => GetPowerProvidedBy(a)).FirstOrDefault();
.MaxByOrDefault(a => GetPowerProvidedBy(a));
if (playerResource.AlertSilo)
return GetBuildingInfoByCommonName("Silo", p);
@@ -365,9 +365,13 @@ namespace OpenRA.Mods.RA.AI
case BuildingType.Refinery:
var tilesPos = world.FindTilesInCircle(baseCenter, MaxBaseDistance)
.Where(a => resourceTypes.Contains(world.GetTerrainType(new CPos(a.X, a.Y))))
.OrderBy(a => (a.CenterPosition - baseCenter.CenterPosition).LengthSquared);
return tilesPos.Any() ? findPos(tilesPos.First().CenterPosition, baseCenter) : null;
.Where(a => resourceTypes.Contains(world.GetTerrainType(new CPos(a.X, a.Y))));
if (tilesPos.Any())
{
var pos = tilesPos.MinBy(a => (a.CenterPosition - baseCenter.CenterPosition).LengthSquared);
return findPos(pos.CenterPosition, baseCenter);
}
return null;
case BuildingType.Building:
for (var k = 0; k < maxBaseDistance; k++)
@@ -426,8 +430,7 @@ namespace OpenRA.Mods.RA.AI
var leastLikedEnemies = liveEnemies
.GroupBy(e => aggro[e].Aggro)
.OrderByDescending(g => g.Key)
.FirstOrDefault();
.MaxByOrDefault(g => g.Key);
var enemy = (leastLikedEnemies != null) ?
leastLikedEnemies.Random(random) : liveEnemies.FirstOrDefault();
@@ -457,12 +460,9 @@ namespace OpenRA.Mods.RA.AI
{
var allEnemyUnits = world.Actors
.Where(unit => p.Stances[unit.Owner] == Stance.Enemy && !unit.HasTrait<Husk>() &&
unit.HasTrait<ITargetable>()).ToList();
unit.HasTrait<ITargetable>());
if (allEnemyUnits.Count > 0)
return allEnemyUnits.ClosestTo(pos);
return null;
return allEnemyUnits.ClosestTo(pos);
}
internal Actor FindClosestEnemy(WPos pos, WRange radius)