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

make the parachute animation optional

Browse Source 
instead of hard-coding default sprite sequences
This commit is contained in:
Matthias Mailänder
2014-06-22 15:34:52 +02:00
parent ff1be8daea
commit ef01fb289b
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.RA/Effects/Parachute.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Effects
{
public class Parachute : IEffect
{
readonly Animation paraAnim;
readonly Animation parachute;
readonly WVec parachuteOffset;
readonly Actor cargo;
WPos pos;
@@ -29,9 +29,12 @@ namespace OpenRA.Mods.RA.Effects
this.cargo = cargo;
var parachutableInfo = cargo.Info.Traits.GetOrDefault<ParachutableInfo>();
var sprite = parachutableInfo != null ? parachutableInfo.ParachuteSprite : "parach";
paraAnim = new Animation(cargo.World, sprite);
paraAnim.PlayThen("open", () => paraAnim.PlayRepeating("idle"));
var parachuteSprite = parachutableInfo != null ? parachutableInfo.ParachuteSequence : null;
if (parachuteSprite != null)
{
parachute = new Animation(cargo.World, parachuteSprite);
parachute.PlayThen("open", () => parachute.PlayRepeating("idle"));
}
if (parachutableInfo != null)
parachuteOffset = parachutableInfo.ParachuteOffset;
@@ -44,7 +47,8 @@ namespace OpenRA.Mods.RA.Effects
public void Tick(World world)
{
paraAnim.Tick();
if (parachute != null)
parachute.Tick();
pos -= fallRate;
@@ -79,8 +83,9 @@ namespace OpenRA.Mods.RA.Effects
yield return c.OffsetBy(pos - c.Pos);
}
foreach (var r in paraAnim.Render(pos, parachuteOffset, 1, rc.First().Palette, 1f))
yield return r;
if (parachute != null)
foreach (var r in parachute.Render(pos, parachuteOffset, 1, rc.First().Palette, 1f))
yield return r;
}
}
}