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

Enable frozen order: EngineerRepair.

Browse Source
This commit is contained in:
Paul Chote
2013-08-11 20:47:18 +12:00
parent ebd0c210d9
commit 2aed55f5f6
1 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,28 +28,58 @@ namespace OpenRA.Mods.RA
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if (order.OrderID == "EngineerRepair") if (order.OrderID != "EngineerRepair")
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor }; return null;
return null; if (target.Type == TargetType.FrozenActor)
return new Order(order.OrderID, self, queued) { ExtraData = target.FrozenActor.ID };
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
}
bool IsValidOrder(Actor self, Order order)
{
// Not targeting a frozen actor
if (order.ExtraData == 0 && order.TargetActor == null)
return false;
if (order.ExtraData != 0)
{
// Targeted an actor under the fog
var frozenLayer = self.Owner.PlayerActor.TraitOrDefault<FrozenActorLayer>();
if (frozenLayer == null)
return false;
var frozen = frozenLayer.FromID(order.ExtraData);
if (frozen == null)
return false;
return frozen.DamageState > DamageState.Undamaged;
}
return order.TargetActor.GetDamageState() > DamageState.Undamaged;
} }
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return (order.OrderString == "EngineerRepair" && return order.OrderString == "EngineerRepair" && IsValidOrder(self, order)
order.TargetActor.GetDamageState() > DamageState.Undamaged) ? "Attack" : null; ? "Attack" : null;
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "EngineerRepair" && if (order.OrderString != "EngineerRepair" || !IsValidOrder(self, order))
order.TargetActor.GetDamageState() > DamageState.Undamaged) return;
{
self.SetTargetLine(Target.FromOrder(order), Color.Yellow);
var target = self.ResolveFrozenActorOrder(order, Color.Yellow);
if (target.Type != TargetType.Actor)
return;
if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Enter(order.TargetActor, new RepairBuilding(order.TargetActor)));
} self.SetTargetLine(target, Color.Yellow);
self.QueueActivity(new Enter(target.Actor, new RepairBuilding(target.Actor)));
} }
class EngineerRepairOrderTargeter : UnitOrderTargeter class EngineerRepairOrderTargeter : UnitOrderTargeter
@@ -73,8 +103,16 @@ namespace OpenRA.Mods.RA
public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor) public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor)
{ {
// TODO: Not yet supported if (!target.Info.Traits.Contains<EngineerRepairable>())
return false; return false;
if (self.Owner.Stances[target.Owner] != Stance.Ally)
return false;
if (target.DamageState == DamageState.Undamaged)
cursor = "goldwrench-blocked";
return true;
} }
} }
} }