This commit is contained in:
Matthias Mailänder
2014-06-21 21:15:14 +02:00
parent 69ddcf3fee
commit d3d74c4e5f
2 changed files with 10 additions and 10 deletions

View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Activities
class LayMines : Activity
{
public override Activity Tick( Actor self )
public override Activity Tick(Actor self)
{
if (IsCanceled) return NextActivity;
@@ -40,21 +40,21 @@ namespace OpenRA.Mods.RA.Activities
movement.MoveTo(rearmTarget.CenterPosition.ToCPos(), rearmTarget),
new Rearm(self),
new Repair(rearmTarget),
this );
this);
}
var ml = self.Trait<Minelayer>();
if (ml.minefield.Contains(self.Location) &&
if (ml.Minefield.Contains(self.Location) &&
ShouldLayMine(self, self.Location))
{
LayMine(self);
return Util.SequenceActivities( new Wait(20), this ); // a little wait after placing each mine, for show
return Util.SequenceActivities(new Wait(20), this); // a little wait after placing each mine, for show
}
if (ml.minefield.Length > 0)
if (ml.Minefield.Length > 0)
for (var n = 0; n < 20; n++) // dont get stuck forever here
{
var p = ml.minefield.Random(self.World.SharedRandom);
var p = ml.Minefield.Random(self.World.SharedRandom);
if (ShouldLayMine(self, p))
return Util.SequenceActivities( movement.MoveTo(p, 0), this );
}

View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA
class Minelayer : IIssueOrder, IResolveOrder, IPostRenderSelection, ISync
{
/* [Sync] when sync can cope with arrays! */
public CPos[] minefield = null;
public CPos[] Minefield = null;
[Sync] CPos minefieldStart;
Actor self;
Sprite tile;
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA
{
var movement = self.Trait<IPositionable>();
minefield = GetMinefieldCells(minefieldStart, order.TargetLocation,
Minefield = GetMinefieldCells(minefieldStart, order.TargetLocation,
self.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)
.Where(p => movement.CanEnterCell(p)).ToArray();
@@ -98,11 +98,11 @@ namespace OpenRA.Mods.RA
public void RenderAfterWorld(WorldRenderer wr)
{
if (self.Owner != self.World.LocalPlayer || minefield == null)
if (self.Owner != self.World.LocalPlayer || Minefield == null)
return;
var pal = wr.Palette("terrain");
foreach (var c in minefield)
foreach (var c in Minefield)
new SpriteRenderable(tile, c.CenterPosition,
WVec.Zero, -511, pal, 1f, true).Render(wr);
}