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

Adapt LaserZap Color description and Args structure

Browse Source 
To match AreaBeam.
This commit is contained in:
reaperrr
2016-09-09 01:32:42 +02:00
parent 095b093f39
commit 5463176fa3
2 changed files with 4 additions and 4 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.")] [Desc("Extra search radius beyond beam width. Required to ensure affecting actors with large health radius.")]
public readonly WDist TargetExtraSearchRadius = new WDist(1536); 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; public readonly bool RenderBeam = true;
[Desc("Equivalent to sequence ZOffset. Controls Z sorting.")] [Desc("Equivalent to sequence ZOffset. Controls Z sorting.")]

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

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Projectiles
public readonly bool UsePlayerColor = false; public readonly bool UsePlayerColor = false;
[Desc("Laser color.")] [Desc("Color of the beam.")]
public readonly Color Color = Color.Red; public readonly Color Color = Color.Red;
[Desc("Impact animation.")] [Desc("Impact animation.")]
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Projectiles
public IProjectile Create(ProjectileArgs args) public IProjectile Create(ProjectileArgs args)
{ {
var c = UsePlayerColor ? args.SourceActor.Owner.Color.RGB : Color; var c = UsePlayerColor ? args.SourceActor.Owner.Color.RGB : Color;
return new LaserZap(args, this, c); return new LaserZap(this, args, c);
} }
} }
@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Projectiles
bool animationComplete; bool animationComplete;
WPos target; WPos target;
public LaserZap(ProjectileArgs args, LaserZapInfo info, Color color) public LaserZap(LaserZapInfo info, ProjectileArgs args, Color color)
{ {
this.args = args; this.args = args;
this.info = info; this.info = info;