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

Fix warfactory roof glitch

Browse Source
This commit is contained in:
Paul Chote
2011-04-17 20:02:02 +12:00
parent 5adc90a76e
commit a0941db61b
5 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.RA/Activities/MakeAnimation.cs
View File

@@ -13,17 +13,20 @@ using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using System;
namespace OpenRA.Mods.RA.Activities
{
class MakeAnimation : Activity
{
readonly bool Reversed;
readonly Action OnComplete;
public MakeAnimation(Actor self) : this(self, false) {}
public MakeAnimation(Actor self, bool reversed)
public MakeAnimation(Actor self, Action onComplete) : this(self, false, onComplete) {}
public MakeAnimation(Actor self, bool reversed, Action onComplete)
{
Reversed = reversed;
OnComplete = onComplete;
}
bool complete = false;
@@ -41,11 +44,10 @@ namespace OpenRA.Mods.RA.Activities
foreach (var s in bi.SellSounds)
Sound.PlayToPlayer(self.Owner, s, self.CenterLocation);
// PlayCustomAnim is required to stop a frame of the normal state after the anim completes
rb.PlayCustomAnimBackwards(self, "make", () => {rb.PlayCustomAnim(self, "make"); complete = true;});
rb.PlayCustomAnimBackwards(self, "make", () => { OnComplete(); complete = true;});
}
else
rb.PlayCustomAnimThen(self, "make", () => complete = true);
rb.PlayCustomAnimThen(self, "make", () => { OnComplete(); complete = true;});
}
return complete ? NextActivity : this;
}

8
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -47,11 +47,11 @@ namespace OpenRA.Mods.RA.Render
// Work around a bogus crash
anim.PlayRepeating( NormalizeSequence(self, "idle") );
// Can't call Complete() directly from ctor because other traits haven't been inited yet
if (self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation && !init.Contains<SkipMakeAnimsInit>())
self.QueueActivity(new MakeAnimation(self));
// Can't call Complete() from ctor because other traits haven't been inited yet
self.QueueActivity(new CallFunc(() => Complete(self)));
self.QueueActivity(new MakeAnimation(self, () => Complete(self)));
else
self.QueueActivity(new CallFunc(() => Complete(self)));
}
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)

8
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -45,17 +45,21 @@ namespace OpenRA.Mods.RA.Render
[Sync]
int2 openExit;
bool buildComplete;
public RenderBuildingWarFactory(ActorInitializer init, RenderBuildingInfo info)
: base(init, info)
{
roof = new Animation(GetImage(init.self));
var offset = new RenderSimple.AnimationWithOffset( roof ) { ZOffset = 24 };
offset.DisableFunc = () => !buildComplete;
anims.Add("roof", offset);
}
public void BuildingComplete( Actor self )
{
roof.Play(NormalizeSequence(self,
self.GetDamageState() > DamageState.Heavy ? "damaged-idle-top" : "idle-top"));
self.Trait<RenderSimple>().anims.Add( "roof", new RenderSimple.AnimationWithOffset( roof ) { ZOffset = 24 } );
buildComplete = true;
}
public override void Tick(Actor self)
@@ -89,7 +93,7 @@ namespace OpenRA.Mods.RA.Render
public void Selling(Actor self)
{
self.Trait<RenderSimple>().anims.Remove("roof");
anims.Remove("roof");
}
public void Sold(Actor self) { }

8
OpenRA.Mods.RA/Sellable.cs
View File

@@ -30,13 +30,15 @@ namespace OpenRA.Mods.RA
if (order.OrderString == "Sell" && !selling)
{
selling = true;
self.CancelActivity();
if (self.HasTrait<RenderBuilding>() && self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation)
self.QueueActivity(new MakeAnimation(self, true));
foreach( var ns in self.TraitsImplementing<INotifySold>() )
ns.Selling( self );
self.CancelActivity();
var rb = self.TraitOrDefault<RenderBuilding>();
if (rb != null && self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation)
self.QueueActivity(new MakeAnimation(self, true, () => rb.PlayCustomAnim(self, "make")));
self.QueueActivity(new Sell());
}
}

5
OpenRA.Mods.RA/Transforms.cs
View File

@@ -80,8 +80,9 @@ namespace OpenRA.Mods.RA
if (self.HasTrait<IFacing>())
self.QueueActivity(new Turn(Info.Facing));
if (self.HasTrait<RenderBuilding>() && self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation)
self.QueueActivity(new MakeAnimation(self, true));
var rb = self.TraitOrDefault<RenderBuilding>();
if (rb != null && self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation)
self.QueueActivity(new MakeAnimation(self, true, () => rb.PlayCustomAnim(self, "make")));
self.QueueActivity(new Transform(self, Info.IntoActor) {Offset = Info.Offset, Facing = Info.Facing, Sounds = Info.TransformSounds});
}