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

Merge pull request #13104 from rob-v/RepairNavalUnitsWithRepairCursor

Browse Source 
Naval units (RepairableNear) units repairable using Repair cursor
This commit is contained in:
atlimit8
2017-04-23 22:05:46 -05:00
committed by GitHub
parent fe03929e6b 9216427c2b
commit 99f3f37afe
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Orders/RepairOrderGenerator.cs
View File

@@ -49,17 +49,27 @@ namespace OpenRA.Mods.Common.Orders
if (underCursor.Owner != world.LocalPlayer)
yield break;
Actor repairBuilding = null;
var orderId = "Repair";
// Test for generic Repairable (used on units).
var repairable = underCursor.TraitOrDefault<Repairable>();
if (repairable == null)
yield break;
if (repairable != null)
repairBuilding = repairable.FindRepairBuilding(underCursor);
else
{
var repairableNear = underCursor.TraitOrDefault<RepairableNear>();
if (repairableNear != null)
{
orderId = "RepairNear";
repairBuilding = repairableNear.FindRepairBuilding(underCursor);
}
}
// Find a building to repair at.
var repairBuilding = repairable.FindRepairBuilding(underCursor);
if (repairBuilding == null)
yield break;
yield return new Order("Repair", underCursor, false) { TargetActor = repairBuilding };
yield return new Order(orderId, underCursor, false) { TargetActor = repairBuilding };
}
public void Tick(World world)