make the parachute animation optional

instead of hard-coding default sprite sequences

OpenRA.Mods.RA/Effects/Parachute.cs

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Effects
 {
 	public class Parachute : IEffect
 	{
-		readonly Animation paraAnim;
+		readonly Animation parachute;
 		readonly WVec parachuteOffset;
 		readonly Actor cargo;
 		WPos pos;
@@ -29,9 +29,12 @@ namespace OpenRA.Mods.RA.Effects
 			this.cargo = cargo;
 
 			var parachutableInfo = cargo.Info.Traits.GetOrDefault<ParachutableInfo>();
-			var sprite = parachutableInfo != null ? parachutableInfo.ParachuteSprite : "parach";
+			var parachuteSprite = parachutableInfo != null ? parachutableInfo.ParachuteSequence : null;
-			paraAnim = new Animation(cargo.World, sprite);
+			if (parachuteSprite != null)
-			paraAnim.PlayThen("open", () => paraAnim.PlayRepeating("idle"));
+			{
+				parachute = new Animation(cargo.World, parachuteSprite);
+				parachute.PlayThen("open", () => parachute.PlayRepeating("idle"));
+			}
 
 			if (parachutableInfo != null)
 				parachuteOffset = parachutableInfo.ParachuteOffset;
@@ -44,7 +47,8 @@ namespace OpenRA.Mods.RA.Effects
 
 		public void Tick(World world)
 		{
-			paraAnim.Tick();
+			if (parachute != null)
+				parachute.Tick();
 
 			pos -= fallRate;
 
@@ -79,8 +83,9 @@ namespace OpenRA.Mods.RA.Effects
 				yield return c.OffsetBy(pos - c.Pos);
 			}
 
-			foreach (var r in paraAnim.Render(pos, parachuteOffset, 1, rc.First().Palette, 1f))
+			if (parachute != null)
-				yield return r;
+				foreach (var r in parachute.Render(pos, parachuteOffset, 1, rc.First().Palette, 1f))
+					yield return r;
 		}
 	}
 }

OpenRA.Mods.RA/Parachutable.cs

@@ -26,7 +26,8 @@ namespace OpenRA.Mods.RA
 		public readonly string WaterCorpseSequence = "small_splash";
 		public readonly string WaterCorpsePalette = "effect";
 
-		public readonly string ParachuteSprite = "parach";
+		[Desc("Requires the sub-sequences \"open\" and \"idle\".")]
+		public readonly string ParachuteSequence = null;
 		public readonly WVec ParachuteOffset = WVec.Zero;
 
 		public object Create(ActorInitializer init) { return new Parachutable(init, this); }

OpenRA.Utility/UpgradeRules.cs

@@ -263,6 +263,9 @@ namespace OpenRA.Utility
 							if (subnode.Key == "Offset")
 								subnode.Key = "ParachuteOffset";
 					}
+
+					if (depth == 2 && node.Key == "ParachuteSprite")
+						node.Key = "ParachuteSequence";
 				}
 
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);

mods/ra/rules/defaults.yaml

@@ -177,6 +177,8 @@
 		InfDeaths: 6
 	Parachutable:
 		ParachuteOffset: 0,0,427
+		KilledOnImpassableTerrain: true
+		ParachuteSequence: parach
 
 ^Ship:
 	AppearsOnRadar:

mods/ra/rules/misc.yaml

@@ -60,6 +60,9 @@ CRATE:
 	Crate:
 		Lifetime: 120
 		TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
+	Parachutable:
+		KilledOnImpassableTerrain: false
+		ParachuteSequence: parach
 	GiveCashCrateAction:
 		Amount: 1000
 		SelectionShares: 50