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

Merge pull request #12068 from reaperrr/laser-features1

Browse Source 
Add several features to LaserZap
This commit is contained in:
Oliver Brakmann
2016-10-09 15:24:55 +02:00
committed by GitHub
parent dba41a3ad1 64e1b1dbdb
commit d0493bb10c
5 changed files with 90 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Extra search radius beyond beam width. Required to ensure affecting actors with large health radius.")]
public readonly WDist TargetExtraSearchRadius = new WDist(1536);
[Desc("Should the beam be visuall rendered? False = Beam is invisible.")]
[Desc("Should the beam be visually rendered? False = Beam is invisible.")]
public readonly bool RenderBeam = true;
[Desc("Equivalent to sequence ZOffset. Controls Z sorting.")]

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

@@ -16,6 +16,7 @@ using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Projectiles
@@ -32,13 +33,42 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Equivalent to sequence ZOffset. Controls Z sorting.")]
public readonly int ZOffset = 0;
public readonly int BeamDuration = 10;
public readonly int Duration = 10;
public readonly bool UsePlayerColor = false;
[Desc("Laser color.")]
[Desc("Color of the beam.")]
public readonly Color Color = Color.Red;
[Desc("Beam follows the target.")]
public readonly bool TracksTarget = true;
[Desc("Maximum offset at the maximum range.")]
public readonly WDist Inaccuracy = WDist.Zero;
[Desc("Extra search radius beyond beam width. Required to ensure affecting actors with large health radius.")]
public readonly WDist TargetExtraSearchRadius = new WDist(1536);
[Desc("Beam can be blocked.")]
public readonly bool Blockable = false;
[Desc("Draw a second beam (for 'glow' effect).")]
public readonly bool SecondaryBeam = false;
[Desc("The width of the zap.")]
public readonly WDist SecondaryBeamWidth = new WDist(86);
[Desc("The shape of the beam. Accepts values Cylindrical or Flat.")]
public readonly BeamRenderableShape SecondaryBeamShape = BeamRenderableShape.Cylindrical;
[Desc("Equivalent to sequence ZOffset. Controls Z sorting.")]
public readonly int SecondaryBeamZOffset = 0;
public readonly bool SecondaryBeamUsePlayerColor = false;
[Desc("Color of the secondary beam.")]
public readonly Color SecondaryBeamColor = Color.Red;
[Desc("Impact animation.")]
public readonly string HitAnim = null;
@@ -50,27 +80,38 @@ namespace OpenRA.Mods.Common.Projectiles
public IProjectile Create(ProjectileArgs args)
{
var c = UsePlayerColor ? args.SourceActor.Owner.Color.RGB : Color;
return new LaserZap(args, this, c);
return new LaserZap(this, args, c);
}
}
public class LaserZap : IProjectile
public class LaserZap : IProjectile, ISync
{
readonly ProjectileArgs args;
readonly LaserZapInfo info;
readonly Animation hitanim;
readonly Color color;
readonly Color secondaryColor;
int ticks = 0;
Color color;
bool doneDamage;
bool animationComplete;
WPos target;
[Sync] WPos target;
[Sync] WPos source;
public LaserZap(ProjectileArgs args, LaserZapInfo info, Color color)
public LaserZap(LaserZapInfo info, ProjectileArgs args, Color color)
{
this.args = args;
this.info = info;
this.color = color;
secondaryColor = info.SecondaryBeamUsePlayerColor ? args.SourceActor.Owner.Color.RGB : info.SecondaryBeamColor;
target = args.PassiveTarget;
source = args.Source;
if (info.Inaccuracy.Length > 0)
{
var inaccuracy = OpenRA.Mods.Common.Util.ApplyPercentageModifiers(info.Inaccuracy.Length, args.InaccuracyModifiers);
var maxOffset = inaccuracy * (target - source).Length / args.Weapon.Range.Length;
target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024;
}
if (!string.IsNullOrEmpty(info.HitAnim))
hitanim = new Animation(args.SourceActor.World, info.HitAnim);
@@ -79,9 +120,17 @@ namespace OpenRA.Mods.Common.Projectiles
public void Tick(World world)
{
// Beam tracks target
if (args.GuidedTarget.IsValidFor(args.SourceActor))
if (info.TracksTarget && args.GuidedTarget.IsValidFor(args.SourceActor))
target = args.GuidedTarget.CenterPosition;
// Check for blocking actors
WPos blockedPos;
if (info.Blockable && BlocksProjectiles.AnyBlockingActorsBetween(world, source, target,
info.Width, info.TargetExtraSearchRadius, out blockedPos))
{
target = blockedPos;
}
if (!doneDamage)
{
if (hitanim != null)
@@ -96,7 +145,7 @@ namespace OpenRA.Mods.Common.Projectiles
if (hitanim != null)
hitanim.Tick();
if (++ticks >= info.BeamDuration && animationComplete)
if (++ticks >= info.Duration && animationComplete)
world.AddFrameEndTask(w => w.Remove(this));
}
@@ -106,10 +155,17 @@ namespace OpenRA.Mods.Common.Projectiles
wr.World.FogObscures(args.Source))
yield break;
if (ticks < info.BeamDuration)
if (ticks < info.Duration)
{
var rc = Color.FromArgb((info.BeamDuration - ticks) * color.A / info.BeamDuration, color);
var rc = Color.FromArgb((info.Duration - ticks) * color.A / info.Duration, color);
yield return new BeamRenderable(args.Source, info.ZOffset, target - args.Source, info.Shape, info.Width, rc);
if (info.SecondaryBeam)
{
var src = Color.FromArgb((info.Duration - ticks) * secondaryColor.A / info.Duration, secondaryColor);
yield return new BeamRenderable(args.Source, info.SecondaryBeamZOffset, target - args.Source,
info.SecondaryBeamShape, info.SecondaryBeamWidth, src);
}
}
if (hitanim != null)

7
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -441,6 +441,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Key = "Speed";
}
// Rename LaserZap BeamDuration to just Duration
if (engineVersion < 20161009)
{
if (node.Key == "BeamDuration")
node.Key = "Duration";
}
UpgradeWeaponRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}

2
mods/ts/rules/nod-support.yaml
View File

@@ -110,7 +110,7 @@ NAOBEL:
LocalOffset: 1400,210,800
AttackCharge:
ChargeAudio: obelpowr.aud
InitialChargeDelay: 120
InitialChargeDelay: 65
WithChargeOverlay:
Sequence: active
Palette: player

18
mods/ts/weapons/energyweapons.yaml
View File

@@ -180,8 +180,14 @@ ObeliskLaserFire:
Range: 10c512
Report: obelray1.aud
Projectile: LaserZap
Width: 85
Width: 72
Duration: 15
ZOffset: 2047
Color: FF000080
SecondaryBeam: true
SecondaryBeamWidth: 180
SecondaryBeamZOffset: 2047
SecondaryBeamColor: FF000040
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 250
@@ -192,10 +198,14 @@ TurretLaserFire:
Range: 5c512
Report: lastur1.aud
Projectile: LaserZap
Width: 50
BeamDuration: 5
Width: 36
Duration: 8
ZOffset: 2047
Color: FF000045
Color: FF000080
SecondaryBeam: true
SecondaryBeamWidth: 144
SecondaryBeamZOffset: 2047
SecondaryBeamColor: FF000030
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 30