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

Fix dock sequence dock/undock notifications

Browse Source 
- move Refinery dock/undock notifications to OnStateDock/-Undock
and only call Undock if Dock was also called.
- Add INotifyHarvesterAction support to VoxelHarvesterDockSequence.
This commit is contained in:
reaperrr
2020-11-14 13:31:38 +01:00
committed by abcdefg30
parent 6bba35c330
commit 05cb9b1fbf
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Cnc/Activities/VoxelHarvesterDockSequence.cs
View File

@@ -11,6 +11,7 @@
using OpenRA.Mods.Cnc.Traits.Render; using OpenRA.Mods.Cnc.Traits.Render;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Cnc.Activities namespace OpenRA.Mods.Cnc.Activities
{ {
@@ -29,6 +30,10 @@ namespace OpenRA.Mods.Cnc.Activities
public override void OnStateDock(Actor self) public override void OnStateDock(Actor self)
{ {
body.Docked = true; body.Docked = true;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Docked();
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Docked(Refinery, self);
if (spriteOverlay != null && !spriteOverlay.Visible) if (spriteOverlay != null && !spriteOverlay.Visible)
{ {
@@ -57,12 +62,26 @@ namespace OpenRA.Mods.Cnc.Activities
dockingState = DockingState.Complete; dockingState = DockingState.Complete;
body.Docked = false; body.Docked = false;
spriteOverlay.Visible = false; spriteOverlay.Visible = false;
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);
}); });
} }
else else
{ {
dockingState = DockingState.Complete; dockingState = DockingState.Complete;
body.Docked = false; body.Docked = false;
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);
} }
} }
} }

9
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -70,12 +70,7 @@ namespace OpenRA.Mods.Common.Activities
case DockingState.Dock: case DockingState.Dock:
if (!IsCanceling && Refinery.IsInWorld && !Refinery.IsDead) if (!IsCanceling && Refinery.IsInWorld && !Refinery.IsDead)
{
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Docked(Refinery, self);
OnStateDock(self); OnStateDock(self);
}
else else
dockingState = DockingState.Undock; dockingState = DockingState.Undock;
@@ -92,10 +87,6 @@ namespace OpenRA.Mods.Common.Activities
return false; return false;
case DockingState.Complete: case DockingState.Complete:
if (Refinery.IsInWorld && !Refinery.IsDead)
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Undocked(Refinery, self);
Harv.LastLinkedProc = Harv.LinkedProc; Harv.LastLinkedProc = Harv.LinkedProc;
Harv.LinkProc(self, null); Harv.LinkProc(self, null);
if (IsDragRequired) if (IsDragRequired)

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

@@ -31,6 +31,8 @@ namespace OpenRA.Mods.Common.Activities
{ {
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>())
nd.Docked(Refinery, self);
wsb.PlayCustomAnimation(self, wda.DockSequence, () => wsb.PlayCustomAnimationRepeating(self, wda.DockLoopSequence)); wsb.PlayCustomAnimation(self, wda.DockSequence, () => wsb.PlayCustomAnimationRepeating(self, wda.DockLoopSequence));
dockAnimPlayed = true; dockAnimPlayed = true;
@@ -53,6 +55,10 @@ namespace OpenRA.Mods.Common.Activities
dockingState = DockingState.Complete; dockingState = DockingState.Complete;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>()) foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Undocked(); trait.Undocked();
if (Refinery.IsInWorld && !Refinery.IsDead)
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Undocked(Refinery, self);
}); });
} }
} }