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

Make attacking actors/turrets face the targeted position

Browse Source
This commit is contained in:
reaperrr
2017-05-05 14:16:28 +02:00
committed by Oliver Brakmann
parent 7acc6dacbc
commit 6a212eea53
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,9 @@ namespace OpenRA.Mods.Common.Activities
minRange = armaments.Max(a => a.Weapon.MinRange); minRange = armaments.Max(a => a.Weapon.MinRange);
maxRange = armaments.Min(a => a.MaxRange()); maxRange = armaments.Min(a => a.MaxRange());
var pos = self.CenterPosition;
var mobile = move as Mobile; var mobile = move as Mobile;
if (!Target.IsInRange(self.CenterPosition, maxRange) || Target.IsInRange(self.CenterPosition, minRange) if (!Target.IsInRange(pos, maxRange) || Target.IsInRange(pos, minRange)
|| (mobile != null && !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
@@ -113,7 +114,8 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity; return NextActivity;
} }
var desiredFacing = (Target.CenterPosition - self.CenterPosition).Yaw.Facing; var targetedPosition = Target.Positions.PositionClosestTo(pos);
var desiredFacing = (targetedPosition - pos).Yaw.Facing;
if (facing.Facing != desiredFacing) if (facing.Facing != desiredFacing)
{ {
attackStatus |= AttackStatus.NeedsToTurn; attackStatus |= AttackStatus.NeedsToTurn;

4
OpenRA.Mods.Common/Traits/Attack/AttackFrontal.cs
View File

@@ -39,7 +39,9 @@ namespace OpenRA.Mods.Common.Traits
return false; return false;
var f = facing.Facing; var f = facing.Facing;
var delta = target.CenterPosition - self.CenterPosition; var pos = self.CenterPosition;
var targetedPosition = target.Positions.PositionClosestTo(pos);
var delta = targetedPosition - pos;
var facingToTarget = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : f; var facingToTarget = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : f;
if (Math.Abs(facingToTarget - f) % 256 > info.FacingTolerance) if (Math.Abs(facingToTarget - f) % 256 > info.FacingTolerance)

3
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -146,7 +146,8 @@ namespace OpenRA.Mods.Common.Traits
return; return;
var pos = self.CenterPosition; var pos = self.CenterPosition;
var targetYaw = (target.CenterPosition - self.CenterPosition).Yaw; var targetedPosition = target.Positions.PositionClosestTo(pos);
var targetYaw = (targetedPosition - pos).Yaw;
foreach (var a in Armaments) foreach (var a in Armaments)
{ {

3
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -130,7 +130,8 @@ namespace OpenRA.Mods.Common.Traits
if (self.IsDisabled()) if (self.IsDisabled())
return false; return false;
var delta = target.CenterPosition - self.CenterPosition; var pos = self.CenterPosition;
var delta = target.Positions.PositionClosestTo(pos) - pos;
DesiredFacing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : TurretFacing; DesiredFacing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : TurretFacing;
MoveTurret(); MoveTurret();
return HasAchievedDesiredFacing; return HasAchievedDesiredFacing;