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

Fix EMP'ed units turning

Browse Source
This commit is contained in:
Gustas
2023-05-02 00:08:50 +03:00
committed by Matthias Mailänder
parent 231bf01f18
commit 69867b6c06
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.Common/Activities/Attack.cs
View File

@@ -28,6 +28,7 @@ namespace OpenRA.Mods.Common.Activities
readonly IEnumerable<AttackFrontal> attackTraits; readonly IEnumerable<AttackFrontal> attackTraits;
readonly RevealsShroud[] revealsShroud; readonly RevealsShroud[] revealsShroud;
readonly IMove move; readonly IMove move;
readonly Mobile mobile;
readonly IFacing facing; readonly IFacing facing;
readonly IPositionable positionable; readonly IPositionable positionable;
readonly bool forceAttack; readonly bool forceAttack;
@@ -56,7 +57,9 @@ namespace OpenRA.Mods.Common.Activities
facing = self.Trait<IFacing>(); facing = self.Trait<IFacing>();
positionable = self.Trait<IPositionable>(); positionable = self.Trait<IPositionable>();
move = allowMovement ? self.TraitOrDefault<IMove>() : null; var iMove = self.TraitOrDefault<IMove>();
mobile = iMove as Mobile;
move = allowMovement ? iMove : null;
// The target may become hidden between the initial order request and the first tick (e.g. if queued) // The target may become hidden between the initial order request and the first tick (e.g. if queued)
// Moving to any position (even if quite stale) is still better than immediately giving up // Moving to any position (even if quite stale) is still better than immediately giving up
@@ -208,7 +211,7 @@ namespace OpenRA.Mods.Common.Activities
var pos = self.CenterPosition; var pos = self.CenterPosition;
if (!target.IsInRange(pos, maxRange) if (!target.IsInRange(pos, maxRange)
|| (minRange.Length != 0 && target.IsInRange(pos, minRange)) || (minRange.Length != 0 && target.IsInRange(pos, minRange))
|| (move is Mobile mobile && !mobile.CanInteractWithGroundLayer(self))) || (mobile != null && !mobile.CanInteractWithGroundLayer(self)))
{ {
// Try to move within range, drop the target otherwise // Try to move within range, drop the target otherwise
if (move == null) if (move == null)
@@ -222,13 +225,20 @@ namespace OpenRA.Mods.Common.Activities
if (!attack.TargetInFiringArc(self, target, attack.Info.FacingTolerance)) if (!attack.TargetInFiringArc(self, target, attack.Info.FacingTolerance))
{ {
var desiredFacing = (attack.GetTargetPosition(pos, target) - pos).Yaw; // Mirror Turn activity checks.
if (mobile == null || (!mobile.IsTraitDisabled && !mobile.IsTraitPaused))
{
// Don't queue a Turn activity: Executing a child takes an additional tick during which the target may have moved again.
facing.Facing = Util.TickFacing(facing.Facing, (attack.GetTargetPosition(pos, target) - pos).Yaw, facing.TurnSpeed);
// Don't queue a turn activity: Executing a child takes an additional tick during which the target may have moved again // Check again if we turned enough and directly continue attacking if we did.
facing.Facing = Util.TickFacing(facing.Facing, desiredFacing, facing.TurnSpeed); if (!attack.TargetInFiringArc(self, target, attack.Info.FacingTolerance))
{
// Check again if we turned enough and directly continue attacking if we did attackStatus |= AttackStatus.NeedsToTurn;
if (!attack.TargetInFiringArc(self, target, attack.Info.FacingTolerance)) return AttackStatus.NeedsToTurn;
}
}
else
{ {
attackStatus |= AttackStatus.NeedsToTurn; attackStatus |= AttackStatus.NeedsToTurn;
return AttackStatus.NeedsToTurn; return AttackStatus.NeedsToTurn;