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

remove spurious constructor from MoveAdjacentTo

Browse Source
This commit is contained in:
Chris Forbes
2011-09-17 11:24:39 +12:00
parent 24c74dcdd9
commit 9480846250
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,29 +60,30 @@ namespace OpenRA.Mods.RA
var li = self.TraitOrDefault<LimitedAmmo>();
return (Health.DamageState > DamageState.Undamaged || (li != null && !li.FullAmmo()) );
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "Repair" && CanRepair()) ? "Move" : null;
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "Repair")
{
if( !CanRepairAt( order.TargetActor ) || !CanRepair() )
return;
var mobile = self.Trait<Mobile>();
var rp = order.TargetActor.TraitOrDefault<RallyPoint>();
self.SetTargetLine(Target.FromOrder(order), Color.Green);
var target = Target.FromOrder(order);
self.SetTargetLine(target, Color.Green);
self.CancelActivity();
self.QueueActivity(new MoveAdjacentTo(order.TargetActor));
self.QueueActivity(new MoveAdjacentTo(target));
self.QueueActivity(mobile.MoveTo(Traits.Util.CellContaining(order.TargetActor.CenterLocation), order.TargetActor));
self.QueueActivity(new Rearm(self));
self.QueueActivity(new Repair(order.TargetActor));
var rp = order.TargetActor.TraitOrDefault<RallyPoint>();
if (rp != null)
self.QueueActivity(new CallFunc(() =>
{