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

Fix that bots don't re-use capturers

Browse Source 
They were never removed from activeCapturers when their target becomes invalid,
preventing the bot from reusing them.
This commit is contained in:
reaperrr
2019-01-27 18:12:41 +01:00
committed by Paul Chote
parent 32a3caf423
commit 4da2d32bc5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/BotModules/CaptureManagerBotModule.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits
readonly World world; readonly World world;
readonly Player player; readonly Player player;
readonly Func<Actor, bool> isEnemyUnit; readonly Func<Actor, bool> isEnemyUnit;
readonly Predicate<Actor> unitCannotBeOrdered; readonly Predicate<Actor> unitCannotBeOrderedOrIsIdle;
readonly int maximumCaptureTargetOptions; readonly int maximumCaptureTargetOptions;
int minCaptureDelayTicks; int minCaptureDelayTicks;
@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
&& !unit.Info.HasTraitInfo<HuskInfo>() && !unit.Info.HasTraitInfo<HuskInfo>()
&& unit.Info.HasTraitInfo<ITargetableInfo>(); && unit.Info.HasTraitInfo<ITargetableInfo>();
unitCannotBeOrdered = a => a.Owner != player || a.IsDead || !a.IsInWorld; unitCannotBeOrderedOrIsIdle = a => a.Owner != player || a.IsDead || !a.IsInWorld || a.IsIdle;
maximumCaptureTargetOptions = Math.Max(1, Info.MaximumCaptureTargetOptions); maximumCaptureTargetOptions = Math.Max(1, Info.MaximumCaptureTargetOptions);
} }
@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits
if (!Info.CapturingActorTypes.Any() || player.WinState != WinState.Undefined) if (!Info.CapturingActorTypes.Any() || player.WinState != WinState.Undefined)
return; return;
activeCapturers.RemoveAll(unitCannotBeOrdered); activeCapturers.RemoveAll(unitCannotBeOrderedOrIsIdle);
var newUnits = world.ActorsHavingTrait<IPositionable>() var newUnits = world.ActorsHavingTrait<IPositionable>()
.Where(a => a.Owner == player && !activeCapturers.Contains(a)); .Where(a => a.Owner == player && !activeCapturers.Contains(a));