From b5c74c63c99add76cfc04cd7b6b99a119e47f4ac Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 13 Mar 2015 20:48:42 +0100 Subject: [PATCH] Make variable bullet angle and speed independent from each other --- OpenRA.Mods.Common/Effects/Bullet.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Common/Effects/Bullet.cs b/OpenRA.Mods.Common/Effects/Bullet.cs index 396fac57cb..a24da27985 100644 --- a/OpenRA.Mods.Common/Effects/Bullet.cs +++ b/OpenRA.Mods.Common/Effects/Bullet.cs @@ -72,16 +72,15 @@ namespace OpenRA.Mods.Common.Effects var world = args.SourceActor.World; - if (info.Angle.Length > 1 && info.Speed.Length > 1) - { + if (info.Angle.Length > 1) angle = new WAngle(world.SharedRandom.Next(info.Angle[0].Angle, info.Angle[1].Angle)); - speed = new WRange(world.SharedRandom.Next(info.Speed[0].Range, info.Speed[1].Range)); - } else - { angle = info.Angle[0]; + + if (info.Speed.Length > 1) + speed = new WRange(world.SharedRandom.Next(info.Speed[0].Range, info.Speed[1].Range)); + else speed = info.Speed[0]; - } target = args.PassiveTarget; if (info.Inaccuracy.Range > 0)