This commit is contained in:
Chris Forbes
2009-11-08 13:53:43 +13:00
parent 77b4673e7c
commit d954b22f65
5 changed files with 30 additions and 9 deletions

View File

@@ -49,6 +49,11 @@ namespace OpenRa.Game.Graphics
frame = f % CurrentSequence.Length;
}
public void ReplaceAnim(string sequenceName)
{
CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
}
public void PlayThen( string sequenceName, Action after )
{
backwards = false;

View File

@@ -59,7 +59,7 @@ namespace OpenRa.Game.Traits
yield return Pair.New(anim.Image, 24f * (float2)self.Location);
}
void INotifyDamage.Damaged(Actor self, DamageState state)
public virtual void Damaged(Actor self, DamageState state)
{
switch( state )
{

View File

@@ -5,7 +5,7 @@ using System.Text;
namespace OpenRa.Game.Traits
{
class RenderBuildingTurreted : RenderBuilding, INotifyDamage
class RenderBuildingTurreted : RenderBuilding
{
public RenderBuildingTurreted(Actor self)
: base(self)
@@ -19,7 +19,7 @@ namespace OpenRa.Game.Traits
() => self.traits.Get<Turreted>().turretFacing / 8);
}
void INotifyDamage.Damaged(Actor self, DamageState ds)
public override void Damaged(Actor self, DamageState ds)
{
switch (ds)
{

View File

@@ -13,6 +13,7 @@ namespace OpenRa.Game.Traits
bool doneBuilding;
bool isOpen;
public readonly Actor self;
string prefix = "";
public RenderWarFactory(Actor self)
: base(self)
@@ -24,7 +25,7 @@ namespace OpenRa.Game.Traits
{
doneBuilding = true;
anim.Play("idle");
roof.Play("idle-top");
roof.Play(prefix + "idle-top");
});
}
@@ -46,15 +47,30 @@ namespace OpenRa.Game.Traits
new float2(b.Right, b.Bottom)).Any(a => a.traits.Contains<Mobile>()))
{
isOpen = false;
roof.PlayBackwardsThen("build-top", () => roof.Play("idle-top"));
roof.PlayBackwardsThen(prefix + "build-top", () => roof.Play(prefix + "idle-top"));
}
}
public void EjectUnit()
{
/* todo: hold the door open */
roof.PlayThen(prefix + "build-top", () => isOpen = true);
}
roof.PlayThen("build-top", () => isOpen = true);
public override void Damaged(Actor self, DamageState ds)
{
base.Damaged(self, ds);
switch (ds)
{
case DamageState.Normal:
prefix = "";
roof.ReplaceAnim(roof.CurrentSequence.Name.Replace("damaged-",""));
break;
case DamageState.Half:
prefix = "damaged-";
roof.ReplaceAnim("damaged-" + roof.CurrentSequence.Name);
break;
}
}
}
}

View File

@@ -107,9 +107,9 @@
<sequence name="damaged-idle" start="1" />
<sequence name="make" start="0" length="*" src="weapmake" />
<sequence name="build-top" start="0" length="4" src="weap2" />
<sequence name="build2-top" start="4" length="4" src="weap2" />
<sequence name="damaged-build-top" start="4" length="4" src="weap2" />
<sequence name="idle-top" start="0" length="1" src="weap2" />
<sequence name="damaged-idle_top" start="4" length="1" src="weap2" />
<sequence name="damaged-idle-top" start="4" length="1" src="weap2" />
</unit>
<!-- helipad -->
<unit name="hpad">