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

new trait WithMakeAnimation

Browse Source
This commit is contained in:
Matthias Mailänder
2014-07-03 20:46:38 +02:00
parent 87fd576b26
commit 394d635dae
22 changed files with 156 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,71 +0,0 @@
#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 System;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
{
class MakeAnimation : Activity
{
readonly bool Reversed;
readonly Action OnComplete;
RenderBuilding rb;
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;
bool started = false;
public override Activity Tick(Actor self)
{
if (self.IsDead())
return NextActivity;
if (started)
{
// Don't break the actor if someone has overriden the animation prematurely
if (rb.DefaultAnimation.CurrentSequence.Name != "make")
{
complete = true;
OnComplete();
}
return complete ? NextActivity : this;
}
started = true;
rb = self.Trait<RenderBuilding>();
if (Reversed)
{
// TODO: These don't belong here
var bi = self.Info.Traits.GetOrDefault<BuildingInfo>();
if (bi != null)
foreach (var s in bi.SellSounds)
Sound.PlayToPlayer(self.Owner, s, self.CenterPosition);
rb.PlayCustomAnimBackwards(self, "make", () => { OnComplete(); complete = true;});
}
else
rb.PlayCustomAnimThen(self, "make", () => { OnComplete(); complete = true;});
return this;
}
// Cannot be cancelled
public override void Cancel(Actor self) { }
}
}

4
OpenRA.Mods.RA/Activities/Transform.cs
View File

@@ -76,8 +76,8 @@ namespace OpenRA.Mods.RA.Activities
init.Add(new RuntimeCargoInit(cargo.Passengers.ToArray()));
var a = w.CreateActor(ToActor, init);
foreach (var nt in self.TraitsImplementing<INotifyTransformed>())
nt.OnTransformed(a);
foreach (var nt in self.TraitsImplementing<INotifyTransform>())
nt.AfterTransform(a);
if (selected)
w.Selection.Add(w, a);

23
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -34,8 +34,9 @@ namespace OpenRA.Mods.RA.Buildings
public readonly bool RequiresBaseProvider = false;
public readonly bool AllowInvalidPlacement = false;
public readonly string[] BuildSounds = {"placbldg.aud", "build5.aud"};
public readonly string[] SellSounds = {"cashturn.aud"};
public readonly string[] BuildSounds = { "placbldg.aud", "build5.aud" };
public readonly string[] SellSounds = { "cashturn.aud" };
public readonly string[] UndeploySounds = { "cashturn.aud" };
public object Create(ActorInitializer init) { return new Building(init, this); }
@@ -99,7 +100,7 @@ namespace OpenRA.Mods.RA.Buildings
}
}
public class Building : INotifyDamage, IOccupySpace, INotifyCapture, INotifyBuildComplete, INotifySold, ISync, ITechTreePrerequisite, INotifyAddedToWorld, INotifyRemovedFromWorld
public class Building : INotifyDamage, IOccupySpace, INotifyCapture, INotifyBuildComplete, INotifySold, INotifyTransform, ISync, ITechTreePrerequisite, INotifyAddedToWorld, INotifyRemovedFromWorld
{
public readonly BuildingInfo Info;
public bool BuildComplete { get; private set; }
@@ -185,7 +186,21 @@ namespace OpenRA.Mods.RA.Buildings
Locked = false;
}
public void Selling(Actor self) { BuildComplete = false; }
public void Selling(Actor self)
{
foreach (var s in Info.SellSounds)
Sound.PlayToPlayer(self.Owner, s, self.CenterPosition);
BuildComplete = false;
}
public void Sold(Actor self) { }
public void BeforeTransform(Actor self)
{
foreach (var s in Info.UndeploySounds)
Sound.PlayToPlayer(self.Owner, s, self.CenterPosition);
}
public void OnTransform(Actor self) { }
public void AfterTransform(Actor self) { }
}
}

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

@@ -100,7 +100,6 @@
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\MakeAnimation.cs" />
<Compile Include="Activities\MoveAdjacentTo.cs" />
<Compile Include="Activities\RAHarvesterDockSequence.cs" />
<Compile Include="Activities\Rearm.cs" />
@@ -519,6 +518,7 @@
<Compile Include="Lint\CheckMapCordon.cs" />
<Compile Include="World\ResourceLayer.cs" />
<Compile Include="Parachutable.cs" />
<Compile Include="Render\WithMakeAnimation.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

3
OpenRA.Mods.RA/Player/ProductionQueue.cs
View File

@@ -140,7 +140,10 @@ namespace OpenRA.Mods.RA
public void Killed(Actor killed, AttackInfo e) { if (killed == self) ClearQueue(); }
public void Selling(Actor self) { }
public void Sold(Actor self) { ClearQueue(); }
public void BeforeTransform(Actor self) { }
public void OnTransform(Actor self) { ClearQueue(); }
public void AfterTransform(Actor self) { }
void CacheProduceables(Actor playerActor)
{

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

@@ -19,7 +19,6 @@ namespace OpenRA.Mods.RA.Render
{
public class RenderBuildingInfo : RenderSimpleInfo, Requires<BuildingInfo>, IPlaceBuildingDecoration
{
public readonly bool HasMakeAnimation = true;
public readonly bool PauseOnLowPower = false;
public override object Create(ActorInitializer init) { return new RenderBuilding(init, this);}
@@ -34,9 +33,11 @@ namespace OpenRA.Mods.RA.Render
}
}
public class RenderBuilding : RenderSimple, INotifyDamageStateChanged
public class RenderBuilding : RenderSimple, INotifyDamageStateChanged, INotifyBuildComplete
{
RenderBuildingInfo info;
bool buildComplete;
bool skipMakeAnimation;
public RenderBuilding(ActorInitializer init, RenderBuildingInfo info)
: this(init, info, () => 0) { }
@@ -46,24 +47,27 @@ namespace OpenRA.Mods.RA.Render
{
var self = init.self;
this.info = info;
skipMakeAnimation = init.Contains<SkipMakeAnimsInit>();
// Work around a bogus crash
DefaultAnimation.PlayRepeating(NormalizeSequence(self, "idle"));
self.Trait<IBodyOrientation>().SetAutodetectedFacings(DefaultAnimation.CurrentSequence.Facings);
// 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, () => Complete(self)));
else
self.QueueActivity(new CallFunc(() => Complete(self)));
}
void Complete(Actor self)
public override void TickRender(WorldRenderer wr, Actor self)
{
DefaultAnimation.PlayRepeating(NormalizeSequence(self, "idle"));
foreach (var x in self.TraitsImplementing<INotifyBuildComplete>())
x.BuildingComplete(self);
base.TickRender(wr, self);
if (buildComplete)
return;
buildComplete = true;
if (!self.HasTrait<WithMakeAnimation>() || skipMakeAnimation)
foreach (var notify in self.TraitsImplementing<INotifyBuildComplete>())
notify.BuildingComplete(self);
}
public virtual void BuildingComplete(Actor self)
{
if (info.PauseOnLowPower)
{
var disabled = self.TraitsImplementing<IDisable>();

2
OpenRA.Mods.RA/Render/RenderBuildingSilo.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Render
playerResources = init.self.Owner.PlayerActor.Trait<PlayerResources>();
}
public void BuildingComplete(Actor self)
public override void BuildingComplete(Actor self)
{
var animation = (self.GetDamageState() >= DamageState.Heavy) ? "damaged-idle" : "idle";

5
OpenRA.Mods.RA/Render/RenderBuildingWall.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Render
public override object Create(ActorInitializer init) { return new RenderBuildingWall(init, this); }
}
class RenderBuildingWall : RenderBuilding, INotifyBuildComplete, INotifyAddedToWorld, INotifyRemovedFromWorld
class RenderBuildingWall : RenderBuilding, INotifyAddedToWorld, INotifyRemovedFromWorld
{
readonly RenderBuildingWallInfo info;
int adjacent = 0;
@@ -34,9 +34,10 @@ namespace OpenRA.Mods.RA.Render
this.info = info;
}
public void BuildingComplete(Actor self)
public override void BuildingComplete(Actor self)
{
DefaultAnimation.PlayFetchIndex(info.Sequence, () => adjacent);
UpdateNeighbours(self);
}
public override void DamageStateChanged(Actor self, AttackInfo e)

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

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.RA.Render
() => !buildComplete, offset));
}
public void BuildingComplete( Actor self )
public override void BuildingComplete(Actor self)
{
roof.Play(NormalizeSequence(self,
self.GetDamageState() > DamageState.Heavy ? "damaged-idle-top" : "idle-top"));

64
OpenRA.Mods.RA/Render/WithMakeAnimation.cs Normal file
View File

@@ -0,0 +1,64 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 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 System;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
public class WithMakeAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "make";
public object Create(ActorInitializer init) { return new WithMakeAnimation(init, this); }
}
public class WithMakeAnimation : ITickRender
{
WithMakeAnimationInfo info;
RenderBuilding building;
bool buildComplete;
public WithMakeAnimation(ActorInitializer init, WithMakeAnimationInfo info)
{
building = init.self.Trait<RenderBuilding>();
this.info = info;
buildComplete = init.Contains<SkipMakeAnimsInit>();
}
public void TickRender(WorldRenderer wr, Actor self)
{
if (self.IsDead() || buildComplete)
return;
buildComplete = true;
building.PlayCustomAnimThen(self, info.Sequence, () =>
{
foreach (var notify in self.TraitsImplementing<INotifyBuildComplete>())
notify.BuildingComplete(self);
});
}
public void Reverse(Actor self, Activity activity)
{
building.PlayCustomAnimBackwards(self, info.Sequence, () => {
building.PlayCustomAnim(self, info.Sequence); // avoids visual glitches as we wait for the actor to get destroyed
self.QueueActivity(activity);
});
}
}
}

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

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2014 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,
@@ -34,15 +34,16 @@ namespace OpenRA.Mods.RA
if (!self.Trait<Building>().Lock())
return;
self.CancelActivity();
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());
var makeAnimation = self.TraitOrDefault<WithMakeAnimation>();
if (makeAnimation != null)
makeAnimation.Reverse(self, new Sell());
else
self.QueueActivity(new Sell());
}
}
}

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

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2014 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,
@@ -47,8 +47,7 @@ namespace OpenRA.Mods.RA
}
public interface INotifyParachuteLanded { void OnLanded(); }
public interface INotifyTransform { void OnTransform(Actor self); }
public interface INotifyTransformed { void OnTransformed(Actor toActor); }
public interface INotifyTransform { void BeforeTransform(Actor self); void OnTransform(Actor self); void AfterTransform(Actor toActor); }
public interface INotifyAttack { void Attacking(Actor self, Target target, Armament a, Barrel barrel); }
public interface INotifyChat { bool OnChat(string from, string message); }
}

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

@@ -88,11 +88,15 @@ namespace OpenRA.Mods.RA
if (self.HasTrait<IFacing>())
self.QueueActivity(new Turn(info.Facing));
var rb = self.TraitOrDefault<RenderBuilding>();
if (rb != null && self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation)
self.QueueActivity(new MakeAnimation(self, true, () => rb.PlayCustomAnim(self, "make")));
foreach (var nt in self.TraitsImplementing<INotifyTransform>())
nt.BeforeTransform(self);
self.QueueActivity(new Transform(self, info.IntoActor) { Offset = info.Offset, Facing = info.Facing, Sounds = info.TransformSounds, Race = race });
var transform = new Transform(self, info.IntoActor) { Offset = info.Offset, Facing = info.Facing, Sounds = info.TransformSounds, Race = race };
var makeAnimation = self.TraitOrDefault<WithMakeAnimation>();
if (makeAnimation != null)
makeAnimation.Reverse(self, transform);
else
self.QueueActivity(transform);
}
public void ResolveOrder(Actor self, Order order)