diff --git a/OpenRA.Mods.Common/AI/HackyAI.cs b/OpenRA.Mods.Common/AI/HackyAI.cs index 993a04d60a..7d06ecf5b2 100644 --- a/OpenRA.Mods.Common/AI/HackyAI.cs +++ b/OpenRA.Mods.Common/AI/HackyAI.cs @@ -182,6 +182,7 @@ namespace OpenRA.Mods.Common.AI readonly IPathFinder pathfinder; readonly Func isEnemyUnit; + readonly Predicate unitIsDeadOrHasNewOwner; Dictionary waitingPowers = new Dictionary(); Dictionary powerDecisions = new Dictionary(); @@ -235,6 +236,7 @@ namespace OpenRA.Mods.Common.AI Player.Stances[unit.Owner] == Stance.Enemy && !unit.Info.HasTraitInfo() && unit.Info.HasTraitInfo(); + unitIsDeadOrHasNewOwner = a => a.Owner != Player || a.IsDead; foreach (var decision in info.PowerDecisions) powerDecisions.Add(decision.OrderName, decision); @@ -604,7 +606,7 @@ namespace OpenRA.Mods.Common.AI { squads.RemoveAll(s => !s.IsValid); foreach (var s in squads) - s.Units.RemoveAll(a => a.IsDead || a.Owner != Player); + s.Units.RemoveAll(unitIsDeadOrHasNewOwner); } // Use of this function requires that one squad of this type. Hence it is a piece of shit @@ -623,8 +625,8 @@ namespace OpenRA.Mods.Common.AI void AssignRolesToIdleUnits(Actor self) { CleanSquads(); - activeUnits.RemoveAll(a => a.IsDead || a.Owner != Player); - unitsHangingAroundTheBase.RemoveAll(a => a.IsDead || a.Owner != Player); + activeUnits.RemoveAll(unitIsDeadOrHasNewOwner); + unitsHangingAroundTheBase.RemoveAll(unitIsDeadOrHasNewOwner); if (--rushTicks <= 0) { @@ -805,12 +807,14 @@ namespace OpenRA.Mods.Common.AI void SetRallyPointsForNewProductionBuildings(Actor self) { - var buildings = self.World.ActorsWithTrait() - .Where(rp => rp.Actor.Owner == Player && - !IsRallyPointValid(rp.Trait.Location, rp.Actor.Info.TraitInfoOrDefault())).ToArray(); - - foreach (var a in buildings) - QueueOrder(new Order("SetRallyPoint", a.Actor, false) { TargetLocation = ChooseRallyLocationNear(a.Actor), SuppressVisualFeedback = true }); + foreach (var rp in self.World.ActorsWithTrait()) + if (rp.Actor.Owner == Player && + !IsRallyPointValid(rp.Trait.Location, rp.Actor.Info.TraitInfoOrDefault())) + QueueOrder(new Order("SetRallyPoint", rp.Actor, false) + { + TargetLocation = ChooseRallyLocationNear(rp.Actor), + SuppressVisualFeedback = true + }); } // Won't work for shipyards... @@ -878,10 +882,10 @@ namespace OpenRA.Mods.Common.AI if (supportPowerMngr == null) return; - var powers = supportPowerMngr.Powers.Where(p => !p.Value.Disabled); - foreach (var kv in powers) + foreach (var sp in supportPowerMngr.Powers.Values) { - var sp = kv.Value; + if (sp.Disabled) + continue; // Add power to dictionary if not in delay dictionary yet if (!waitingPowers.ContainsKey(sp)) diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index acddc69b1d..7e29d02214 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -194,6 +194,7 @@ + diff --git a/OpenRA.Mods.Common/ShroudExts.cs b/OpenRA.Mods.Common/ShroudExts.cs new file mode 100644 index 0000000000..8f418a8caa --- /dev/null +++ b/OpenRA.Mods.Common/ShroudExts.cs @@ -0,0 +1,39 @@ +#region Copyright & License Information +/* + * Copyright 2007-2015 The OpenRA Developers (see AUTHORS) + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation. For more information, + * see COPYING. + */ +#endregion + +using System.Collections.Generic; +using OpenRA.Primitives; +using OpenRA.Traits; + +namespace OpenRA.Mods.Common +{ + using OccupiedCells = IEnumerable>; + + public static class ShroudExts + { + public static bool AnyExplored(this Shroud shroud, OccupiedCells cells) + { + foreach (var cell in cells) + if (shroud.IsExplored(cell.First)) + return true; + + return false; + } + + public static bool AnyVisible(this Shroud shroud, OccupiedCells cells) + { + foreach (var cell in cells) + if (shroud.IsVisible(cell.First)) + return true; + + return false; + } + } +} diff --git a/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs b/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs index b1b5c0706b..c211285bf9 100644 --- a/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs @@ -70,8 +70,7 @@ namespace OpenRA.Mods.Common.Traits { // If fog is disabled visibility is determined by shroud if (!byPlayer.Shroud.FogEnabled) - return self.OccupiesSpace.OccupiedCells() - .Any(o => byPlayer.Shroud.IsExplored(o.First)); + return byPlayer.Shroud.AnyExplored(self.OccupiesSpace.OccupiedCells()); return initialized && stateByPlayer[byPlayer].IsVisible; } diff --git a/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderFog.cs b/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderFog.cs index 1b190d9765..f04d6111e7 100644 --- a/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderFog.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderFog.cs @@ -33,8 +33,7 @@ namespace OpenRA.Mods.Common.Traits return base.IsVisibleInner(self, byPlayer); if (Info.Type == VisibilityType.Footprint) - return self.OccupiesSpace.OccupiedCells() - .Any(o => byPlayer.Shroud.IsVisible(o.First)); + return byPlayer.Shroud.AnyVisible(self.OccupiesSpace.OccupiedCells()); return byPlayer.Shroud.IsVisible(self.CenterPosition); } diff --git a/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderShroud.cs b/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderShroud.cs index 9d45976aef..75e4a6960e 100644 --- a/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderShroud.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderShroud.cs @@ -42,8 +42,7 @@ namespace OpenRA.Mods.Common.Traits protected virtual bool IsVisibleInner(Actor self, Player byPlayer) { if (Info.Type == VisibilityType.Footprint) - return self.OccupiesSpace.OccupiedCells() - .Any(o => byPlayer.Shroud.IsExplored(o.First)); + return byPlayer.Shroud.AnyExplored(self.OccupiesSpace.OccupiedCells()); return byPlayer.Shroud.IsExplored(self.CenterPosition); }