From 4f651c2f88d82e87eec19c05d9781034f00cebf7 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 24 Mar 2018 03:59:25 +0100 Subject: [PATCH] Remove HarvesterInfo look-up from HackyAI --- OpenRA.Mods.Common/AI/HackyAI.cs | 3 +-- mods/cnc/rules/ai.yaml | 3 +++ mods/d2k/rules/ai.yaml | 3 +++ mods/ra/rules/ai.yaml | 4 ++++ mods/ts/rules/ai.yaml | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/AI/HackyAI.cs b/OpenRA.Mods.Common/AI/HackyAI.cs index 075852f13b..7b73031655 100644 --- a/OpenRA.Mods.Common/AI/HackyAI.cs +++ b/OpenRA.Mods.Common/AI/HackyAI.cs @@ -749,8 +749,7 @@ namespace OpenRA.Mods.Common.AI foreach (var a in newUnits) { - if (!a.Info.HasTraitInfo()) - unitsHangingAroundTheBase.Add(a); + unitsHangingAroundTheBase.Add(a); if (a.Info.HasTraitInfo() && a.Info.HasTraitInfo()) { diff --git a/mods/cnc/rules/ai.yaml b/mods/cnc/rules/ai.yaml index d08e795775..18e14dc424 100644 --- a/mods/cnc/rules/ai.yaml +++ b/mods/cnc/rules/ai.yaml @@ -16,6 +16,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingQueues: Building.Nod, Building.GDI DefenseQueues: Defence.Nod, Defence.GDI UnitQueues: Vehicle.Nod, Vehicle.GDI, Infantry.Nod, Infantry.GDI, Aircraft.Nod, Aircraft.GDI @@ -145,6 +146,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingQueues: Building.Nod, Building.GDI DefenseQueues: Defence.Nod, Defence.GDI UnitQueues: Vehicle.Nod, Vehicle.GDI, Infantry.Nod, Infantry.GDI, Aircraft.Nod, Aircraft.GDI @@ -274,6 +276,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingQueues: Building.Nod, Building.GDI DefenseQueues: Defence.Nod, Defence.GDI UnitQueues: Vehicle.Nod, Vehicle.GDI, Infantry.Nod, Infantry.GDI, Aircraft.Nod, Aircraft.GDI diff --git a/mods/d2k/rules/ai.yaml b/mods/d2k/rules/ai.yaml index 73321cffd3..0e86e686b3 100644 --- a/mods/d2k/rules/ai.yaml +++ b/mods/d2k/rules/ai.yaml @@ -17,6 +17,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingLimits: barracks: 1 refinery: 4 @@ -138,6 +139,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingLimits: barracks: 1 refinery: 4 @@ -261,6 +263,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingLimits: barracks: 1 refinery: 4 diff --git a/mods/ra/rules/ai.yaml b/mods/ra/rules/ai.yaml index 52f58786fa..534ba2ff31 100644 --- a/mods/ra/rules/ai.yaml +++ b/mods/ra/rules/ai.yaml @@ -16,6 +16,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv NavalUnits: ss,msub,dd,ca,lst,pt BuildingLimits: proc: 4 @@ -133,6 +134,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv NavalUnits: ss,msub,dd,ca,lst,pt BuildingLimits: proc: 4 @@ -267,6 +269,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv NavalUnits: ss,msub,dd,ca,lst,pt BuildingLimits: proc: 4 @@ -401,6 +404,7 @@ Player: Silo: silo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv NavalUnits: ss,msub,dd,ca,lst,pt BuildingLimits: proc: 4 diff --git a/mods/ts/rules/ai.yaml b/mods/ts/rules/ai.yaml index e5d824b208..ef6f9f24c2 100644 --- a/mods/ts/rules/ai.yaml +++ b/mods/ts/rules/ai.yaml @@ -16,6 +16,7 @@ Player: Silo: gasilo UnitsCommonNames: Mcv: mcv + ExcludeFromSquads: harv BuildingLimits: proc: 4 gasilo: 2