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

Some HackyAI cleanups

Browse Source 
- harvManager.Tick should run after FindNewUnits() in case new harvesters have appeared
- moved the FindNewUnits Mcv and ExcludeFromSquads checks to the foreach loop, for better readability and preparation of the idle harvester fix
This commit is contained in:
reaperrr
2018-07-31 23:16:03 +02:00
committed by reaperrr
parent a51b916eaa
commit 35600d9291
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,8 +614,8 @@ namespace OpenRA.Mods.Common.AI
if (--assignRolesTicks <= 0) if (--assignRolesTicks <= 0)
{ {
assignRolesTicks = Info.AssignRolesInterval; assignRolesTicks = Info.AssignRolesInterval;
harvManager.Tick(activeUnits);
FindNewUnits(self); FindNewUnits(self);
harvManager.Tick(activeUnits);
InitializeBase(self, true); InitializeBase(self, true);
} }
@@ -738,11 +738,13 @@ namespace OpenRA.Mods.Common.AI
void FindNewUnits(Actor self) void FindNewUnits(Actor self)
{ {
var newUnits = self.World.ActorsHavingTrait<IPositionable>() var newUnits = self.World.ActorsHavingTrait<IPositionable>()
.Where(a => a.Owner == Player && !Info.UnitsCommonNames.Mcv.Contains(a.Info.Name) && .Where(a => a.Owner == Player && !activeUnits.Contains(a));
!Info.UnitsCommonNames.ExcludeFromSquads.Contains(a.Info.Name) && !activeUnits.Contains(a));
foreach (var a in newUnits) foreach (var a in newUnits)
{ {
if (Info.UnitsCommonNames.Mcv.Contains(a.Info.Name) || Info.UnitsCommonNames.ExcludeFromSquads.Contains(a.Info.Name))
continue;
unitsHangingAroundTheBase.Add(a); unitsHangingAroundTheBase.Add(a);
if (a.Info.HasTraitInfo<AircraftInfo>() && a.Info.HasTraitInfo<AttackBaseInfo>()) if (a.Info.HasTraitInfo<AircraftInfo>() && a.Info.HasTraitInfo<AttackBaseInfo>())