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

Added IDisableMove

Browse Source
This commit is contained in:
atlimit8
2014-10-02 14:23:32 -05:00
parent cead66668f
commit 3f6e1a608a
15 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.RA/Move/Drag.cs
View File

@@ -9,18 +9,25 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Move
{
public class Drag : Activity
{
readonly IPositionable positionable;
readonly IMove movement;
readonly IEnumerable<IDisableMove> moveDisablers;
WPos start, end;
int length;
int ticks = 0;
public Drag(WPos start, WPos end, int length)
public Drag(Actor self, WPos start, WPos end, int length)
{
positionable = self.Trait<IPositionable>();
movement = self.TraitOrDefault<IMove>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
this.start = start;
this.end = end;
this.length = length;
@@ -28,8 +35,8 @@ namespace OpenRA.Mods.RA.Move
public override Activity Tick(Actor self)
{
var positionable = self.Trait<IPositionable>();
var movement = self.TraitOrDefault<IMove>();
if (moveDisablers.Any(d => d.MoveDisabled(self)))
return this;
var pos = length > 1
? WPos.Lerp(start, end, ticks, length - 1)

2
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -695,7 +695,7 @@ namespace OpenRA.Mods.RA.Move
var length = speed > 0 ? (toPos - fromPos).Length / speed : 0;
var facing = Util.GetFacing(toPos - fromPos, Facing);
return Util.SequenceActivities(new Turn(facing), new Drag(fromPos, toPos, length));
return Util.SequenceActivities(new Turn(self, facing), new Drag(self, fromPos, toPos, length));
}
}
}

2
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Mods.RA.Move
if (firstFacing != mobile.Facing)
{
path.Add(nextCell.Value.First);
return Util.SequenceActivities(new Turn(firstFacing), this);
return Util.SequenceActivities(new Turn(self, firstFacing), this);
}
else
{