Skip to content

restore AI switching to AOE weapons #4146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: Development
Choose a base branch
from
Open

restore AI switching to AOE weapons #4146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad8ef51
restore AI switching to AOE weapons
Keshash Aug 8, 2025
b39f4be
whitespace
Keshash Aug 8, 2025
8721ec6
Remove performance heavy method calls
Keshash Aug 9, 2025
f9832f5
Cut down even more checks from aoe usage
Keshash Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions Source/CombatExtended/CombatExtended/AI/Comps/CompOpportunisticSwitch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,10 @@ public override bool StartCastChecks(Verb verb, LocalTargetInfo castTarg, LocalT
{
return false;
}
//TODO 1.5
//if (TryUseAOE(verb, castTarg, destTarg))
//{
//return false;
//}
if (TryUseAOE(verb, castTarg, destTarg))
{
return false;
}
return true;
}

Expand All @@ -152,30 +151,26 @@ public bool TryUseAOE(Verb verb, LocalTargetInfo castTarg, LocalTargetInfo destT
(TargetingPawns(castTarg.Thing, distance, out targetType) || TargetingTurrets(castTarg.Thing, distance, out targetType) || Rand.Chance(0.1f)))
{
// TODO add the ability to switch to EMP ammo or weapons
if (targetType == TargetType.Turret)
{
}
// if (targetType == TargetType.Turret)
// {
// }
if (CompInventory.TryFindRandomAOEWeapon(out ThingWithComps weapon, checkAmmo: true, predicate: (g) => g.def.Verbs?.Any(t => t.range >= distance + 3) ?? false))
{
lastOpportunisticSwitch = GenTicks.TicksGame;

var nextVerb = weapon.def.verbs.First(v => !v.IsMeleeAttack);
var targtPos = AI_Utility.FindAttackedClusterCenter(SelPawn, castTarg.Cell, weapon.def.verbs.Max(v => v.range), 4, (pos) =>
{
return GenSight.LineOfSight(SelPawn.Position, pos, Map, skipFirstCell: true);
});
var job = JobMaker.MakeJob(CE_JobDefOf.OpportunisticAttack, weapon, targtPos.IsValid ? targtPos : castTarg.Cell);
job.maxNumStaticAttacks = 1;
LocalTargetInfo targetInfo = castTarg.Thing;

SelPawn.jobs.StartJob(job, JobCondition.InterruptForced);
var job = JobMaker.MakeJob(CE_JobDefOf.OpportunisticAttack, weapon, targetInfo);
job.maxNumStaticAttacks = 1;
SelPawn.jobs.StartJob(job, JobCondition.InterruptForced, cancelBusyStances: false);
return true;
}
}
}
bool TargetingPawns(Thing thing, float distance, out TargetType targetType)
{
targetType = TargetType.None;
if (thing is Pawn pawn && (distance > 8 || SelPawn.HiddingBehindCover(pawn.positionInt)) && TargetIsSquad(pawn))
if (thing is Pawn pawn && distance > 8)
{
targetType = TargetType.Pawn;
return true;
Expand All @@ -185,7 +180,7 @@ bool TargetingPawns(Thing thing, float distance, out TargetType targetType)
bool TargetingTurrets(Thing thing, float distance, out TargetType targetType)
{
targetType = TargetType.None;
if (thing is Building_Turret && (distance > 8 || SelPawn.HiddingBehindCover(thing.positionInt)))
if (thing is Building_Turret && distance > 8)
{
targetType = TargetType.Turret;
return true;
Expand Down Expand Up @@ -261,6 +256,10 @@ private bool TargetIsSquad(Pawn pawn)
int hostiles = 0;
foreach (Pawn other in pawn.Position.PawnsInRange(pawn.Map, 4))
{
if (other == null)
{
continue;
}
if (other.Faction == null)
{
continue;
Expand Down
2 changes: 1 addition & 1 deletion Source/CombatExtended/CombatExtended/AI/Toils/Toils_CombatCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static IEnumerable<Toil> AttackStatic(IJobDriver_Tactical driver, TargetI
if (target.HasThing)
{
Pawn pawn = target.Thing as Pawn;
if (target.Thing.Destroyed || (pawn != null && !startedIncapacitated && pawn.Downed) || (pawn != null && !(pawn.GetInvisibilityComp()?.ForcedVisible ?? false)))
if (target.Thing.Destroyed || (pawn != null && !startedIncapacitated && pawn.Downed) || (pawn != null && !(pawn.GetInvisibilityComp()?.ForcedVisible ?? true)))
{
driver.EndJobWith(JobCondition.Succeeded);
return;
Expand Down