Move subterranean audio-visual properties to GrantConditionOnSubterra…

…neanLayer

This allows to customize them per actor without setting up a new locomotor each time.

OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnSubterraneanLayer.cs

@@ -15,9 +15,22 @@
 
 namespace OpenRA.Mods.Common.Traits
 {
-	[Desc("Grants Condition on subterranean layer. Also plays transition audio-visuals if defined by the locomotor.")]
+	[Desc("Grants Condition on subterranean layer. Also plays transition audio-visuals.")]
 	public class GrantConditionOnSubterraneanLayerInfo : GrantConditionOnLayerInfo
 	{
+		[Desc("Dig animation image to play when transitioning.")]
+		public readonly string SubterraneanTransitionImage = null;
+
+		[SequenceReference("SubterraneanTransitionImage")]
+		[Desc("Dig animation sequence to play when transitioning.")]
+		public readonly string SubterraneanTransitionSequence = null;
+
+		[PaletteReference]
+		public readonly string SubterraneanTransitionPalette = "effect";
+
+		[Desc("Dig sound to play when transitioning.")]
+		public readonly string SubterraneanTransitionSound = null;
+
 		public override object Create(ActorInitializer init) { return new GrantConditionOnSubterraneanLayer(init.Self, this); }
 	}
 
@@ -41,13 +54,13 @@ protected override void Created(Actor self)
 
 		void PlayTransitionAudioVisuals(Actor self, CPos fromCell)
 		{
-			if (!string.IsNullOrEmpty(locoInfo.SubterraneanTransitionSequence))
+			if (!string.IsNullOrEmpty(Info.SubterraneanTransitionSequence))
 				self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(self.World.Map.CenterOfCell(fromCell), self.World,
-					locoInfo.SubterraneanTransitionImage,
-					locoInfo.SubterraneanTransitionSequence, locoInfo.SubterraneanTransitionPalette)));
+					Info.SubterraneanTransitionImage,
+					Info.SubterraneanTransitionSequence, Info.SubterraneanTransitionPalette)));
 
-			if (!string.IsNullOrEmpty(locoInfo.SubterraneanTransitionSound))
-				Game.Sound.Play(SoundType.World, locoInfo.SubterraneanTransitionSound);
+			if (!string.IsNullOrEmpty(Info.SubterraneanTransitionSound))
+				Game.Sound.Play(SoundType.World, Info.SubterraneanTransitionSound);
 		}
 
 		protected override void UpdateConditions(Actor self, byte oldLayer, byte newLayer)

OpenRA.Mods.Common/Traits/World/SubterraneanLocomotor.cs

@@ -29,18 +29,6 @@ public class SubterraneanLocomotorInfo : LocomotorInfo
 		[Desc("Depth at which the subterranian condition is applied.")]
 		public readonly WDist SubterraneanTransitionDepth = new WDist(-1024);
 
-		[Desc("Dig animation image to play when transitioning.")]
-		public readonly string SubterraneanTransitionImage = null;
-
-		[SequenceReference("SubterraneanTransitionImage")]
-		[Desc("Dig animation image to play when transitioning.")]
-		public readonly string SubterraneanTransitionSequence = null;
-
-		[PaletteReference]
-		public readonly string SubterraneanTransitionPalette = "effect";
-
-		public readonly string SubterraneanTransitionSound = null;
-
 		public override object Create(ActorInitializer init) { return new SubterraneanLocomotor(init.Self, this); }
 	}
 

mods/ts/rules/nod-vehicles.yaml

@@ -369,6 +369,9 @@ SAPC:
 		Locomotor: subterranean
 	GrantConditionOnSubterraneanLayer:
 		Condition: submerged
+		SubterraneanTransitionSound: subdril1.aud
+		SubterraneanTransitionImage: dig
+		SubterraneanTransitionSequence: idle
 	Health:
 		HP: 17500
 	Armor:
@@ -409,6 +412,9 @@ SUBTANK:
 		Locomotor: subterranean
 	GrantConditionOnSubterraneanLayer:
 		Condition: submerged
+		SubterraneanTransitionSound: subdril1.aud
+		SubterraneanTransitionImage: dig
+		SubterraneanTransitionSequence: idle
 	Health:
 		HP: 30000
 	Armor:

mods/ts/rules/world.yaml

@@ -124,9 +124,6 @@
 			Subterranean: 120
 		SubterraneanTransitionTerrainTypes: Clear, Rough
 		SubterraneanTransitionCost: 120
-		SubterraneanTransitionSound: subdril1.aud
-		SubterraneanTransitionImage: dig
-		SubterraneanTransitionSequence: idle
 	Locomotor@HOVER:
 		Name: hover
 		Crushes: wall, crate, infantry