diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs index b9153cfd50..c1319f339a 100755 --- a/OpenRA.Mods.RA/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -34,11 +34,11 @@ namespace OpenRA.Mods.RA.Effects public readonly float Inaccuracy = 0; // pixels at maximum range public readonly string Image = null; public readonly bool High = false; - public readonly bool Arcing = false; public readonly int RangeLimit = 0; public readonly int Arm = 0; public readonly bool Shadow = false; public readonly bool Proximity = false; + public readonly float Angle = 0; public IEffect Create(ProjectileArgs args) { return new Bullet( this, args ); } } @@ -87,8 +87,8 @@ namespace OpenRA.Mods.RA.Effects var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at); var pos = float2.Lerp(Args.src, Args.dest, at) - new float2(0, altitude); - var highPos = (Info.High || Info.Arcing) - ? (pos - new float2(0, (Args.dest - Args.src).Length * height * 4 * at * (1 - at))) + var highPos = (Info.High || Info.Angle > 0) + ? (pos - new float2(0, (Args.dest - Args.src).Length * Info.Angle * 4 * at * (1 - at))) : pos; world.AddFrameEndTask(w => w.Add( @@ -121,12 +121,12 @@ namespace OpenRA.Mods.RA.Effects var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at); var pos = float2.Lerp(Args.src, Args.dest, at) - new float2(0, altitude); - if (Info.High || Info.Arcing) + if (Info.High || Info.Angle > 0) { if (Info.Shadow) yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow"); - var highPos = pos - new float2(0, (Args.dest - Args.src).Length * height * 4 * at * (1 - at)); + var highPos = pos - new float2(0, (Args.dest - Args.src).Length * Info.Angle * 4 * at * (1 - at)); yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, Args.firedBy.Owner.Palette); } diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index cfcb9e6b4d..79d57155fd 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -203,7 +203,7 @@ Grenade: Bullet: Speed: 5 High: yes - Arcing: yes + Angle: .1 Inaccuracy: 5 Image: BOMB Warhead: @@ -354,7 +354,7 @@ Ballistic: Bullet: Speed: 12 High: yes - Arcing: yes + Angle: .1 Inaccuracy: 5 Image: 120MM Warhead: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 78fe2757d7..4671c2f5f4 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -229,7 +229,7 @@ Grenade: Bullet: Speed: 5 High: true - Arcing: true + Angle: .1 Inaccuracy: 13 Image: BOMB Warhead: @@ -358,7 +358,7 @@ MammothTusk: Bullet: Speed: 12 High: true - Arcing: true + Angle: .1 Inaccuracy: 80 Image: 120MM Warhead: @@ -492,7 +492,7 @@ RedEye: Bullet: Speed: 12 High: true - Arcing: true + Angle: .1 Inaccuracy: 120 Image: 120MM Warhead: @@ -571,7 +571,7 @@ DepthCharge: Bullet: Speed: 5 Image: BOMB - Arcing: true + Angle: .1 High: true Inaccuracy: 3 Warhead: