Skip to content

Commit

Permalink
Drop targets when switching to a more restrictive stance.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pchote
pchote committed May 19, 2019
1 parent 8a947cc commit f3b85a1
Show file tree
Hide file tree
Showing 10 changed files with 233 additions and 18 deletions.
31 changes: 29 additions & 2 deletions OpenRA.Mods.Cnc/Activities/LeapAttack.cs
View file
Expand Up @@ -20,25 +20,29 @@

namespace OpenRA.Mods.Cnc.Activities
{
public class LeapAttack : Activity
public class LeapAttack : Activity, IActivityNotifyStanceChanged
{
readonly AttackLeapInfo info;
readonly AttackLeap attack;
readonly Mobile mobile;
readonly bool allowMovement;
readonly bool forceAttack;

Target target;
Target lastVisibleTarget;
bool useLastVisibleTarget;
WDist lastVisibleMinRange;
WDist lastVisibleMaxRange;
BitSet<TargetableType> lastVisibleTargetTypes;
Player lastVisibleOwner;

public LeapAttack(Actor self, Target target, bool allowMovement, AttackLeap attack, AttackLeapInfo info)
public LeapAttack(Actor self, Target target, bool allowMovement, bool forceAttack, AttackLeap attack, AttackLeapInfo info)
{
this.target = target;
this.info = info;
this.attack = attack;
this.allowMovement = allowMovement;
this.forceAttack = forceAttack;
mobile = self.Trait<Mobile>();

// The target may become hidden between the initial order request and the first tick (e.g. if queued)
Expand All @@ -49,6 +53,17 @@ public LeapAttack(Actor self, Target target, bool allowMovement, AttackLeap atta
lastVisibleTarget = Target.FromPos(target.CenterPosition);
lastVisibleMinRange = attack.GetMinimumRangeVersusTarget(target);
lastVisibleMaxRange = attack.GetMaximumRangeVersusTarget(target);

if (target.Type == TargetType.Actor)
{
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}
else if (target.Type == TargetType.FrozenActor)
{
lastVisibleOwner = target.FrozenActor.Owner;
lastVisibleTargetTypes = target.FrozenActor.TargetTypes;
}
}
}

Expand Down Expand Up @@ -76,6 +91,8 @@ public override Activity Tick(Actor self)
lastVisibleTarget = Target.FromTargetPositions(target);
lastVisibleMinRange = attack.GetMinimumRangeVersusTarget(target);
lastVisibleMaxRange = attack.GetMaximumRangeVersusTarget(target);
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}

var oldUseLastVisibleTarget = useLastVisibleTarget;
Expand Down Expand Up @@ -141,5 +158,15 @@ protected override void OnLastRun(Actor self)
{
attack.IsAiming = false;
}

void IActivityNotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)
{
// Cancel non-forced targets when switching to a more restrictive stance if they are no longer valid for auto-targeting
if (newStance > oldStance || forceAttack)
return;

if (!autoTarget.HasValidTargetPriority(self, lastVisibleOwner, lastVisibleTargetTypes))
target = Target.Invalid;
}
}
}
2 changes: 1 addition & 1 deletion OpenRA.Mods.Cnc/Traits/Attack/AttackLeap.cs
View file
Expand Up @@ -73,7 +73,7 @@ public void RevokeLeapCondition(Actor self)

public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
{
return new LeapAttack(self, newTarget, allowMove, this, info);
return new LeapAttack(self, newTarget, allowMove, forceAttack, this, info);
}
}
}
28 changes: 25 additions & 3 deletions OpenRA.Mods.Cnc/Traits/Attack/AttackTesla.cs
View file
Expand Up @@ -75,18 +75,20 @@ void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barre

public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
{
return new ChargeAttack(this, newTarget);
return new ChargeAttack(this, newTarget, forceAttack);
}

class ChargeAttack : Activity
class ChargeAttack : Activity, IActivityNotifyStanceChanged
{
readonly AttackTesla attack;
readonly Target target;
readonly bool forceAttack;

public ChargeAttack(AttackTesla attack, Target target)
public ChargeAttack(AttackTesla attack, Target target, bool forceAttack)
{
this.attack = attack;
this.target = target;
this.forceAttack = forceAttack;
}

public override Activity Tick(Actor self)
Expand Down Expand Up @@ -114,6 +116,26 @@ public override Activity Tick(Actor self)
QueueChild(self, new ChargeFire(attack, target));
return this;
}

void IActivityNotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)
{
// Cancel non-forced targets when switching to a more restrictive stance if they are no longer valid for auto-targeting
if (newStance > oldStance || forceAttack)
return;

if (target.Type == TargetType.Actor)
{
var a = target.Actor;
if (!autoTarget.HasValidTargetPriority(self, a.Owner, a.GetEnabledTargetTypes()))
Cancel(self, true);
}
else if (target.Type == TargetType.FrozenActor)
{
var fa = target.FrozenActor;
if (!autoTarget.HasValidTargetPriority(self, fa.Owner, fa.TargetTypes))
Cancel(self, true);
}
}
}

class ChargeFire : Activity
Expand Down
31 changes: 29 additions & 2 deletions OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View file
Expand Up @@ -17,22 +17,26 @@

namespace OpenRA.Mods.Common.Activities
{
public class FlyAttack : Activity
public class FlyAttack : Activity, IActivityNotifyStanceChanged
{
readonly Aircraft aircraft;
readonly AttackAircraft attackAircraft;
readonly Rearmable rearmable;
readonly bool forceAttack;
readonly int ticksUntilTurn;

Target target;
Target lastVisibleTarget;
WDist lastVisibleMaximumRange;
BitSet<TargetableType> lastVisibleTargetTypes;
Player lastVisibleOwner;
bool useLastVisibleTarget;
bool hasTicked;

public FlyAttack(Actor self, Target target)
public FlyAttack(Actor self, Target target, bool forceAttack)
{
this.target = target;
this.forceAttack = forceAttack;
aircraft = self.Trait<Aircraft>();
attackAircraft = self.Trait<AttackAircraft>();
rearmable = self.TraitOrDefault<Rearmable>();
Expand All @@ -45,6 +49,17 @@ public FlyAttack(Actor self, Target target)
{
lastVisibleTarget = Target.FromPos(target.CenterPosition);
lastVisibleMaximumRange = attackAircraft.GetMaximumRangeVersusTarget(target);

if (target.Type == TargetType.Actor)
{
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}
else if (target.Type == TargetType.FrozenActor)
{
lastVisibleOwner = target.FrozenActor.Owner;
lastVisibleTargetTypes = target.FrozenActor.TargetTypes;
}
}
}

Expand Down Expand Up @@ -92,6 +107,8 @@ public override Activity Tick(Actor self)
{
lastVisibleTarget = Target.FromTargetPositions(target);
lastVisibleMaximumRange = attackAircraft.GetMaximumRangeVersusTarget(target);
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}

var oldUseLastVisibleTarget = useLastVisibleTarget;
Expand Down Expand Up @@ -144,5 +161,15 @@ public override Activity Tick(Actor self)

return this;
}

void IActivityNotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)
{
// Cancel non-forced targets when switching to a more restrictive stance if they are no longer valid for auto-targeting
if (newStance > oldStance || forceAttack)
return;

if (!autoTarget.HasValidTargetPriority(self, lastVisibleOwner, lastVisibleTargetTypes))
attackAircraft.RequestedTarget = Target.Invalid;
}
}
}
31 changes: 29 additions & 2 deletions OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View file
Expand Up @@ -17,21 +17,25 @@

namespace OpenRA.Mods.Common.Activities
{
public class HeliAttack : Activity
public class HeliAttack : Activity, IActivityNotifyStanceChanged
{
readonly Aircraft aircraft;
readonly AttackAircraft attackAircraft;
readonly Rearmable rearmable;
readonly bool forceAttack;

Target target;
Target lastVisibleTarget;
WDist lastVisibleMaximumRange;
BitSet<TargetableType> lastVisibleTargetTypes;
Player lastVisibleOwner;
bool useLastVisibleTarget;
bool hasTicked;

public HeliAttack(Actor self, Target target)
public HeliAttack(Actor self, Target target, bool forceAttack)
{
this.target = target;
this.forceAttack = forceAttack;
aircraft = self.Trait<Aircraft>();
attackAircraft = self.Trait<AttackAircraft>();
rearmable = self.TraitOrDefault<Rearmable>();
Expand All @@ -43,6 +47,17 @@ public HeliAttack(Actor self, Target target)
{
lastVisibleTarget = Target.FromPos(target.CenterPosition);
lastVisibleMaximumRange = attackAircraft.GetMaximumRangeVersusTarget(target);

if (target.Type == TargetType.Actor)
{
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}
else if (target.Type == TargetType.FrozenActor)
{
lastVisibleOwner = target.FrozenActor.Owner;
lastVisibleTargetTypes = target.FrozenActor.TargetTypes;
}
}
}

Expand Down Expand Up @@ -90,6 +105,8 @@ public override Activity Tick(Actor self)
{
lastVisibleTarget = Target.FromTargetPositions(target);
lastVisibleMaximumRange = attackAircraft.GetMaximumRangeVersusTarget(target);
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}

var oldUseLastVisibleTarget = useLastVisibleTarget;
Expand Down Expand Up @@ -156,5 +173,15 @@ public override Activity Tick(Actor self)

return this;
}

void IActivityNotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)
{
// Cancel non-forced targets when switching to a more restrictive stance if they are no longer valid for auto-targeting
if (newStance > oldStance || forceAttack)
return;

if (!autoTarget.HasValidTargetPriority(self, lastVisibleOwner, lastVisibleTargetTypes))
attackAircraft.RequestedTarget = Target.Invalid;
}
}
}
28 changes: 27 additions & 1 deletion OpenRA.Mods.Common/Activities/Attack.cs
View file
Expand Up @@ -20,7 +20,7 @@
namespace OpenRA.Mods.Common.Activities
{
/* non-turreted attack */
public class Attack : Activity
public class Attack : Activity, IActivityNotifyStanceChanged
{
[Flags]
protected enum AttackStatus { UnableToAttack, NeedsToTurn, NeedsToMove, Attacking }
Expand All @@ -35,6 +35,8 @@ protected enum AttackStatus { UnableToAttack, NeedsToTurn, NeedsToMove, Attackin
protected Target target;
Target lastVisibleTarget;
WDist lastVisibleMaximumRange;
BitSet<TargetableType> lastVisibleTargetTypes;
Player lastVisibleOwner;
bool useLastVisibleTarget;
bool wasMovingWithinRange;

Expand Down Expand Up @@ -62,6 +64,17 @@ public Attack(Actor self, Target target, bool allowMovement, bool forceAttack)
lastVisibleTarget = Target.FromPos(target.CenterPosition);
lastVisibleMaximumRange = attackTraits.Where(x => !x.IsTraitDisabled)
.Min(x => x.GetMaximumRangeVersusTarget(target));

if (target.Type == TargetType.Actor)
{
lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}
else if (target.Type == TargetType.FrozenActor)
{
lastVisibleOwner = target.FrozenActor.Owner;
lastVisibleTargetTypes = target.FrozenActor.TargetTypes;
}
}
}

Expand All @@ -88,6 +101,9 @@ public override Activity Tick(Actor self)
lastVisibleTarget = Target.FromTargetPositions(target);
lastVisibleMaximumRange = attackTraits.Where(x => !x.IsTraitDisabled)
.Min(x => x.GetMaximumRangeVersusTarget(target));

lastVisibleOwner = target.Actor.Owner;
lastVisibleTargetTypes = target.Actor.GetEnabledTargetTypes();
}

var oldUseLastVisibleTarget = useLastVisibleTarget;
Expand Down Expand Up @@ -211,5 +227,15 @@ protected virtual void DoAttack(Actor self, AttackFrontal attack, IEnumerable<Ar
foreach (var a in armaments)
a.CheckFire(self, facing, target);
}

void IActivityNotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)
{
// Cancel non-forced targets when switching to a more restrictive stance if they are no longer valid for auto-targeting
if (newStance > oldStance || forceAttack)
return;

if (!autoTarget.HasValidTargetPriority(self, lastVisibleOwner, lastVisibleTargetTypes))
target = Target.Invalid;
}
}
}
4 changes: 2 additions & 2 deletions OpenRA.Mods.Common/Traits/Air/AttackAircraft.cs
View file
Expand Up @@ -38,9 +38,9 @@ public AttackAircraft(Actor self, AttackAircraftInfo info)
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
{
if (aircraftInfo.CanHover)
return new HeliAttack(self, newTarget);
return new HeliAttack(self, newTarget, forceAttack);

return new FlyAttack(self, newTarget);
return new FlyAttack(self, newTarget, forceAttack);
}

protected override bool CanAttack(Actor self, Target target)
Expand Down

0 comments on commit f3b85a1

Please sign in to comment.