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

Convert AIHarvesterManager into *Module

Browse Source
This commit is contained in:
reaperrr
2018-11-03 04:31:19 +01:00
committed by abcdefg30
parent 04c69efc30
commit 927b6cd561
15 changed files with 284 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,6 @@ namespace OpenRA.Mods.Common.AI
BitArray resourceTypeIndices;
AIHarvesterManager harvManager;
AISupportPowerManager supportPowerManager;
List<BaseBuilder> builders = new List<BaseBuilder>();
@@ -291,10 +290,6 @@ namespace OpenRA.Mods.Common.AI
// Units that the ai already knows about. Any unit not on this list needs to be given a role.
List<Actor> activeUnits = new List<Actor>();
// Harvesters are usually listed under ExcludeFromSquads, so they're not included in the activeUnits list, but still needed in AIHarvesterManager.
// TODO: Consider adding an explicit UnitsCommonNames.Harvester category.
List<Actor> harvesters = new List<Actor>();
public const int FeedbackTime = 30; // ticks; = a bit over 1s. must be >= netlag.
public readonly World World;
@@ -335,7 +330,6 @@ namespace OpenRA.Mods.Common.AI
playerResource = p.PlayerActor.Trait<PlayerResources>();
botOrderManager = p.PlayerActor.Trait<BotOrderManager>();
harvManager = new AIHarvesterManager(this, p);
supportPowerManager = new AISupportPowerManager(this, p);
foreach (var building in Info.BuildingQueues)
@@ -600,7 +594,6 @@ namespace OpenRA.Mods.Common.AI
activeUnits.RemoveAll(unitCannotBeOrdered);
unitsHangingAroundTheBase.RemoveAll(unitCannotBeOrdered);
harvesters.RemoveAll(unitCannotBeOrdered);
if (--rushTicks <= 0)
{
@@ -619,7 +612,6 @@ namespace OpenRA.Mods.Common.AI
{
assignRolesTicks = Info.AssignRolesInterval;
FindNewUnits(self);
harvManager.Tick(harvesters);
InitializeBase(self, true);
}
@@ -723,13 +715,10 @@ namespace OpenRA.Mods.Common.AI
void FindNewUnits(Actor self)
{
var newUnits = self.World.ActorsHavingTrait<IPositionable>()
.Where(a => a.Owner == Player && !activeUnits.Contains(a) && !harvesters.Contains(a));
.Where(a => a.Owner == Player && !activeUnits.Contains(a));
foreach (var a in newUnits)
{
if (a.Info.HasTraitInfo<HarvesterInfo>())
harvesters.Add(a);
if (Info.UnitsCommonNames.Mcv.Contains(a.Info.Name) || Info.UnitsCommonNames.ExcludeFromSquads.Contains(a.Info.Name))
continue;