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

Remove a pile of duplication from target lines.

Browse Source 
Remove MoveFlash.
This commit is contained in:
Paul Chote
2010-11-26 14:30:33 +13:00
parent 5f43923b80
commit b423889c06
21 changed files with 62 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Activities/UnloadCargo.cs
View File

@@ -73,12 +73,7 @@ namespace OpenRA.Mods.RA.Activities
mobile.SetPosition(actor, self.Location);
actor.CancelActivity();
actor.QueueActivity(mobile.MoveTo(exitTile.Value, 0));
if (actor.Owner == self.World.LocalPlayer)
{
var line = actor.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTargetSilently(self, Target.FromCell(exitTile.Value), Color.Green);
}
actor.SetTargetLine(Target.FromCell(exitTile.Value), Color.Green, false);
});
return this;

21
OpenRA.Mods.RA/Air/Helicopter.cs
View File

@@ -78,17 +78,8 @@ namespace OpenRA.Mods.RA.Air
if (order.OrderString == "Move")
{
var target = order.TargetLocation.Clamp(self.World.Map.Bounds);
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new MoveFlash(self.World, order.TargetLocation));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromCell(target), Color.Green);
});
self.SetTargetLine(Target.FromCell(target), Color.Green);
self.CancelActivity();
self.QueueActivity(new HeliFly(Util.CenterOfCell(target)));
@@ -109,15 +100,7 @@ namespace OpenRA.Mods.RA.Air
var exit = order.TargetActor.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault();
var offset = exit != null ? exit.SpawnOffset : int2.Zero;
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromActor(order.TargetActor), Color.Green);
});
self.SetTargetLine(Target.FromActor(order.TargetActor), Color.Green);
self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));

22
OpenRA.Mods.RA/Air/Plane.cs
View File

@@ -92,16 +92,7 @@ namespace OpenRA.Mods.RA.Air
UnReserve();
var target = order.TargetLocation.Clamp(self.World.Map.Bounds);
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new MoveFlash(self.World, order.TargetLocation));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromCell(target), Color.Green);
});
self.SetTargetLine(Target.FromCell(target), Color.Green);
self.CancelActivity();
self.QueueActivity(Fly.ToCell(target));
}
@@ -113,16 +104,7 @@ namespace OpenRA.Mods.RA.Air
UnReserve();
var info = self.Info.Traits.Get<PlaneInfo>();
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromActor(order.TargetActor), Color.Green);
});
self.SetTargetLine(Target.FromOrder(order), Color.Green);
self.CancelActivity();
self.QueueActivity(new ReturnToBase(self, order.TargetActor));

13
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -177,18 +177,7 @@ namespace OpenRA.Mods.RA
{
if( !target.IsValid ) return;
self.QueueActivity(queued, GetAttackActivity(self, target, allowMove));
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
if (target.IsActor)
w.Add(new FlashTarget(target.Actor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, target, Color.Red);
});
self.SetTargetLine(target, Color.Red);
}
public void ScanAndAttack(Actor self, bool allowMovement, bool holdStill)

15
OpenRA.Mods.RA/AttackMove.cs
View File

@@ -52,19 +52,8 @@ namespace OpenRA.Mods.RA
AttackMoving = true;
TargetLocation = order.TargetLocation;
}
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
if (order.TargetActor != null)
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
if (order.TargetActor != null) line.SetTarget(self, Target.FromOrder(order), Color.Red);
else line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.SetTargetLine(Target.FromOrder(order), Color.Red);
}
else
{

10
OpenRA.Mods.RA/C4Demolition.cs
View File

@@ -43,15 +43,7 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "C4")
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.SetTargetLine(Target.FromOrder(order), Color.Red);
var mobile = self.Trait<Mobile>();
self.CancelActivity();

1
OpenRA.Mods.RA/ChronoshiftDeploy.cs
View File

@@ -55,7 +55,6 @@ namespace OpenRA.Mods.RA
if (self.Owner == self.World.LocalPlayer)
{
self.World.CancelInputMode();
self.World.AddFrameEndTask(w => w.Add(new MoveFlash(self.World, order.TargetLocation)));
}
self.CancelActivity();

12
OpenRA.Mods.RA/EngineerCapture.cs
View File

@@ -47,16 +47,8 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "CaptureBuilding")
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.SetTargetLine(Target.FromOrder(order), Color.Red);
self.CancelActivity();
self.QueueActivity(new Enter(order.TargetActor));
//self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));

12
OpenRA.Mods.RA/EngineerRepair.cs
View File

@@ -46,16 +46,8 @@ namespace OpenRA.Mods.RA
if (order.OrderString == "EngineerRepair"
&& order.TargetActor.GetDamageState() > DamageState.Undamaged)
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Yellow);
});
self.SetTargetLine(Target.FromOrder(order), Color.Yellow);
self.CancelActivity();
self.QueueActivity(new Enter(order.TargetActor));
//self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));

22
OpenRA.Mods.RA/Harvester.cs
View File

@@ -123,15 +123,7 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "Harvest")
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new MoveFlash(self.World, order.TargetLocation));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Red);
});
self.SetTargetLine(Target.FromOrder(order), Color.Red);
var mobile = self.Trait<Mobile>();
self.CancelActivity();
@@ -151,16 +143,8 @@ namespace OpenRA.Mods.RA
if (IsEmpty)
return;
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.SetTargetLine(Target.FromOrder(order), Color.Green);
self.CancelActivity();
self.QueueActivity(new DeliverResources());
}

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

@@ -192,17 +192,7 @@ namespace OpenRA.Mods.RA.Move
qa.Insert(new Move(currentLocation, 8));
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(
w =>
{
if (self.Destroyed) return;
w.Add(new MoveFlash(self.World, targetLocation));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromCell(currentLocation),
Color.Green);
});
self.SetTargetLine(Target.FromCell(currentLocation), Color.Green);
});
self.QueueActivity(queued ? ph : ph.Run(self));
@@ -352,14 +342,7 @@ namespace OpenRA.Mods.RA.Move
if (moveTo.HasValue)
{
self.CancelActivity();
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTargetSilently(self, Target.FromCell(moveTo.Value), Color.Green);
});
self.SetTargetLine(Target.FromCell(moveTo.Value), Color.Green, false);
self.QueueActivity(new Move(moveTo.Value, 0));
Log.Write("debug", "OnNudge #{0} from {1} to {2}",

9
OpenRA.Mods.RA/OreRefineryDockAction.cs
View File

@@ -44,14 +44,7 @@ namespace OpenRA.Mods.RA
{
var mobile = harv.Trait<Mobile>();
harv.QueueActivity( mobile.MoveTo(harvester.LastHarvestedCell, 5) );
if (harv.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask( w =>
{
if (harv.Destroyed) return;
var line = harv.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTargetSilently(harv, Target.FromCell(harvester.LastHarvestedCell), Color.Green);
});
harv.SetTargetLine(Target.FromCell(harvester.LastHarvestedCell), Color.Red, false);
}
harv.QueueActivity( new Harvest() );
});

12
OpenRA.Mods.RA/Passenger.cs
View File

@@ -78,16 +78,8 @@ namespace OpenRA.Mods.RA
if (!CanEnter(order.TargetActor)) return;
if (!IsCorrectCargoType(order.TargetActor)) return;
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.SetTargetLine(Target.FromOrder(order), Color.Green);
var mobile = self.Trait<Mobile>();
self.CancelActivity();
self.QueueActivity(mobile.MoveTo(order.TargetActor.Location, 1));

11
OpenRA.Mods.RA/Production.cs
View File

@@ -76,16 +76,7 @@ namespace OpenRA.Mods.RA
newUnit.QueueActivity(mobile.MoveTo(target, 1));
}
if (newUnit.Owner == self.World.LocalPlayer)
{
self.World.AddFrameEndTask(w =>
{
var line = newUnit.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTargetSilently(newUnit, Target.FromCell(target), Color.Green);
});
}
newUnit.SetTargetLine(Target.FromCell(target), Color.Green, false);
foreach (var t in self.TraitsImplementing<INotifyProduction>())
t.UnitProduced(self, newUnit, exit);

20
OpenRA.Mods.RA/Repairable.cs
View File

@@ -75,25 +75,19 @@ namespace OpenRA.Mods.RA
var mobile = self.Trait<Mobile>();
var rp = order.TargetActor.TraitOrDefault<RallyPoint>();
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
{
if (self.Destroyed) return;
w.Add(new FlashTarget(order.TargetActor));
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTarget(self, Target.FromOrder(order), Color.Green);
});
self.SetTargetLine(Target.FromOrder(order), Color.Green);
self.CancelActivity();
self.QueueActivity(mobile.MoveTo(Traits.Util.CellContaining(order.TargetActor.CenterLocation), order.TargetActor));
self.QueueActivity(new Rearm());
self.QueueActivity(new Repair(order.TargetActor));
if (rp != null)
self.QueueActivity(new CallFunc(
() => self.QueueActivity(mobile.MoveTo(rp.rallyPoint, order.TargetActor))));
self.QueueActivity(new CallFunc(() =>
{
self.SetTargetLine(Target.FromCell(rp.rallyPoint), Color.Green);
self.QueueActivity(mobile.MoveTo(rp.rallyPoint, order.TargetActor));
}));
}
}
}

9
OpenRA.Mods.RA/RepairableNear.cs
View File

@@ -67,14 +67,7 @@ namespace OpenRA.Mods.RA
var mobile = self.Trait<Mobile>();
self.CancelActivity();
self.QueueActivity(mobile.MoveWithinRange(order.TargetActor, 1));
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask( w =>
{
if (self.Destroyed) return;
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTargetSilently(self, Target.FromActor(order.TargetActor), Color.Green);
});
self.SetTargetLine(Target.FromOrder(order), Color.Green, false);
self.QueueActivity(new Repair(order.TargetActor));
}
}

9
OpenRA.Mods.RA/Spy.cs
View File

@@ -40,14 +40,7 @@ namespace OpenRA.Mods.RA
{
self.CancelActivity();
self.QueueActivity(new MoveAdjacentTo(order.TargetActor));
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask( w =>
{
if (self.Destroyed) return;
var line = self.TraitOrDefault<DrawLineToTarget>();
if (line != null)
line.SetTargetSilently(self, Target.FromActor(order.TargetActor), Color.Green);
});
self.SetTargetLine(Target.FromOrder(order), Color.Red);
self.QueueActivity(new Infiltrate(order.TargetActor));
}
}