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

Tweak some AI methods to avoid allocations.

Browse Source
This commit is contained in:
RoosterDragon
2015-09-08 20:13:28 +01:00
parent d70eea5adc
commit 108f2e9b6e
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.Common/AI/HackyAI.cs
View File

@@ -182,6 +182,7 @@ namespace OpenRA.Mods.Common.AI
readonly IPathFinder pathfinder; readonly IPathFinder pathfinder;
readonly Func<Actor, bool> isEnemyUnit; readonly Func<Actor, bool> isEnemyUnit;
readonly Predicate<Actor> unitIsDeadOrHasNewOwner;
Dictionary<SupportPowerInstance, int> waitingPowers = new Dictionary<SupportPowerInstance, int>(); Dictionary<SupportPowerInstance, int> waitingPowers = new Dictionary<SupportPowerInstance, int>();
Dictionary<string, SupportPowerDecision> powerDecisions = new Dictionary<string, SupportPowerDecision>(); Dictionary<string, SupportPowerDecision> powerDecisions = new Dictionary<string, SupportPowerDecision>();
@@ -235,6 +236,7 @@ namespace OpenRA.Mods.Common.AI
Player.Stances[unit.Owner] == Stance.Enemy Player.Stances[unit.Owner] == Stance.Enemy
&& !unit.Info.HasTraitInfo<HuskInfo>() && !unit.Info.HasTraitInfo<HuskInfo>()
&& unit.Info.HasTraitInfo<ITargetableInfo>(); && unit.Info.HasTraitInfo<ITargetableInfo>();
unitIsDeadOrHasNewOwner = a => a.Owner != Player || a.IsDead;
foreach (var decision in info.PowerDecisions) foreach (var decision in info.PowerDecisions)
powerDecisions.Add(decision.OrderName, decision); powerDecisions.Add(decision.OrderName, decision);
@@ -604,7 +606,7 @@ namespace OpenRA.Mods.Common.AI
{ {
squads.RemoveAll(s => !s.IsValid); squads.RemoveAll(s => !s.IsValid);
foreach (var s in squads) 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 // 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) void AssignRolesToIdleUnits(Actor self)
{ {
CleanSquads(); CleanSquads();
activeUnits.RemoveAll(a => a.IsDead || a.Owner != Player); activeUnits.RemoveAll(unitIsDeadOrHasNewOwner);
unitsHangingAroundTheBase.RemoveAll(a => a.IsDead || a.Owner != Player); unitsHangingAroundTheBase.RemoveAll(unitIsDeadOrHasNewOwner);
if (--rushTicks <= 0) if (--rushTicks <= 0)
{ {
@@ -805,12 +807,14 @@ namespace OpenRA.Mods.Common.AI
void SetRallyPointsForNewProductionBuildings(Actor self) void SetRallyPointsForNewProductionBuildings(Actor self)
{ {
var buildings = self.World.ActorsWithTrait<RallyPoint>() foreach (var rp in self.World.ActorsWithTrait<RallyPoint>())
.Where(rp => rp.Actor.Owner == Player && if (rp.Actor.Owner == Player &&
!IsRallyPointValid(rp.Trait.Location, rp.Actor.Info.TraitInfoOrDefault<BuildingInfo>())).ToArray(); !IsRallyPointValid(rp.Trait.Location, rp.Actor.Info.TraitInfoOrDefault<BuildingInfo>()))
QueueOrder(new Order("SetRallyPoint", rp.Actor, false)
foreach (var a in buildings) {
QueueOrder(new Order("SetRallyPoint", a.Actor, false) { TargetLocation = ChooseRallyLocationNear(a.Actor), SuppressVisualFeedback = true }); TargetLocation = ChooseRallyLocationNear(rp.Actor),
SuppressVisualFeedback = true
});
} }
// Won't work for shipyards... // Won't work for shipyards...
@@ -878,10 +882,10 @@ namespace OpenRA.Mods.Common.AI
if (supportPowerMngr == null) if (supportPowerMngr == null)
return; return;
var powers = supportPowerMngr.Powers.Where(p => !p.Value.Disabled); foreach (var sp in supportPowerMngr.Powers.Values)
foreach (var kv in powers)
{ {
var sp = kv.Value; if (sp.Disabled)
continue;
// Add power to dictionary if not in delay dictionary yet // Add power to dictionary if not in delay dictionary yet
if (!waitingPowers.ContainsKey(sp)) if (!waitingPowers.ContainsKey(sp))