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

Add missing target lines.

Browse Source
This commit is contained in:
tovl
2019-08-08 14:27:24 +02:00
committed by abcdefg30
parent daa82d113e
commit c0d5cd750d
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Activities
return true; return true;
} }
QueueChild(new Fly(self, Target.FromActor(dest))); QueueChild(new Fly(self, Target.FromActor(dest), targetLineColor: Color.Green));
return true; return true;
} }

13
OpenRA.Mods.Common/Activities/Air/TakeOff.cs
View File

@@ -10,8 +10,10 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
@@ -93,12 +95,21 @@ namespace OpenRA.Mods.Common.Activities
if (!aircraft.Info.VTOL && assignTargetOnFirstRun) if (!aircraft.Info.VTOL && assignTargetOnFirstRun)
return true; return true;
QueueChild(new AttackMoveActivity(self, () => move.MoveToTarget(self, target))); QueueChild(new AttackMoveActivity(self, () => move.MoveToTarget(self, target, targetLineColor: Color.OrangeRed)));
moveToRallyPoint = false; moveToRallyPoint = false;
return false; return false;
} }
return true; return true;
} }
public override IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
{
if (ChildActivity == null && moveToRallyPoint)
yield return new TargetLineNode(target, Color.OrangeRed);
else
foreach (var n in ChildActivity.TargetLineNodes(self))
yield return n;
}
} }
} }

1
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -1059,6 +1059,7 @@ namespace OpenRA.Mods.Common.Traits
// Aircraft with TakeOffOnResupply would immediately take off again, so there's no point in forcing them to land // Aircraft with TakeOffOnResupply would immediately take off again, so there's no point in forcing them to land
// on a resupplier. For aircraft without it, it makes more sense to land than to idle above a free resupplier. // on a resupplier. For aircraft without it, it makes more sense to land than to idle above a free resupplier.
self.QueueActivity(order.Queued, new ReturnToBase(self, null, !Info.TakeOffOnResupply)); self.QueueActivity(order.Queued, new ReturnToBase(self, null, !Info.TakeOffOnResupply));
self.ShowTargetLines();
} }
else if (orderString == "Scatter") else if (orderString == "Scatter")
Nudge(self); Nudge(self);

2
OpenRA.Mods.Common/Traits/Production.cs
View File

@@ -88,7 +88,7 @@ namespace OpenRA.Mods.Common.Traits
newUnit.QueueActivity(new Wait(exitinfo.ExitDelay, false)); newUnit.QueueActivity(new Wait(exitinfo.ExitDelay, false));
newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit)); newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit));
newUnit.QueueActivity(new AttackMoveActivity(newUnit, () => move.MoveTo(exitLocation, 1))); newUnit.QueueActivity(new AttackMoveActivity(newUnit, () => move.MoveTo(exitLocation, 1, targetLineColor: Color.OrangeRed)));
} }
} }

2
OpenRA.Mods.Common/Traits/ProductionParadrop.cs
View File

@@ -143,7 +143,7 @@ namespace OpenRA.Mods.Common.Traits
newUnit.QueueActivity(new Wait(exitinfo.ExitDelay, false)); newUnit.QueueActivity(new Wait(exitinfo.ExitDelay, false));
newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit)); newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit));
newUnit.QueueActivity(new AttackMoveActivity(newUnit, () => move.MoveTo(exitLocation, 1))); newUnit.QueueActivity(new AttackMoveActivity(newUnit, () => move.MoveTo(exitLocation, 1, targetLineColor: Color.OrangeRed)));
} }
} }