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

Make WithDockingAnimation optional

Browse Source 
The `Refinery` trait has a hardcoded usage of `SpriteHarvesterDockSequence`, which requires the harvester to have `WithDockingAnimation`, making it inconvenient-at-best to NOT have a docking/unloading animation.
This commit is contained in:
penev92
2022-02-23 19:47:18 +02:00
committed by abcdefg30
parent fa8bfc6ca0
commit 57d3321d0f
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Mods.Common/Activities/SpriteHarvesterDockSequence.cs
View File

@@ -24,17 +24,20 @@ namespace OpenRA.Mods.Common.Activities
: base(self, refinery, dockAngle, isDragRequired, dragOffset, dragLength) : base(self, refinery, dockAngle, isDragRequired, dragOffset, dragLength)
{ {
wsb = self.Trait<WithSpriteBody>(); wsb = self.Trait<WithSpriteBody>();
wda = self.Info.TraitInfo<WithDockingAnimationInfo>(); wda = self.Info.TraitInfoOrDefault<WithDockingAnimationInfo>();
} }
public override void OnStateDock(Actor self) public override void OnStateDock(Actor self)
{ {
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>()) foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Docked(); trait.Docked();
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>()) foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Docked(Refinery, self); nd.Docked(Refinery, self);
wsb.PlayCustomAnimation(self, wda.DockSequence, () => wsb.PlayCustomAnimationRepeating(self, wda.DockLoopSequence)); if (wda != null)
wsb.PlayCustomAnimation(self, wda.DockSequence, () => wsb.PlayCustomAnimationRepeating(self, wda.DockLoopSequence));
dockAnimPlayed = true; dockAnimPlayed = true;
dockingState = DockingState.Loop; dockingState = DockingState.Loop;
} }
@@ -49,17 +52,22 @@ namespace OpenRA.Mods.Common.Activities
} }
dockingState = DockingState.Wait; dockingState = DockingState.Wait;
wsb.PlayCustomAnimationBackwards(self, wda.DockSequence,
() =>
{
dockingState = DockingState.Complete;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Undocked();
if (Refinery.IsInWorld && !Refinery.IsDead) if (wda == null)
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>()) NotifyUndock(self);
nd.Undocked(Refinery, self); else
}); wsb.PlayCustomAnimationBackwards(self, wda.DockSequence, () => NotifyUndock(self));
}
void NotifyUndock(Actor self)
{
dockingState = DockingState.Complete;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Undocked();
if (Refinery.IsInWorld && !Refinery.IsDead)
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Undocked(Refinery, self);
} }
} }
} }