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

split unit smoke out into WithSmoke trait; remove duplication

Browse Source
This commit is contained in:
Chris Forbes
2011-07-17 11:27:20 +12:00
parent d6819a19b8
commit 5f315bc404
9 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Cnc/RenderGunboat.cs
View File

@@ -19,10 +19,9 @@ namespace OpenRA.Mods.RA.Render
public override object Create(ActorInitializer init) { return new RenderGunboat(init.self); }
}
class RenderGunboat : RenderSimple, INotifyDamage, INotifyDamageStateChanged
class RenderGunboat : RenderSimple, INotifyDamageStateChanged
{
IFacing facing;
bool isSmoking = false;
public RenderGunboat(Actor self)
: base(self, () => self.HasTrait<Turreted>() ? self.Trait<Turreted>().turretFacing : 0)
@@ -34,7 +33,6 @@ namespace OpenRA.Mods.RA.Render
wake.Play("left-wake");
Func<float2> offset = () => new float2(((anims["wake"].Animation.CurrentSequence.Name == "left-wake") ? 1 : -1),2);
anims.Add( "wake", new AnimationWithOffset( wake, offset, () => false ) { ZOffset = -2 } );
anims.Add( "smoke", new AnimationWithOffset( new Animation( "smoke_m" ), null, () => !isSmoking ) );
}
string lastDir = "left";
@@ -61,19 +59,5 @@ namespace OpenRA.Mods.RA.Render
lastDamage = "";
anim.ReplaceAnim(lastDir+lastDamage);
}
public void Damaged(Actor self, AttackInfo e)
{
// Smoking
if (e.DamageState < DamageState.Heavy) return;
if (isSmoking) return;
isSmoking = true;
var smoke = anims[ "smoke" ].Animation;
smoke.PlayThen( "idle",
() => smoke.PlayThen( "loop",
() => smoke.PlayBackwardsThen( "end",
() => isSmoking = false ) ) );
}
}
}