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

add SquadManagerBotModuleInfo.IgnoredEnemyTargetTypes

Browse Source
This commit is contained in:
atlimit8
2020-03-23 01:50:11 -05:00
committed by Paul Chote
parent d4b92a19d7
commit 2dac16ee02
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Traits.BotModules.Squads; using OpenRA.Mods.Common.Traits.BotModules.Squads;
using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
@@ -74,6 +75,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Radius in cells that protecting squads should scan for enemies around their position.")] [Desc("Radius in cells that protecting squads should scan for enemies around their position.")]
public readonly int ProtectionScanRadius = 8; public readonly int ProtectionScanRadius = 8;
[Desc("Enemy target types to never target.")]
public readonly BitSet<TargetableType> IgnoredEnemyTargetTypes = default(BitSet<TargetableType>);
public override object Create(ActorInitializer init) { return new SquadManagerBotModule(init.Self, this); } public override object Create(ActorInitializer init) { return new SquadManagerBotModule(init.Self, this); }
} }
@@ -119,11 +123,14 @@ namespace OpenRA.Mods.Common.Traits
unitCannotBeOrdered = a => a == null || a.Owner != Player || a.IsDead || !a.IsInWorld; unitCannotBeOrdered = a => a == null || a.Owner != Player || a.IsDead || !a.IsInWorld;
} }
public bool IsEnemyUnit(Actor a) // Use for proactive targeting.
public bool IsPreferredEnemyUnit(Actor a)
{ {
return a != null && !a.IsDead && Player.Stances[a.Owner] == Stance.Enemy if (a == null || a.IsDead || Player.Stances[a.Owner] != Stance.Enemy || a.Info.HasTraitInfo<HuskInfo>())
&& !a.Info.HasTraitInfo<HuskInfo>() return false;
&& !a.GetEnabledTargetTypes().IsEmpty;
var targetTypes = a.GetEnabledTargetTypes();
return !targetTypes.IsEmpty && !targetTypes.Overlaps(Info.IgnoredEnemyTargetTypes);
} }
public bool IsNotHiddenUnit(Actor a) public bool IsNotHiddenUnit(Actor a)
@@ -175,13 +182,13 @@ namespace OpenRA.Mods.Common.Traits
internal Actor FindClosestEnemy(WPos pos) internal Actor FindClosestEnemy(WPos pos)
{ {
var units = World.Actors.Where(IsEnemyUnit); var units = World.Actors.Where(IsPreferredEnemyUnit);
return units.Where(IsNotHiddenUnit).ClosestTo(pos) ?? units.ClosestTo(pos); return units.Where(IsNotHiddenUnit).ClosestTo(pos) ?? units.ClosestTo(pos);
} }
internal Actor FindClosestEnemy(WPos pos, WDist radius) internal Actor FindClosestEnemy(WPos pos, WDist radius)
{ {
return World.FindActorsInCircle(pos, radius).Where(a => IsEnemyUnit(a) && IsNotHiddenUnit(a)).ClosestTo(pos); return World.FindActorsInCircle(pos, radius).Where(a => IsPreferredEnemyUnit(a) && IsNotHiddenUnit(a)).ClosestTo(pos);
} }
void CleanSquads() void CleanSquads()
@@ -311,7 +318,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
// Don't rush enemy aircraft! // Don't rush enemy aircraft!
var enemies = World.FindActorsInCircle(b.CenterPosition, WDist.FromCells(Info.RushAttackScanRadius)) var enemies = World.FindActorsInCircle(b.CenterPosition, WDist.FromCells(Info.RushAttackScanRadius))
.Where(unit => IsEnemyUnit(unit) && unit.Info.HasTraitInfo<AttackBaseInfo>() && !unit.Info.HasTraitInfo<AircraftInfo>() && !Info.NavalUnitsTypes.Contains(unit.Info.Name)).ToList(); .Where(unit => IsPreferredEnemyUnit(unit) && unit.Info.HasTraitInfo<AttackBaseInfo>() && !unit.Info.HasTraitInfo<AircraftInfo>() && !Info.NavalUnitsTypes.Contains(unit.Info.Name)).ToList();
if (AttackOrFleeFuzzy.Rush.CanAttack(ownUnits, enemies)) if (AttackOrFleeFuzzy.Rush.CanAttack(ownUnits, enemies))
{ {
@@ -357,7 +364,7 @@ namespace OpenRA.Mods.Common.Traits
void IBotRespondToAttack.RespondToAttack(IBot bot, Actor self, AttackInfo e) void IBotRespondToAttack.RespondToAttack(IBot bot, Actor self, AttackInfo e)
{ {
if (!IsEnemyUnit(e.Attacker)) if (!IsPreferredEnemyUnit(e.Attacker))
return; return;
// Protected priority assets, MCVs, harvesters and buildings // Protected priority assets, MCVs, harvesters and buildings

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

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
detectedEnemyTarget = null; detectedEnemyTarget = null;
var dangerRadius = owner.SquadManager.Info.DangerScanRadius; var dangerRadius = owner.SquadManager.Info.DangerScanRadius;
var unitsAroundPos = owner.World.FindActorsInCircle(loc, WDist.FromCells(dangerRadius)) var unitsAroundPos = owner.World.FindActorsInCircle(loc, WDist.FromCells(dangerRadius))
.Where(owner.SquadManager.IsEnemyUnit).ToList(); .Where(owner.SquadManager.IsPreferredEnemyUnit).ToList();
if (!unitsAroundPos.Any()) if (!unitsAroundPos.Any())
return true; return true;

4
OpenRA.Mods.Common/Traits/BotModules/Squads/States/GroundStates.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
} }
var enemyUnits = owner.World.FindActorsInCircle(owner.TargetActor.CenterPosition, WDist.FromCells(owner.SquadManager.Info.IdleScanRadius)) var enemyUnits = owner.World.FindActorsInCircle(owner.TargetActor.CenterPosition, WDist.FromCells(owner.SquadManager.Info.IdleScanRadius))
.Where(owner.SquadManager.IsEnemyUnit).ToList(); .Where(owner.SquadManager.IsPreferredEnemyUnit).ToList();
if (enemyUnits.Count == 0) if (enemyUnits.Count == 0)
return; return;
@@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
else else
{ {
var enemies = owner.World.FindActorsInCircle(leader.CenterPosition, WDist.FromCells(owner.SquadManager.Info.AttackScanRadius)) var enemies = owner.World.FindActorsInCircle(leader.CenterPosition, WDist.FromCells(owner.SquadManager.Info.AttackScanRadius))
.Where(owner.SquadManager.IsEnemyUnit); .Where(owner.SquadManager.IsPreferredEnemyUnit);
var target = enemies.ClosestTo(leader.CenterPosition); var target = enemies.ClosestTo(leader.CenterPosition);
if (target != null) if (target != null)
{ {

4
OpenRA.Mods.Common/Traits/BotModules/Squads/States/NavyStates.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
} }
var enemyUnits = owner.World.FindActorsInCircle(owner.TargetActor.CenterPosition, WDist.FromCells(owner.SquadManager.Info.IdleScanRadius)) var enemyUnits = owner.World.FindActorsInCircle(owner.TargetActor.CenterPosition, WDist.FromCells(owner.SquadManager.Info.IdleScanRadius))
.Where(owner.SquadManager.IsEnemyUnit).ToList(); .Where(owner.SquadManager.IsPreferredEnemyUnit).ToList();
if (enemyUnits.Count == 0) if (enemyUnits.Count == 0)
return; return;
@@ -130,7 +130,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
else else
{ {
var enemies = owner.World.FindActorsInCircle(leader.CenterPosition, WDist.FromCells(owner.SquadManager.Info.AttackScanRadius)) var enemies = owner.World.FindActorsInCircle(leader.CenterPosition, WDist.FromCells(owner.SquadManager.Info.AttackScanRadius))
.Where(owner.SquadManager.IsEnemyUnit); .Where(owner.SquadManager.IsPreferredEnemyUnit);
var target = enemies.ClosestTo(leader.CenterPosition); var target = enemies.ClosestTo(leader.CenterPosition);
if (target != null) if (target != null)
{ {

2
OpenRA.Mods.Common/Traits/BotModules/Squads/States/StateBase.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
if (u.Owner == squad.Bot.Player && u.Info.HasTraitInfo<BuildingInfo>()) if (u.Owner == squad.Bot.Player && u.Info.HasTraitInfo<BuildingInfo>())
return false; return false;
var enemyAroundUnit = units.Where(unit => squad.SquadManager.IsEnemyUnit(unit) && unit.Info.HasTraitInfo<AttackBaseInfo>()); var enemyAroundUnit = units.Where(unit => squad.SquadManager.IsPreferredEnemyUnit(unit) && unit.Info.HasTraitInfo<AttackBaseInfo>());
if (!enemyAroundUnit.Any()) if (!enemyAroundUnit.Any())
return false; return false;

3
mods/d2k/rules/ai.yaml
View File

@@ -221,6 +221,7 @@ Player:
MaxBaseRadius: 40 MaxBaseRadius: 40
ExcludeFromSquadsTypes: harvester, mcv ExcludeFromSquadsTypes: harvester, mcv
ConstructionYardTypes: construction_yard ConstructionYardTypes: construction_yard
IgnoredEnemyTargetTypes: Creep
UnitBuilderBotModule@omnius: UnitBuilderBotModule@omnius:
RequiresCondition: enable-omnius-ai RequiresCondition: enable-omnius-ai
UnitQueues: Infantry, Vehicle, Armor, Starport, Aircraft UnitQueues: Infantry, Vehicle, Armor, Starport, Aircraft
@@ -264,6 +265,7 @@ Player:
MaxBaseRadius: 40 MaxBaseRadius: 40
ExcludeFromSquadsTypes: harvester, mcv ExcludeFromSquadsTypes: harvester, mcv
ConstructionYardTypes: construction_yard ConstructionYardTypes: construction_yard
IgnoredEnemyTargetTypes: Creep
UnitBuilderBotModule@vidious: UnitBuilderBotModule@vidious:
RequiresCondition: enable-vidious-ai RequiresCondition: enable-vidious-ai
UnitQueues: Infantry, Vehicle, Armor, Starport, Aircraft UnitQueues: Infantry, Vehicle, Armor, Starport, Aircraft
@@ -302,6 +304,7 @@ Player:
MaxBaseRadius: 40 MaxBaseRadius: 40
ExcludeFromSquadsTypes: harvester, mcv ExcludeFromSquadsTypes: harvester, mcv
ConstructionYardTypes: construction_yard ConstructionYardTypes: construction_yard
IgnoredEnemyTargetTypes: Creep
UnitBuilderBotModule@gladius: UnitBuilderBotModule@gladius:
RequiresCondition: enable-gladius-ai RequiresCondition: enable-gladius-ai
UnitQueues: Infantry, Vehicle, Armor, Starport, Aircraft UnitQueues: Infantry, Vehicle, Armor, Starport, Aircraft