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

Merge pull request #10777 from reaperrr/fix-missile-cruise

Browse Source 
Fix missiles not moving to CruiseAltitude if launched above it
This commit is contained in:
Oliver Brakmann
2016-04-23 15:04:54 +02:00
parent a717ab6763 5ad89f90a5
commit ea5009393f
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -664,6 +664,11 @@ namespace OpenRA.Mods.Common.Effects
// of vertical facing bound by the maximum vertical rate of turn // of vertical facing bound by the maximum vertical rate of turn
var vDist = new WVec(-diffClfMslHgt - info.CruiseAltitude.Length, -speed, 0); var vDist = new WVec(-diffClfMslHgt - info.CruiseAltitude.Length, -speed, 0);
desiredVFacing = (sbyte)vDist.HorizontalLengthSquared != 0 ? vDist.Yaw.Facing : vFacing; desiredVFacing = (sbyte)vDist.HorizontalLengthSquared != 0 ? vDist.Yaw.Facing : vFacing;
// If the missile is launched above CruiseAltitude, it has to descend instead of climbing
if (-diffClfMslHgt > info.CruiseAltitude.Length)
desiredVFacing = -desiredVFacing;
desiredVFacing = desiredVFacing.Clamp(-info.VerticalRateOfTurn, info.VerticalRateOfTurn); desiredVFacing = desiredVFacing.Clamp(-info.VerticalRateOfTurn, info.VerticalRateOfTurn);
ChangeSpeed(); ChangeSpeed();
@@ -675,6 +680,11 @@ namespace OpenRA.Mods.Common.Effects
// of vertical facing bound by the maximum vertical rate of turn // of vertical facing bound by the maximum vertical rate of turn
var vDist = new WVec(-diffClfMslHgt - info.CruiseAltitude.Length, -speed, 0); var vDist = new WVec(-diffClfMslHgt - info.CruiseAltitude.Length, -speed, 0);
desiredVFacing = (sbyte)vDist.HorizontalLengthSquared != 0 ? vDist.Yaw.Facing : vFacing; desiredVFacing = (sbyte)vDist.HorizontalLengthSquared != 0 ? vDist.Yaw.Facing : vFacing;
// If the missile is launched above CruiseAltitude, it has to descend instead of climbing
if (-diffClfMslHgt > info.CruiseAltitude.Length)
desiredVFacing = -desiredVFacing;
desiredVFacing = desiredVFacing.Clamp(-info.VerticalRateOfTurn, info.VerticalRateOfTurn); desiredVFacing = desiredVFacing.Clamp(-info.VerticalRateOfTurn, info.VerticalRateOfTurn);
ChangeSpeed(); ChangeSpeed();

1
mods/ra/weapons/missiles.yaml
View File

@@ -14,6 +14,7 @@ Maverick:
Inaccuracy: 512 Inaccuracy: 512
Image: DRAGON Image: DRAGON
HorizontalRateOfTurn: 5 HorizontalRateOfTurn: 5
CruiseAltitude: 2c0
RangeLimit: 60 RangeLimit: 60
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 128 Spread: 128