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

Make range modifiers apply to AreaBeam projectile.

Browse Source
This commit is contained in:
darkademic
2022-05-04 00:17:04 +01:00
committed by atlimit8
parent 89042014bd
commit 1fc3785f79
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,7 @@ namespace OpenRA.Mods.Common.Projectiles
readonly AttackBase actorAttackBase; readonly AttackBase actorAttackBase;
readonly Color color; readonly Color color;
readonly WDist speed; readonly WDist speed;
readonly WDist weaponRange;
[Sync] [Sync]
WPos headPos; WPos headPos;
@@ -137,6 +138,7 @@ namespace OpenRA.Mods.Common.Projectiles
target += dir * info.BeyondTargetRange.Length / 1024; target += dir * info.BeyondTargetRange.Length / 1024;
length = Math.Max((target - headPos).Length / speed.Length, 1); length = Math.Max((target - headPos).Length / speed.Length, 1);
weaponRange = new WDist(Util.ApplyPercentageModifiers(args.Weapon.Range.Length, args.RangeModifiers));
} }
void TrackTarget() void TrackTarget()
@@ -151,7 +153,7 @@ namespace OpenRA.Mods.Common.Projectiles
// Only continue tracking target if it's within weapon range + // Only continue tracking target if it's within weapon range +
// BeyondTargetRange to avoid edge case stuttering (start firing and immediately stop again). // BeyondTargetRange to avoid edge case stuttering (start firing and immediately stop again).
if (targetDistance > args.Weapon.Range + info.BeyondTargetRange) if (targetDistance > weaponRange + info.BeyondTargetRange)
StopTargeting(); StopTargeting();
else else
{ {
@@ -192,7 +194,7 @@ namespace OpenRA.Mods.Common.Projectiles
} }
// Allow for leniency to avoid edge case stuttering (start firing and immediately stop again). // Allow for leniency to avoid edge case stuttering (start firing and immediately stop again).
var outOfWeaponRange = args.Weapon.Range + info.BeyondTargetRange < new WDist((args.PassiveTarget - args.Source).Length); var outOfWeaponRange = weaponRange + info.BeyondTargetRange < new WDist((args.PassiveTarget - args.Source).Length);
// While the head is travelling, the tail must start to follow Duration ticks later. // While the head is travelling, the tail must start to follow Duration ticks later.
// Alternatively, also stop emitting the beam if source actor dies or is ordered to stop. // Alternatively, also stop emitting the beam if source actor dies or is ordered to stop.