diff --git a/OpenRA.Mods.Common/Effects/Missile.cs b/OpenRA.Mods.Common/Effects/Missile.cs index fe463b725c..29a6055d8e 100644 --- a/OpenRA.Mods.Common/Effects/Missile.cs +++ b/OpenRA.Mods.Common/Effects/Missile.cs @@ -38,9 +38,9 @@ namespace OpenRA.Mods.Common.Effects public readonly WRange Inaccuracy = WRange.Zero; [Desc("Probability of locking onto and following target.")] public readonly int LockOnProbability = 100; - [Desc("Rate of Turning")] - public readonly int ROT = 5; [Desc("Explode when following the target longer than this.")] + [Desc("In n/256 per tick.")] + public readonly int RateOfTurn = 5; public readonly int RangeLimit = 0; [Desc("If fired at aircraft, increase speed by 50%.")] public readonly bool TurboBoost = false; @@ -148,7 +148,7 @@ namespace OpenRA.Mods.Common.Effects else if (!args.GuidedTarget.IsValidFor(args.SourceActor)) desiredFacing = facing; - facing = OpenRA.Traits.Util.TickFacing(facing, desiredFacing, info.ROT); + facing = OpenRA.Traits.Util.TickFacing(facing, desiredFacing, info.RateOfTurn); var move = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing)) * info.Speed.Range / 1024; if (targetPosition.Z > 0 && info.TurboBoost) move = (move * 3) / 2; diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index 947559cb7c..f32bfe2701 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -9,7 +9,7 @@ Rockets: Blockable: false Inaccuracy: 128 Image: DRAGON - ROT: 15 + RateOfTurn: 15 Trail: smokey ContrailLength: 8 Speed: 298 @@ -43,7 +43,7 @@ BikeRockets: Blockable: false Inaccuracy: 128 Image: DRAGON - ROT: 10 + RateOfTurn: 10 Trail: smokey ContrailLength: 8 Speed: 213 @@ -77,7 +77,7 @@ OrcaAGMissiles: Blockable: false Inaccuracy: 128 Image: DRAGON - ROT: 20 + RateOfTurn: 20 Trail: smokey ContrailLength: 8 Speed: 298 @@ -110,7 +110,7 @@ OrcaAAMissiles: Blockable: false Inaccuracy: 128 Image: DRAGON - ROT: 20 + RateOfTurn: 20 Trail: smokey ContrailLength: 8 Speed: 298 @@ -141,7 +141,7 @@ MammothMissiles: Blockable: false Inaccuracy: 128 Image: DRAGON - ROT: 20 + RateOfTurn: 20 Trail: smokey ContrailLength: 8 Speed: 341 @@ -182,7 +182,7 @@ MammothMissiles: Inaccuracy: 853 Angle: 62 Image: DRAGON - ROT: 2 + RateOfTurn: 2 ContrailLength: 10 Trail: smokey Speed: 341 @@ -214,7 +214,7 @@ MammothMissiles: Blockable: false Inaccuracy: 213 Image: DRAGON - ROT: 10 + RateOfTurn: 10 Trail: smokey ContrailLength: 8 Speed: 213 @@ -246,7 +246,7 @@ BoatMissile: Blockable: false Inaccuracy: 213 Image: DRAGON - ROT: 10 + RateOfTurn: 10 Trail: smokey ContrailLength: 8 Speed: 170 @@ -281,7 +281,7 @@ TowerMissle: Blockable: false Inaccuracy: 128 Image: DRAGON - ROT: 20 + RateOfTurn: 20 Trail: smokey ContrailLength: 8 Speed: 298 @@ -311,7 +311,7 @@ SAMMissile: Arm: 0 Blockable: false Image: MISSILE - ROT: 20 + RateOfTurn: 20 Speed: 426 RangeLimit: 35 Trail: smokey @@ -372,7 +372,7 @@ Patriot: Image: patriot Trail: smokey ContrailLength: 8 - ROT: 20 + RateOfTurn: 20 Speed: 341 RangeLimit: 30 Angle: 88 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index ceba9b92b3..8e2b134dc0 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -32,7 +32,7 @@ Bazooka: ContrailLength: 10 Inaccuracy: 96 Image: RPG - ROT: 5 + RateOfTurn: 5 RangeLimit: 35 Warhead@1Dam: SpreadDamage Spread: 96 @@ -183,7 +183,7 @@ QuadRockets: Arm: 0 Inaccuracy: 96 Image: RPG - ROT: 10 + RateOfTurn: 10 Speed: 256 RangeLimit: 40 Warhead@1Dam: SpreadDamage @@ -242,7 +242,7 @@ TowerMissile: Shadow: yes Inaccuracy: 384 Image: MISSILE2 - ROT: 10 + RateOfTurn: 10 Speed: 256 RangeLimit: 50 Angle: 110 @@ -347,7 +347,7 @@ DevBullet: Inaccuracy: 1c416 Angle: 110 Image: MISSILE2 - ROT: 5 + RateOfTurn: 5 ContrailLength: 5 Warhead@1Dam: SpreadDamage Spread: 384 diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 710f8ae344..9ab7044100 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -13,7 +13,7 @@ Maverick: ContrailLength: 10 Inaccuracy: 512 Image: DRAGON - ROT: 5 + RateOfTurn: 5 RangeLimit: 60 Warhead@1Dam: SpreadDamage Spread: 128 @@ -50,7 +50,7 @@ Dragon: ContrailLength: 10 Inaccuracy: 128 Image: DRAGON - ROT: 5 + RateOfTurn: 5 RangeLimit: 35 Warhead@1Dam: SpreadDamage Spread: 128 @@ -87,7 +87,7 @@ HellfireAG: ContrailLength: 10 Inaccuracy: 128 Image: DRAGON - ROT: 10 + RateOfTurn: 10 RangeLimit: 20 Warhead@1Dam: SpreadDamage Spread: 128 @@ -124,7 +124,7 @@ HellfireAA: ContrailLength: 10 Inaccuracy: 128 Image: DRAGON - ROT: 10 + RateOfTurn: 10 RangeLimit: 20 Warhead@1Dam: SpreadDamage Spread: 128 @@ -160,7 +160,7 @@ MammothTusk: ContrailLength: 10 Inaccuracy: 128 Image: DRAGON - ROT: 15 + RateOfTurn: 15 RangeLimit: 40 Warhead@1Dam: SpreadDamage Spread: 256 @@ -197,7 +197,7 @@ Nike: Blockable: false ContrailLength: 10 Image: MISSILE - ROT: 25 + RateOfTurn: 25 RangeLimit: 50 Speed: 341 Warhead@1Dam: SpreadDamage @@ -227,7 +227,7 @@ RedEye: Blockable: false ContrailLength: 10 Image: MISSILE - ROT: 20 + RateOfTurn: 20 RangeLimit: 30 Speed: 298 Warhead@1Dam: SpreadDamage @@ -291,7 +291,7 @@ Stinger: Blockable: false ContrailLength: 10 Image: DRAGON - ROT: 20 + RateOfTurn: 20 RangeLimit: 50 TurboBoost: true Speed: 170 @@ -332,7 +332,7 @@ TorpTube: Arm: 3 Speed: 85 Trail: bubbles - ROT: 1 + RateOfTurn: 1 RangeLimit: 160 BoundToTerrainType: Water Palette: shadow @@ -409,7 +409,7 @@ APTusk: ContrailLength: 10 Inaccuracy: 128 Image: DRAGON - ROT: 10 + RateOfTurn: 10 RangeLimit: 22 Warhead@1Dam: SpreadDamage Spread: 128 diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index af13a66896..4ce2ae0ca2 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -95,7 +95,7 @@ Bazooka: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 8 + RateOfTurn: 8 RangeLimit: 50 CloseEnough: 256 LockOnProbability: 80 @@ -138,7 +138,7 @@ MultiCluster: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 8 + RateOfTurn: 8 RangeLimit: 35 Palette: ra Warhead@1Dam: SpreadDamage @@ -410,7 +410,7 @@ HoverMissile: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 8 + RateOfTurn: 8 RangeLimit: 35 Palette: ra Warhead@1Dam: SpreadDamage @@ -484,7 +484,7 @@ MammothTusk: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 10 + RateOfTurn: 10 Speed: 170 RangeLimit: 35 Palette: ra @@ -644,7 +644,7 @@ BikeMissile: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 8 + RateOfTurn: 8 Speed: 213 RangeLimit: 35 Palette: ra @@ -749,7 +749,7 @@ Dragon: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 8 + RateOfTurn: 8 RangeLimit: 35 Palette: ra Warhead@1Dam: SpreadDamage @@ -856,7 +856,7 @@ Hellfire: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 8 + RateOfTurn: 8 RangeLimit: 35 Palette: ra Warhead@1Dam: SpreadDamage @@ -928,7 +928,7 @@ Proton: Shadow: true Inaccuracy: 128 Image: TORPEDO - ROT: 1 + RateOfTurn: 1 RangeLimit: 35 Warhead@1Dam: SpreadDamage Spread: 128 @@ -1105,7 +1105,7 @@ SAMTower: Shadow: true Inaccuracy: 128 Image: DRAGON - ROT: 5 + RateOfTurn: 5 RangeLimit: 60 Palette: ra Warhead@1Dam: SpreadDamage