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

Remove Order.TargetLocation from AttackMove.

Browse Source
This commit is contained in:
Paul Chote
2018-12-01 12:00:06 +00:00
parent c7d9d9613e
commit a5c89c2edc
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -85,8 +85,12 @@ namespace OpenRA.Mods.Common.Traits
string IOrderVoice.VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(order.TargetLocation)) if (!Info.MoveIntoShroud && order.Target.Type != TargetType.Invalid)
return null; {
var cell = self.World.Map.CellContaining(order.Target.CenterPosition);
if (!self.Owner.Shroud.IsExplored(cell))
return null;
}
if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove") if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove")
return Info.Voice; return Info.Voice;
@@ -116,10 +120,11 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(order.TargetLocation)) var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;
TargetLocation = move.NearestMoveableCell(order.TargetLocation); TargetLocation = move.NearestMoveableCell(cell);
self.SetTargetLine(Target.FromCell(self.World, TargetLocation.Value), Color.Red); self.SetTargetLine(Target.FromCell(self.World, TargetLocation.Value), Color.Red);
Activate(self, order.OrderString == "AssaultMove"); Activate(self, order.OrderString == "AssaultMove");
} }