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

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -353,6 +353,7 @@
<Compile Include="Reloads.cs" />
<Compile Include="AnnounceOnKill.cs" />
<Compile Include="CrushableInfantry.cs" />
<Compile Include="Render\WithSmoke.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

24
OpenRA.Mods.RA/Render/RenderUnit.cs
View File

@@ -16,21 +16,15 @@ namespace OpenRA.Mods.RA.Render
{
public class RenderUnitInfo : RenderSimpleInfo
{
public readonly bool Smokes = true;
public override object Create(ActorInitializer init) { return new RenderUnit(init.self); }
}
public class RenderUnit : RenderSimple, INotifyDamage
public class RenderUnit : RenderSimple
{
public RenderUnit(Actor self)
: base(self, () => self.HasTrait<IFacing>() ? self.Trait<IFacing>().Facing : 0)
{
canSmoke = self.Info.Traits.Get<RenderUnitInfo>().Smokes;
anim.PlayRepeating("idle");
if (canSmoke)
anims.Add( "smoke", new AnimationWithOffset( new Animation( "smoke_m" ), null, () => !isSmoking ) );
}
public void PlayCustomAnimation(Actor self, string newAnim, Action after)
@@ -49,21 +43,5 @@ namespace OpenRA.Mods.RA.Render
anim.PlayBackwardsThen(name,
() => { anim.PlayRepeating("idle"); a(); });
}
bool isSmoking;
bool canSmoke;
public void Damaged(Actor self, AttackInfo e)
{
if (e.DamageState < DamageState.Heavy) return;
if (isSmoking || !canSmoke) return;
isSmoking = true;
var smoke = anims[ "smoke" ].Animation;
smoke.PlayThen( "idle",
() => smoke.PlayThen( "loop",
() => smoke.PlayBackwardsThen( "end",
() => isSmoking = false ) ) );
}
}
}

47
OpenRA.Mods.RA/Render/WithSmoke.cs Normal file
View File

@@ -0,0 +1,47 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
public class WithSmokeInfo : ITraitInfo, Requires<RenderSimpleInfo>
{
public object Create(ActorInitializer init) { return new WithSmoke(init.self); }
}
public class WithSmoke : INotifyDamage
{
bool isSmoking;
Animation anim;
public WithSmoke(Actor self)
{
var rs = self.Trait<RenderSimple>();
anim = new Animation("smoke_m");
rs.anims.Add("smoke", new RenderSimple.AnimationWithOffset(
anim, null, () => !isSmoking));
}
public void Damaged(Actor self, AttackInfo e)
{
if (isSmoking) return;
if (e.DamageState < DamageState.Heavy) return;
isSmoking = true;
anim.PlayThen( "idle",
() => anim.PlayThen( "loop",
() => anim.PlayBackwardsThen( "end",
() => isSmoking = false ) ) );
}
}
}