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

Moved projectile inaccuracy calculations to Common.Util

Browse Source 
Also moved the InaccuracyType enum there. This also quietly adds the RangeModifiers to the calculations for all projectiles, while they were only used on Bullet so far, which seemed very wrong.
This commit is contained in:
Pavel Penev
2020-05-03 04:01:20 +03:00
committed by Matthias Mailänder
parent 134d47e48c
commit 76dfda164e
7 changed files with 33 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Projectiles/AreaBeam.cs
View File

@@ -21,8 +21,6 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Projectiles
{
public enum InaccuracyType { Maximum, PerCellIncrement, Absolute }
public class AreaBeamInfo : IProjectileInfo
{
[Desc("Projectile speed in WDist / tick, two values indicate a randomly picked velocity per beam.")]
@@ -132,23 +130,8 @@ namespace OpenRA.Mods.Common.Projectiles
target = args.PassiveTarget;
if (info.Inaccuracy.Length > 0)
{
var inaccuracy = Util.ApplyPercentageModifiers(info.Inaccuracy.Length, args.InaccuracyModifiers);
var maxOffset = 0;
switch (info.InaccuracyType)
{
case InaccuracyType.Maximum:
maxOffset = inaccuracy * (target - headPos).Length / args.Weapon.Range.Length;
break;
case InaccuracyType.PerCellIncrement:
maxOffset = inaccuracy * (target - headPos).Length / 1024;
break;
case InaccuracyType.Absolute:
maxOffset = inaccuracy;
break;
}
target += WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024;
var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
target += WVec.FromPDF(world.SharedRandom, 2) * maxInaccuracyOffset / 1024;
}
towardsTargetFacing = (target - headPos).Yaw;

20
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -149,24 +149,8 @@ namespace OpenRA.Mods.Common.Projectiles
target = args.PassiveTarget;
if (info.Inaccuracy.Length > 0)
{
var inaccuracy = Util.ApplyPercentageModifiers(info.Inaccuracy.Length, args.InaccuracyModifiers);
var range = Util.ApplyPercentageModifiers(args.Weapon.Range.Length, args.RangeModifiers);
var maxOffset = 0;
switch (info.InaccuracyType)
{
case InaccuracyType.Maximum:
maxOffset = inaccuracy * (target - pos).Length / range;
break;
case InaccuracyType.PerCellIncrement:
maxOffset = inaccuracy * (target - pos).Length / 1024;
break;
case InaccuracyType.Absolute:
maxOffset = inaccuracy;
break;
}
target += WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024;
var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
target += WVec.FromPDF(world.SharedRandom, 2) * maxInaccuracyOffset / 1024;
}
if (info.AirburstAltitude > WDist.Zero)

20
OpenRA.Mods.Common/Projectiles/InstantHit.cs
View File

@@ -55,23 +55,9 @@ namespace OpenRA.Mods.Common.Projectiles
target = args.GuidedTarget;
else if (info.Inaccuracy.Length > 0)
{
var inaccuracy = Util.ApplyPercentageModifiers(info.Inaccuracy.Length, args.InaccuracyModifiers);
var maxOffset = 0;
switch (info.InaccuracyType)
{
case InaccuracyType.Maximum:
maxOffset = inaccuracy * (args.PassiveTarget - args.Source).Length / args.Weapon.Range.Length;
break;
case InaccuracyType.PerCellIncrement:
maxOffset = inaccuracy * (args.PassiveTarget - args.Source).Length / 1024;
break;
case InaccuracyType.Absolute:
maxOffset = inaccuracy;
break;
}
target = Target.FromPos(args.PassiveTarget + WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024);
var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
var inaccuracyOffset = WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxInaccuracyOffset / 1024;
target = Target.FromPos(args.PassiveTarget + inaccuracyOffset);
}
else
target = Target.FromPos(args.PassiveTarget);

19
OpenRA.Mods.Common/Projectiles/LaserZap.cs
View File

@@ -132,23 +132,8 @@ namespace OpenRA.Mods.Common.Projectiles
if (info.Inaccuracy.Length > 0)
{
var inaccuracy = Util.ApplyPercentageModifiers(info.Inaccuracy.Length, args.InaccuracyModifiers);
var maxOffset = 0;
switch (info.InaccuracyType)
{
case InaccuracyType.Maximum:
maxOffset = inaccuracy * (target - source).Length / args.Weapon.Range.Length;
break;
case InaccuracyType.PerCellIncrement:
maxOffset = inaccuracy * (target - source).Length / 1024;
break;
case InaccuracyType.Absolute:
maxOffset = inaccuracy;
break;
}
target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024;
var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxInaccuracyOffset / 1024;
}
if (!string.IsNullOrEmpty(info.HitAnim))

19
OpenRA.Mods.Common/Projectiles/Missile.cs
View File

@@ -238,23 +238,8 @@ namespace OpenRA.Mods.Common.Projectiles
var inaccuracy = lockOn && info.LockOnInaccuracy.Length > -1 ? info.LockOnInaccuracy.Length : info.Inaccuracy.Length;
if (inaccuracy > 0)
{
inaccuracy = Util.ApplyPercentageModifiers(inaccuracy, args.InaccuracyModifiers);
var maxOffset = 0;
switch (info.InaccuracyType)
{
case InaccuracyType.Maximum:
maxOffset = inaccuracy * (targetPosition - pos).Length / args.Weapon.Range.Length;
break;
case InaccuracyType.PerCellIncrement:
maxOffset = inaccuracy * (targetPosition - pos).Length / 1024;
break;
case InaccuracyType.Absolute:
maxOffset = inaccuracy;
break;
}
offset = WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024;
var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
offset = WVec.FromPDF(world.SharedRandom, 2) * maxInaccuracyOffset / 1024;
}
DetermineLaunchSpeedAndAngle(world, out speed, out vFacing);

19
OpenRA.Mods.Common/Projectiles/Railgun.cs
View File

@@ -134,23 +134,8 @@ namespace OpenRA.Mods.Common.Projectiles
if (info.Inaccuracy.Length > 0)
{
var inaccuracy = Util.ApplyPercentageModifiers(info.Inaccuracy.Length, args.InaccuracyModifiers);
var maxOffset = 0;
switch (info.InaccuracyType)
{
case InaccuracyType.Maximum:
maxOffset = inaccuracy * (target - source).Length / args.Weapon.Range.Length;
break;
case InaccuracyType.PerCellIncrement:
maxOffset = inaccuracy * (target - source).Length / 1024;
break;
case InaccuracyType.Absolute:
maxOffset = inaccuracy;
break;
}
target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024;
var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxInaccuracyOffset / 1024;
}
if (!string.IsNullOrEmpty(info.HitAnim))

21
OpenRA.Mods.Common/Util.cs
View File

@@ -11,9 +11,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Support;
@@ -21,6 +21,8 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common
{
public enum InaccuracyType { Maximum, PerCellIncrement, Absolute }
public static class Util
{
public static int TickFacing(int facing, int desiredFacing, int rot)
@@ -251,5 +253,22 @@ namespace OpenRA.Mods.Common
return t.Name;
}
public static int GetProjectileInaccuracy(int baseInaccuracy, InaccuracyType inaccuracyType, ProjectileArgs args)
{
var inaccuracy = ApplyPercentageModifiers(baseInaccuracy, args.InaccuracyModifiers);
switch (inaccuracyType)
{
case InaccuracyType.Maximum:
var weaponMaxRange = ApplyPercentageModifiers(args.Weapon.Range.Length, args.RangeModifiers);
return inaccuracy * (args.PassiveTarget - args.Source).Length / weaponMaxRange;
case InaccuracyType.PerCellIncrement:
return inaccuracy * (args.PassiveTarget - args.Source).Length / 1024;
case InaccuracyType.Absolute:
return inaccuracy;
default:
throw new InvalidEnumArgumentException("inaccuracyType", (int)inaccuracyType, typeof(InaccuracyType));
}
}
}
}