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

Merge pull request #9442 from Mailaender/ai-world-check

Browse Source 
Fixed AI bots trying to assign orders to units not in the world
This commit is contained in:
Paul Chote
2015-10-10 20:21:10 +01:00
parent f1b1df1428 4579e8af06
commit 8954ac585c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,7 +188,7 @@ namespace OpenRA.Mods.Common.AI
readonly IPathFinder pathfinder;
readonly Func<Actor, bool> isEnemyUnit;
readonly Predicate<Actor> unitIsDeadOrHasNewOwner;
readonly Predicate<Actor> unitCannotBeOrdered;
Dictionary<SupportPowerInstance, int> waitingPowers = new Dictionary<SupportPowerInstance, int>();
Dictionary<string, SupportPowerDecision> powerDecisions = new Dictionary<string, SupportPowerDecision>();
@@ -242,7 +242,8 @@ namespace OpenRA.Mods.Common.AI
Player.Stances[unit.Owner] == Stance.Enemy
&& !unit.Info.HasTraitInfo<HuskInfo>()
&& unit.Info.HasTraitInfo<ITargetableInfo>();
unitIsDeadOrHasNewOwner = a => a.Owner != Player || a.IsDead;
unitCannotBeOrdered = a => a.Owner != Player || a.IsDead || !a.IsInWorld;
foreach (var decision in info.PowerDecisions)
powerDecisions.Add(decision.OrderName, decision);
@@ -612,7 +613,7 @@ namespace OpenRA.Mods.Common.AI
{
squads.RemoveAll(s => !s.IsValid);
foreach (var s in squads)
s.Units.RemoveAll(unitIsDeadOrHasNewOwner);
s.Units.RemoveAll(unitCannotBeOrdered);
}
// Use of this function requires that one squad of this type. Hence it is a piece of shit
@@ -631,8 +632,9 @@ namespace OpenRA.Mods.Common.AI
void AssignRolesToIdleUnits(Actor self)
{
CleanSquads();
activeUnits.RemoveAll(unitIsDeadOrHasNewOwner);
unitsHangingAroundTheBase.RemoveAll(unitIsDeadOrHasNewOwner);
activeUnits.RemoveAll(unitCannotBeOrdered);
unitsHangingAroundTheBase.RemoveAll(unitCannotBeOrdered);
if (--rushTicks <= 0)
{