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

Move projectile palette definition from weapon to projectile effects

Browse Source
This commit is contained in:
reaperrr
2015-03-10 22:33:17 +01:00
parent c61dc48548
commit fb710f15bb
6 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Effects/Bullet.cs
View File

@@ -30,6 +30,7 @@ namespace OpenRA.Mods.Common.Effects
public readonly string Image = null;
[Desc("Check for whether an actor with BlocksBullets: trait blocks fire")]
public readonly bool High = false;
public readonly string Palette = "effect";
public readonly bool Shadow = false;
[Desc("Arc in WAngles, two values indicate variable arc.")]
public readonly WAngle[] Angle = { WAngle.Zero };
@@ -158,7 +159,7 @@ namespace OpenRA.Mods.Common.Effects
yield return r;
}
var palette = wr.Palette(args.Weapon.Palette);
var palette = wr.Palette(info.Palette);
foreach (var r in anim.Render(pos, palette))
yield return r;
}

3
OpenRA.Mods.Common/Effects/GravityBomb.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.Common.Effects
public class GravityBombInfo : IProjectileInfo
{
public readonly string Image = null;
public readonly string Palette = "effect";
public readonly bool Shadow = false;
public readonly WRange Velocity = WRange.Zero;
public readonly WRange Acceleration = new WRange(15);
@@ -75,7 +76,7 @@ namespace OpenRA.Mods.Common.Effects
yield return r;
}
var palette = wr.Palette(args.Weapon.Palette);
var palette = wr.Palette(info.Palette);
foreach (var r in anim.Render(pos, palette))
yield return r;
}

7
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -22,6 +22,9 @@ namespace OpenRA.Mods.Common.Effects
{
class MissileInfo : IProjectileInfo
{
public readonly string Image = null;
public readonly string Palette = "effect";
public readonly bool Shadow = false;
[Desc("Projectile speed in WRange / tick")]
public readonly WRange Speed = new WRange(8);
[Desc("Maximum vertical pitch when changing altitude.")]
@@ -30,13 +33,11 @@ namespace OpenRA.Mods.Common.Effects
public readonly int Arm = 0;
[Desc("Check for whether an actor with BlocksBullets: trait blocks fire")]
public readonly bool High = false;
public readonly bool Shadow = false;
public readonly string Trail = null;
[Desc("Maximum offset at the maximum range")]
public readonly WRange Inaccuracy = WRange.Zero;
[Desc("Probability of locking onto and following target.")]
public readonly int LockOnProbability = 100;
public readonly string Image = null;
[Desc("Rate of Turning")]
public readonly int ROT = 5;
[Desc("Explode when following the target longer than this.")]
@@ -211,7 +212,7 @@ namespace OpenRA.Mods.Common.Effects
yield return r;
}
var palette = wr.Palette(args.Weapon.Palette);
var palette = wr.Palette(info.Palette);
foreach (var r in anim.Render(pos, palette))
yield return r;
}