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

Add WithHarvesterSpriteBody

Browse Source 
And move PrefixByFullness there.
Also put it into Mods.Cnc, as RA is the only shipping mod
using this.
This commit is contained in:
reaperrr
2019-03-09 03:55:28 +01:00
committed by abcdefg30
parent 840eb7006d
commit 0eb0a5a2bd
8 changed files with 139 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenRA.Mods.Common/Traits/Render/WithHarvestAnimation.cs
View File

@@ -17,9 +17,6 @@ namespace OpenRA.Mods.Common.Traits.Render
{
public class WithHarvestAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<HarvesterInfo>
{
[Desc("Prefix added to idle and harvest sequences depending on fullness of harvester.")]
[SequenceReference(null, true)] public readonly string[] PrefixByFullness = { "" };
[Desc("Displayed while harvesting.")]
[SequenceReference] public readonly string HarvestSequence = "harvest";
@@ -29,64 +26,26 @@ namespace OpenRA.Mods.Common.Traits.Render
public object Create(ActorInitializer init) { return new WithHarvestAnimation(init, this); }
}
public class WithHarvestAnimation : ITick, INotifyHarvesterAction
public class WithHarvestAnimation : INotifyHarvesterAction
{
public readonly WithHarvestAnimationInfo Info;
readonly WithSpriteBody wsb;
readonly Harvester harv;
// TODO: Remove this once WithSpriteBody has its own replacement
public bool IsModifying;
public WithHarvestAnimation(ActorInitializer init, WithHarvestAnimationInfo info)
{
Info = info;
harv = init.Self.Trait<Harvester>();
wsb = init.Self.TraitsImplementing<WithSpriteBody>().Single(w => w.Info.Name == Info.Body);
}
protected virtual string NormalizeHarvesterSequence(Actor self, string baseSequence)
{
var desiredState = harv.Fullness * (Info.PrefixByFullness.Length - 1) / 100;
var desiredPrefix = Info.PrefixByFullness[desiredState];
if (wsb.DefaultAnimation.HasSequence(desiredPrefix + baseSequence))
return desiredPrefix + baseSequence;
else
return baseSequence;
}
void ITick.Tick(Actor self)
{
var baseSequence = wsb.NormalizeSequence(self, wsb.Info.Sequence);
var sequence = NormalizeHarvesterSequence(self, baseSequence);
if (!IsModifying && wsb.DefaultAnimation.HasSequence(sequence) && wsb.DefaultAnimation.CurrentSequence.Name != sequence)
wsb.DefaultAnimation.ReplaceAnim(sequence);
}
void INotifyHarvesterAction.Harvested(Actor self, ResourceType resource)
{
var baseSequence = wsb.NormalizeSequence(self, Info.HarvestSequence);
var sequence = NormalizeHarvesterSequence(self, baseSequence);
if (!IsModifying && wsb.DefaultAnimation.HasSequence(sequence))
{
IsModifying = true;
wsb.PlayCustomAnimation(self, sequence, () => IsModifying = false);
}
}
// If IsModifying isn't set to true, the docking animation
// will be overridden by the WithHarvestAnimation fullness modifier.
void INotifyHarvesterAction.Docked()
{
IsModifying = true;
}
void INotifyHarvesterAction.Undocked()
{
IsModifying = false;
var sequence = wsb.NormalizeSequence(self, Info.HarvestSequence);
if (wsb.DefaultAnimation.HasSequence(sequence) && wsb.DefaultAnimation.CurrentSequence.Name != sequence)
wsb.PlayCustomAnimation(self, sequence);
}
void INotifyHarvesterAction.Docked() { }
void INotifyHarvesterAction.Undocked() { }
void INotifyHarvesterAction.MovingToResources(Actor self, CPos targetCell, Activity next) { }
void INotifyHarvesterAction.MovingToRefinery(Actor self, Actor refineryActor, Activity next) { }
void INotifyHarvesterAction.MovementCancelled(Actor self) { }