Rework orca weapons and firing offsets. Now fires a volley of 10 rockets, which reload at 2 per 3 seconds. Fixes half of #930.

OpenRA.Mods.RA/Air/HeliAttack.cs

@@ -26,7 +26,8 @@ namespace OpenRA.Mods.RA.Air
 			if (!target.IsValid) return NextActivity;
 
 			var limitedAmmo = self.TraitOrDefault<LimitedAmmo>();
-			if (limitedAmmo != null && !limitedAmmo.HasAmmo())
+			var reloads = self.TraitOrDefault<Reloads>();
+			if (limitedAmmo != null && !limitedAmmo.HasAmmo() && reloads == null)
 				return Util.SequenceActivities( new HeliReturn(), NextActivity );
 			
 			var aircraft = self.Trait<Aircraft>();

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -348,6 +348,7 @@
     <Compile Include="InvisibleToEnemy.cs" />
     <Compile Include="ParachuteAttachment.cs" />
     <Compile Include="Render\WithBuildingExplosion.cs" />
+    <Compile Include="Reloads.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Mods.RA/Reloads.cs

@@ -0,0 +1,47 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	public class ReloadsInfo : ITraitInfo, Requires<LimitedAmmoInfo>
+	{
+		public readonly int Count = 0;
+		public readonly int Period = 50;
+
+		public object Create(ActorInitializer init) { return new Reloads(init.self, this); }
+	}
+
+	public class Reloads : ITick
+	{
+		[Sync]
+		int remainingTicks;
+		ReloadsInfo Info;
+		LimitedAmmo la;
+		
+		public Reloads(Actor self, ReloadsInfo info)
+		{
+			Info = info;
+			remainingTicks = info.Period;
+			la = self.Trait<LimitedAmmo>();
+		}
+		
+		public void Tick(Actor self)
+		{
+			if (--remainingTicks == 0)
+			{
+				remainingTicks = Info.Period;
+				for (var i = 0; i < Info.Count; i++)
+					la.GiveAmmo();
+			}
+		}
+	}
+}

mods/cnc/rules/aircraft.yaml

@@ -93,11 +93,16 @@ ORCA:
 	RevealsShroud:
 		Range: 8
 	AttackHeli:
-		PrimaryWeapon: Rockets.Orca
-		SecondaryWeapon: Rockets.Orca
-		PrimaryOffset: -5,0,0,2
-		SecondaryOffset: 5,0,0,2
+		PrimaryWeapon: OrcaMissiles
+		PrimaryOffset: 0,-10,0,5
+		PrimaryLocalOffset: -4,0,0,4,0,0
 		FacingTolerance: 20
+	LimitedAmmo:
+		Ammo: 10
+		PipCount: 5
+	Reloads:
+		Count: 2
+		Period: 75
 	RenderUnit:
 	WithShadow:
 	FallsToEarth:

mods/cnc/weapons.yaml

@@ -221,10 +221,11 @@ Rockets.Bike:
 		SmudgeType: Crater
 		Damage: 30
 		
-Rockets.Orca: 
-	ROF: 300
+OrcaMissiles: 
+	ROF: 10
+	Burst: 2
+	BurstDelay: 0
 	Range: 5
-	Burst: 4
 	Report: BAZOOK1
 	ValidTargets: Ground, Air
 	Projectile: Missile
@@ -249,7 +250,7 @@ Rockets.Orca:
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
-		Damage: 30
+		Damage: 20
 
 Flamethrower: 
 	ROF: 50