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

Fix for SquadManagerBotModule

Browse Source 
Aircraft and ships are immediately assigned a squad,
so adding them to `unitsHangingAroundTheBase` is bogus.
This commit is contained in:
reaperrr
2020-10-03 15:48:39 +02:00
committed by Paul Chote
parent 6337067032
commit 8d1f72c104
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
View File

@@ -257,8 +257,6 @@ namespace OpenRA.Mods.Common.Traits
foreach (var a in newUnits) foreach (var a in newUnits)
{ {
unitsHangingAroundTheBase.Add(a);
if (a.Info.HasTraitInfo<AircraftInfo>() && a.Info.HasTraitInfo<AttackBaseInfo>()) if (a.Info.HasTraitInfo<AircraftInfo>() && a.Info.HasTraitInfo<AttackBaseInfo>())
{ {
var air = GetSquadOfType(SquadType.Air); var air = GetSquadOfType(SquadType.Air);
@@ -275,6 +273,8 @@ namespace OpenRA.Mods.Common.Traits
ships.Units.Add(a); ships.Units.Add(a);
} }
else
unitsHangingAroundTheBase.Add(a);
activeUnits.Add(a); activeUnits.Add(a);
} }
@@ -295,8 +295,7 @@ namespace OpenRA.Mods.Common.Traits
var attackForce = RegisterNewSquad(bot, SquadType.Assault); var attackForce = RegisterNewSquad(bot, SquadType.Assault);
foreach (var a in unitsHangingAroundTheBase) foreach (var a in unitsHangingAroundTheBase)
if (!a.Info.HasTraitInfo<AircraftInfo>() && !Info.NavalUnitsTypes.Contains(a.Info.Name)) attackForce.Units.Add(a);
attackForce.Units.Add(a);
unitsHangingAroundTheBase.Clear(); unitsHangingAroundTheBase.Clear();
foreach (var n in notifyIdleBaseUnits) foreach (var n in notifyIdleBaseUnits)