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

Make VisualMove uninterruptible by making Turn a Child of Drag.

Browse Source
This commit is contained in:
tovl
2019-07-27 22:02:59 +02:00
committed by teinarss
parent 207305e7d2
commit 8c7ff3b5b0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Activities/Move/Drag.cs
View File

@@ -23,17 +23,25 @@ namespace OpenRA.Mods.Common.Activities
WPos start, end; WPos start, end;
int length; int length;
int ticks = 0; int ticks = 0;
int desiredFacing;
public Drag(Actor self, WPos start, WPos end, int length) public Drag(Actor self, WPos start, WPos end, int length, int facing = -1)
{ {
positionable = self.Trait<IPositionable>(); positionable = self.Trait<IPositionable>();
disableable = self.TraitOrDefault<IMove>() as IDisabledTrait; disableable = self.TraitOrDefault<IMove>() as IDisabledTrait;
this.start = start; this.start = start;
this.end = end; this.end = end;
this.length = length; this.length = length;
desiredFacing = facing;
IsInterruptible = false; IsInterruptible = false;
} }
protected override void OnFirstRun(Actor self)
{
if (desiredFacing != -1)
QueueChild(new Turn(self, desiredFacing));
}
public override bool Tick(Actor self) public override bool Tick(Actor self)
{ {
if (disableable != null && disableable.IsTraitDisabled) if (disableable != null && disableable.IsTraitDisabled)

4
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -698,9 +698,7 @@ namespace OpenRA.Mods.Common.Traits
var delta = toPos - fromPos; var delta = toPos - fromPos;
var facing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : Facing; var facing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : Facing;
var activities = new Turn(self, facing); return new Drag(self, fromPos, toPos, length, facing);
activities.Queue(new Drag(self, fromPos, toPos, length));
return activities;
} }
CPos? ClosestGroundCell() CPos? ClosestGroundCell()