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

Merge pull request #11512 from Nelax/ai-squadexclude

Browse Source 
Added Squad Exclusion to HackyAI
This commit is contained in:
reaperrr
2016-06-30 15:21:22 +02:00
committed by GitHub
parent f5c89ae56d dace814829
commit 8493b1deda
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ namespace OpenRA.Mods.Common.AI
public class UnitCategories
{
public readonly HashSet<string> Mcv = new HashSet<string>();
public readonly HashSet<string> ExcludeFromSquads = new HashSet<string>();
}
public class BuildingCategories
@@ -153,7 +154,7 @@ namespace OpenRA.Mods.Common.AI
[Desc("What buildings to the AI should build.", "What % of the total base must be this type of building.")]
public readonly Dictionary<string, float> BuildingFractions = null;
[Desc("Tells the AI what unit types fall under the same common name. Only supported entry is Mcv.")]
[Desc("Tells the AI what unit types fall under the same common name. Supported entries are Mcv and ExcludeFromSquads.")]
[FieldLoader.LoadUsing("LoadUnitCategories", true)]
public readonly UnitCategories UnitsCommonNames;
@@ -681,7 +682,8 @@ namespace OpenRA.Mods.Common.AI
void FindNewUnits(Actor self)
{
var newUnits = self.World.ActorsHavingTrait<IPositionable>()
.Where(a => a.Owner == Player && !Info.UnitsCommonNames.Mcv.Contains(a.Info.Name) && !activeUnits.Contains(a));
.Where(a => a.Owner == Player && !Info.UnitsCommonNames.Mcv.Contains(a.Info.Name) &&
!Info.UnitsCommonNames.ExcludeFromSquads.Contains(a.Info.Name) && !activeUnits.Contains(a));
foreach (var a in newUnits)
{