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

Merge pull request #7909 from reaperrr/projectile-cleanup2

Browse Source 
Projectiles cleanup Part 2
This commit is contained in:
Paul Chote
2015-04-25 18:41:06 +12:00
parent 27127dd1a9 6b7ffdc1b7
commit 1e30fdb333
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,10 @@ namespace OpenRA.Mods.Common.Effects
public class GravityBombInfo : IProjectileInfo public class GravityBombInfo : IProjectileInfo
{ {
public readonly string Image = null; public readonly string Image = null;
[Desc("Sequence to loop while falling.")]
public readonly string Sequence = "idle";
[Desc("Sequence to play when launched. Skipped if null.")]
public readonly string OpenSequence = null;
public readonly string Palette = "effect"; public readonly string Palette = "effect";
public readonly bool Shadow = false; public readonly bool Shadow = false;
public readonly WRange Velocity = WRange.Zero; public readonly WRange Velocity = WRange.Zero;
@@ -46,10 +50,14 @@ namespace OpenRA.Mods.Common.Effects
acceleration = new WVec(WRange.Zero, WRange.Zero, info.Acceleration); acceleration = new WVec(WRange.Zero, WRange.Zero, info.Acceleration);
anim = new Animation(args.SourceActor.World, info.Image); anim = new Animation(args.SourceActor.World, info.Image);
if (anim.HasSequence("open"))
anim.PlayThen("open", () => anim.PlayRepeating("idle")); if (info.Image != null)
else {
anim.PlayRepeating("idle"); if (info.OpenSequence != null)
anim.PlayThen(info.OpenSequence, () => anim.PlayRepeating(info.Sequence));
else
anim.PlayRepeating(info.Sequence);
}
} }
public void Tick(World world) public void Tick(World world)

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

@@ -26,8 +26,10 @@ namespace OpenRA.Mods.Common.Effects
public readonly bool UsePlayerColor = false; public readonly bool UsePlayerColor = false;
[Desc("Laser color in (A,)R,G,B.")] [Desc("Laser color in (A,)R,G,B.")]
public readonly Color Color = Color.Red; public readonly Color Color = Color.Red;
[Desc("Impact animation. Requires a regular animation with idle: sequence instead of explosion special case.")] [Desc("Impact animation.")]
public readonly string HitAnim = null; public readonly string HitAnim = null;
[Desc("Sequence of impact animation to use.")]
public readonly string HitAnimSequence = "idle";
public readonly string HitAnimPalette = "effect"; public readonly string HitAnimPalette = "effect";
public IEffect Create(ProjectileArgs args) public IEffect Create(ProjectileArgs args)
@@ -68,7 +70,7 @@ namespace OpenRA.Mods.Common.Effects
if (!doneDamage) if (!doneDamage)
{ {
if (hitanim != null) if (hitanim != null)
hitanim.PlayThen("idle", () => animationComplete = true); hitanim.PlayThen(info.HitAnimSequence, () => animationComplete = true);
args.Weapon.Impact(Target.FromPos(target), args.SourceActor, args.DamageModifiers); args.Weapon.Impact(Target.FromPos(target), args.SourceActor, args.DamageModifiers);
doneDamage = true; doneDamage = true;

3
mods/d2k/sequences/misc.yaml
View File

@@ -260,9 +260,6 @@ smoke_m:
BlendMode: Additive BlendMode: Additive
bombs: bombs:
open: DATA.R8
Start: 3280
Length: 4
idle: DATA.R8 idle: DATA.R8
Start: 3280 Start: 3280
Length: 4 Length: 4

1
mods/ra/weapons/superweapons.yaml
View File

@@ -4,6 +4,7 @@ ParaBomb:
Report: CHUTE1.AUD Report: CHUTE1.AUD
Projectile: GravityBomb Projectile: GravityBomb
Image: PARABOMB Image: PARABOMB
OpenSequence: open
Velocity: 43 Velocity: 43
Acceleration: 0 Acceleration: 0
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage