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

Avoid AI add other squad unit to Rush squad

Browse Source
This commit is contained in:
dnqbob
2025-08-29 09:41:48 +08:00
committed by Gustas Kažukauskas
parent 4c9ae3678b
commit 7d27df7053
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,24 +427,28 @@ namespace OpenRA.Mods.Common.Traits
void TryToRushAttack(IBot bot) void TryToRushAttack(IBot bot)
{ {
var ownUnits = activeUnits var groundTroopNum = unitsHangingAroundTheBase.Count;
.Where(unit =>
unit.IsIdle
&& unit.Info.HasTraitInfo<AttackBaseInfo>()
&& !Info.AirUnitsTypes.Contains(unit.Info.Name)
&& !Info.NavalUnitsTypes.Contains(unit.Info.Name)
&& !Info.ExcludeFromSquadsTypes.Contains(unit.Info.Name))
.ToList();
if (ownUnits.Count < Info.SquadSize) foreach (var s in Squads)
{
if (s.IsValid && s.Type != SquadType.Air && s.Type != SquadType.Naval)
groundTroopNum += s.Units.Count;
}
if (groundTroopNum < Info.SquadSize)
return;
var randomAttackableUnit = unitsHangingAroundTheBase.Where(a => a.Info.HasTraitInfo<AttackBaseInfo>()).RandomOrDefault(World.LocalRandom);
if (randomAttackableUnit == null)
return; return;
var allEnemyBaseBuilder = FindEnemies( var allEnemyBaseBuilder = FindEnemies(
constructionYardBuildings.Actors, constructionYardBuildings.Actors,
ownUnits[0]) randomAttackableUnit)
.ToList(); .ToList();
if (allEnemyBaseBuilder.Count == 0 || ownUnits.Count < Info.SquadSize) if (allEnemyBaseBuilder.Count == 0)
return; return;
foreach (var enemyBaseBuilder in allEnemyBaseBuilder) foreach (var enemyBaseBuilder in allEnemyBaseBuilder)
@@ -456,16 +460,25 @@ namespace OpenRA.Mods.Common.Traits
unit.Info.HasTraitInfo<AttackBaseInfo>() unit.Info.HasTraitInfo<AttackBaseInfo>()
&& !Info.AirUnitsTypes.Contains(unit.Info.Name) && !Info.AirUnitsTypes.Contains(unit.Info.Name)
&& !Info.NavalUnitsTypes.Contains(unit.Info.Name)), && !Info.NavalUnitsTypes.Contains(unit.Info.Name)),
ownUnits[0]) randomAttackableUnit)
.ToList(); .ToList();
if (AttackOrFleeFuzzy.Rush.CanAttack(ownUnits, enemies.ConvertAll(x => x.Actor))) if (AttackOrFleeFuzzy.Rush.CanAttack(unitsHangingAroundTheBase, enemies.ConvertAll(x => x.Actor)))
{ {
var target = enemies.Count > 0 ? enemies.Random(World.LocalRandom) : enemyBaseBuilder; var target = enemies.Count > 0 ? enemies.Random(World.LocalRandom) : enemyBaseBuilder;
foreach (var s in Squads)
{
if (s.IsValid)
s.SetActorToTarget(target);
}
var rush = GetSquadOfType(SquadType.Rush); var rush = GetSquadOfType(SquadType.Rush);
rush ??= RegisterNewSquad(bot, SquadType.Rush, target); rush ??= RegisterNewSquad(bot, SquadType.Rush, target);
rush.Units.UnionWith(ownUnits); rush.Units.UnionWith(unitsHangingAroundTheBase);
unitsHangingAroundTheBase.Clear();
foreach (var n in notifyIdleBaseUnits)
n.UpdatedIdleBaseUnits(unitsHangingAroundTheBase);
return; return;
} }