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

Make AI randomly scan map for targets for its air squads.

Browse Source
This commit is contained in:
darkademic
2020-05-18 17:53:42 +01:00
committed by Oliver Brakmann
parent 5e92915095
commit ae882b85a9
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,14 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Enemy target types to never target.")] [Desc("Enemy target types to never target.")]
public readonly BitSet<TargetableType> IgnoredEnemyTargetTypes = default(BitSet<TargetableType>); public readonly BitSet<TargetableType> IgnoredEnemyTargetTypes = default(BitSet<TargetableType>);
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
base.RulesetLoaded(rules, ai);
if (DangerScanRadius <= 0)
throw new YamlException("DangerScanRadius must be greater than zero.");
}
public override object Create(ActorInitializer init) { return new SquadManagerBotModule(init.Self, this); } public override object Create(ActorInitializer init) { return new SquadManagerBotModule(init.Self, this); }
} }

20
OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs
View File

@@ -65,21 +65,19 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
var map = owner.World.Map; var map = owner.World.Map;
var dangerRadius = owner.SquadManager.Info.DangerScanRadius; var dangerRadius = owner.SquadManager.Info.DangerScanRadius;
detectedEnemyTarget = null; detectedEnemyTarget = null;
var x = (map.MapSize.X % dangerRadius) == 0 ? map.MapSize.X : map.MapSize.X + dangerRadius;
var y = (map.MapSize.Y % dangerRadius) == 0 ? map.MapSize.Y : map.MapSize.Y + dangerRadius;
for (var i = 0; i < x; i += dangerRadius * 2) var columnCount = (map.MapSize.X + dangerRadius - 1) / dangerRadius;
var rowCount = (map.MapSize.Y + dangerRadius - 1) / dangerRadius;
var checkIndices = Exts.MakeArray(columnCount * rowCount, i => i).Shuffle(owner.World.LocalRandom);
foreach (var i in checkIndices)
{ {
for (var j = 0; j < y; j += dangerRadius * 2) var pos = new CPos((i % columnCount) * dangerRadius + dangerRadius / 2, (i / columnCount) * dangerRadius + dangerRadius / 2);
if (NearToPosSafely(owner, map.CenterOfCell(pos), out detectedEnemyTarget))
{ {
var pos = new CPos(i, j); if (needTarget && detectedEnemyTarget == null)
if (NearToPosSafely(owner, map.CenterOfCell(pos), out detectedEnemyTarget)) continue;
{
if (needTarget && detectedEnemyTarget == null)
continue;
return pos; return pos;
}
} }
} }