Move AbortOnResupply to AttackAircraft

Additionally, if AbortOnResupply is set to 'true',
abort FlyAttack right away when queueing ReturnToBase.

OpenRA.Mods.Common/Traits/Air/Aircraft.cs

@@ -94,9 +94,6 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Will this actor try to land after it has no more commands?")]
 		public readonly bool LandWhenIdle = true;
 
-		[Desc("Does this actor cancel its previous activity after resupplying?")]
-		public readonly bool AbortOnResupply = true;
-
 		[Desc("Altitude at which the aircraft considers itself landed.")]
 		public readonly WDist LandAltitude = WDist.Zero;
 

OpenRA.Mods.Common/Traits/Air/AttackAircraft.cs

@@ -26,6 +26,9 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Delay, in game ticks, before strafing aircraft turns to attack.")]
 		public readonly int AttackTurnDelay = 50;
 
+		[Desc("Does this actor cancel its attack activity when it needs to resupply? Setting this to 'false' will make the actor resume attack after reloading.")]
+		public readonly bool AbortOnResupply = true;
+
 		public override object Create(ActorInitializer init) { return new AttackAircraft(init.Self, this); }
 	}