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

694 fixed -- the same building can now do both repair and rearm for aircraft

Browse Source
This commit is contained in:
Chris Forbes
2011-04-12 08:48:32 +12:00
parent e4d2839254
commit c19881cae3
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Air/Helicopter.cs
View File

@@ -104,8 +104,11 @@ namespace OpenRA.Mods.RA.Air
self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset)); self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));
self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new HeliLand(false)); self.QueueActivity(new HeliLand(false));
self.QueueActivity(Info.RearmBuildings.Contains(order.TargetActor.Info.Name)
? (IActivity)new Rearm() : new Repair(order.TargetActor)); if (Info.RearmBuildings.Contains(order.TargetActor.Info.Name))
self.QueueActivity( new Rearm() );
if (Info.RepairBuildings.Contains(order.TargetActor.Info.Name))
self.QueueActivity( new Repair( order.TargetActor ));
} }
if (order.OrderString == "Stop") if (order.OrderString == "Stop")

8
OpenRA.Mods.RA/Air/Plane.cs
View File

@@ -103,9 +103,11 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new ReturnToBase(self, order.TargetActor)); self.QueueActivity(new ReturnToBase(self, order.TargetActor));
self.QueueActivity(
info.RearmBuildings.Contains(order.TargetActor.Info.Name) if (Info.RearmBuildings.Contains(order.TargetActor.Info.Name))
? (IActivity)new Rearm() : new Repair(order.TargetActor)); self.QueueActivity( new Rearm() );
if (Info.RepairBuildings.Contains(order.TargetActor.Info.Name))
self.QueueActivity( new Repair( order.TargetActor ));
} }
else if (order.OrderString == "Stop") else if (order.OrderString == "Stop")
{ {